Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoradaussy2011-09-21 07:39:08 +0000
committeradaussy2011-09-21 07:39:08 +0000
commitcc300b4c9ddc00e108bc9a6e415dbe457a9d0208 (patch)
tree7fb7e398d80bef46e11bee56f77f6d3e8647a081
parent7bcc64aba47b964f21a5d8e88cd8211038e03124 (diff)
downloadorg.eclipse.papyrus-cc300b4c9ddc00e108bc9a6e415dbe457a9d0208.tar.gz
org.eclipse.papyrus-cc300b4c9ddc00e108bc9a6e415dbe457a9d0208.tar.xz
org.eclipse.papyrus-cc300b4c9ddc00e108bc9a6e415dbe457a9d0208.zip
NEW - bug 352555: [SysML Static Profile] Improvement of the AdapterFactories (used to get SysML ItemProviders) in oep.sysml.edit
https://bugs.eclipse.org/bugs/show_bug.cgi?id=352555 Now the ItemProviderAdapter with be able to get back the correct Property descriptor for a UML element stereotypes with a SysML profile. Example : -> A ViewPoint will return the property descriptors of a class and of a ViewPoint (language, concerns etc..)
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ContinuousItemProvider.java30
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ControlOperatorItemProvider.java141
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/DiscreteItemProvider.java30
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/NoBufferItemProvider.java48
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OptionalItemProvider.java48
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OverwriteItemProvider.java48
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ProbabilityItemProvider.java197
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/RateItemProvider.java197
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocateActivityPartitionItemProvider.java48
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocateItemProvider.java48
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocatedItemProvider.java102
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/BindingConnectorItemProvider.java48
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/BlockItemProvider.java75
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ConnectorPropertyItemProvider.java75
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/DimensionItemProvider.java48
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/DistributedPropertyItemProvider.java48
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/NestedConnectorEndItemProvider.java75
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ParticipantPropertyItemProvider.java75
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/PropertySpecificTypeItemProvider.java48
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/UnitItemProvider.java75
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ValueTypeItemProvider.java102
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/constraints/provider/ConstraintBlockItemProvider.java22
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/constraints/provider/ConstraintPropertyItemProvider.java48
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ConformItemProvider.java48
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ProblemItemProvider.java48
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/RationaleItemProvider.java48
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ViewItemProvider.java75
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ViewPointItemProvider.java185
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/FlowPortItemProvider.java129
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/FlowPropertyItemProvider.java75
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/FlowSpecificationItemProvider.java48
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/ItemFlowItemProvider.java75
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/registry/SysmlRegistryAdapterFactoryRegistry.java54
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/CopyItemProvider.java22
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/DeriveReqtItemProvider.java22
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/RequirementItemProvider.java293
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/RequirementRelatedItemProvider.java158
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/SatisfyItemProvider.java22
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/TestCaseItemProvider.java197
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/VerifyItemProvider.java22
40 files changed, 2978 insertions, 219 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 b65fdea74a8..50c44830a75 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
@@ -21,6 +21,7 @@ import java.util.regex.Pattern;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.edit.provider.ComposedImage;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -45,18 +46,22 @@ import org.eclipse.uml2.uml.edit.UMLEditPlugin;
*
* @generated
*/
-public class ContinuousItemProvider extends RateItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IVisibilityOverlayImage {
+public class ContinuousItemProvider extends RateItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IVisibilityOverlayImage
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForparameter;
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForactivityEdge;
/**
@@ -71,6 +76,7 @@ public class ContinuousItemProvider extends RateItemProvider implements IEditing
*
* @generated
*/
+
private static Pattern PARAMETER_PREFIX_PATTERN = Pattern.compile("Parameter");
/**
@@ -78,6 +84,7 @@ public class ContinuousItemProvider extends RateItemProvider implements IEditing
*
* @generated
*/
+
private static Pattern ACTIVITY_EDGE_PREFIX_PATTERN = Pattern.compile("ActivityEdge");
/**
@@ -100,20 +107,28 @@ public class ContinuousItemProvider extends RateItemProvider implements IEditing
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
+ if(object instanceof Continuous) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
+ }
}
/**
* Handle Parameter stereotyped by Continuous
*/
if(object instanceof org.eclipse.uml2.uml.Parameter) {
+ org.eclipse.uml2.uml.Parameter element = (org.eclipse.uml2.uml.Parameter)object;
if(itemPropertyDescriptorsForparameter == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.PARAMETER);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForparameter = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForparameter.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.CONTINUOUS_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ }
}
return itemPropertyDescriptorsForparameter;
@@ -123,11 +138,17 @@ public class ContinuousItemProvider extends RateItemProvider implements IEditing
* Handle ActivityEdge stereotyped by Continuous
*/
if(object instanceof org.eclipse.uml2.uml.ActivityEdge) {
+ org.eclipse.uml2.uml.ActivityEdge element = (org.eclipse.uml2.uml.ActivityEdge)object;
if(itemPropertyDescriptorsForactivityEdge == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.ACTIVITY_EDGE);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForactivityEdge = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForactivityEdge.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.CONTINUOUS_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ }
}
return itemPropertyDescriptorsForactivityEdge;
@@ -256,10 +277,13 @@ public class ContinuousItemProvider extends RateItemProvider implements IEditing
*/
public ComposedImage composeVisibilityImage(Object object, ComposedImage composedImage) {
NamedElement namedElement = (NamedElement)object;
+
if(namedElement.isSetVisibility()) {
composedImage.getImages().add(UMLEditPlugin.INSTANCE.getImage("full/ovr16/VisibilityKind_" //$NON-NLS-1$
+ namedElement.getVisibility().getName()));
}
+
return composedImage;
}
+
}
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 eb902ac250a..25155b26695 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
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
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;
@@ -30,6 +31,7 @@ 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.activities.ActivitiesPackage;
import org.eclipse.papyrus.sysml.activities.ControlOperator;
@@ -48,18 +50,22 @@ import org.eclipse.uml2.uml.UMLPackage;
*
* @generated
*/
-public class ControlOperatorItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class ControlOperatorItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForoperation;
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForbehavior;
/**
@@ -74,6 +80,7 @@ public class ControlOperatorItemProvider extends SysMLItemProviderAdapter implem
*
* @generated
*/
+
private static Pattern OPERATION_PREFIX_PATTERN = Pattern.compile("Operation");
/**
@@ -81,6 +88,7 @@ public class ControlOperatorItemProvider extends SysMLItemProviderAdapter implem
*
* @generated
*/
+
private static Pattern BEHAVIOR_PREFIX_PATTERN = Pattern.compile("Behavior");
/**
@@ -103,22 +111,38 @@ public class ControlOperatorItemProvider extends SysMLItemProviderAdapter implem
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
+ if(object instanceof ControlOperator) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
- addBase_OperationPropertyDescriptor(object);
- addBase_BehaviorPropertyDescriptor(object);
+ addBase_OperationPropertyDescriptor(object);
+ addBase_BehaviorPropertyDescriptor(object);
+ }
}
/**
* Handle Operation stereotyped by ControlOperator
*/
if(object instanceof org.eclipse.uml2.uml.Operation) {
+ org.eclipse.uml2.uml.Operation element = (org.eclipse.uml2.uml.Operation)object;
if(itemPropertyDescriptorsForoperation == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.OPERATION);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForoperation = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForoperation.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.CONTROL_OPERATOR_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ addBase_OperationPropertyDescriptorForOperation(steApplication);
+
+ addBase_OperationPropertyDescriptorForBehavior(steApplication);
+
+ addBase_BehaviorPropertyDescriptorForOperation(steApplication);
+
+ addBase_BehaviorPropertyDescriptorForBehavior(steApplication);
+
+ }
}
return itemPropertyDescriptorsForoperation;
@@ -128,11 +152,25 @@ public class ControlOperatorItemProvider extends SysMLItemProviderAdapter implem
* Handle Behavior stereotyped by ControlOperator
*/
if(object instanceof org.eclipse.uml2.uml.Behavior) {
+ org.eclipse.uml2.uml.Behavior element = (org.eclipse.uml2.uml.Behavior)object;
if(itemPropertyDescriptorsForbehavior == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.BEHAVIOR);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForbehavior = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForbehavior.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.CONTROL_OPERATOR_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ addBase_OperationPropertyDescriptorForOperation(steApplication);
+
+ addBase_OperationPropertyDescriptorForBehavior(steApplication);
+
+ addBase_BehaviorPropertyDescriptorForOperation(steApplication);
+
+ addBase_BehaviorPropertyDescriptorForBehavior(steApplication);
+
+ }
}
return itemPropertyDescriptorsForbehavior;
@@ -153,6 +191,52 @@ public class ControlOperatorItemProvider extends SysMLItemProviderAdapter implem
}
/**
+ * This adds a property descriptor for the Base Operation feature for the UML element Operation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_OperationPropertyDescriptorForOperation(Object object) {
+
+ itemPropertyDescriptorsForoperation.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ControlOperator_base_Operation_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_ControlOperator_base_Operation_feature", "_UI_ControlOperator_type"),
+
+ ActivitiesPackage.Literals.CONTROL_OPERATOR__BASE_OPERATION, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
+ * This adds a property descriptor for the Base Operation feature for the UML element Behavior.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_OperationPropertyDescriptorForBehavior(Object object) {
+
+ itemPropertyDescriptorsForbehavior.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ControlOperator_base_Operation_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_ControlOperator_base_Operation_feature", "_UI_ControlOperator_type"),
+
+ ActivitiesPackage.Literals.CONTROL_OPERATOR__BASE_OPERATION, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Base Behavior feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -164,6 +248,52 @@ public class ControlOperatorItemProvider extends SysMLItemProviderAdapter implem
}
/**
+ * This adds a property descriptor for the Base Behavior feature for the UML element Operation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_BehaviorPropertyDescriptorForOperation(Object object) {
+
+ itemPropertyDescriptorsForoperation.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ControlOperator_base_Behavior_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_ControlOperator_base_Behavior_feature", "_UI_ControlOperator_type"),
+
+ ActivitiesPackage.Literals.CONTROL_OPERATOR__BASE_BEHAVIOR, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
+ * This adds a property descriptor for the Base Behavior feature for the UML element Behavior.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_BehaviorPropertyDescriptorForBehavior(Object object) {
+
+ itemPropertyDescriptorsForbehavior.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ControlOperator_base_Behavior_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_ControlOperator_base_Behavior_feature", "_UI_ControlOperator_type"),
+
+ ActivitiesPackage.Literals.CONTROL_OPERATOR__BASE_BEHAVIOR, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This returns ControlOperator.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -284,4 +414,5 @@ public class ControlOperatorItemProvider extends SysMLItemProviderAdapter implem
public ResourceLocator getResourceLocator() {
return SysmlEditPlugin.INSTANCE;
}
+
}
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 dae0ff2542a..def44b37749 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
@@ -21,6 +21,7 @@ import java.util.regex.Pattern;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.edit.provider.ComposedImage;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -45,18 +46,22 @@ import org.eclipse.uml2.uml.edit.UMLEditPlugin;
*
* @generated
*/
-public class DiscreteItemProvider extends RateItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IVisibilityOverlayImage {
+public class DiscreteItemProvider extends RateItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IVisibilityOverlayImage
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForparameter;
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForactivityEdge;
/**
@@ -71,6 +76,7 @@ public class DiscreteItemProvider extends RateItemProvider implements IEditingDo
*
* @generated
*/
+
private static Pattern PARAMETER_PREFIX_PATTERN = Pattern.compile("Parameter");
/**
@@ -78,6 +84,7 @@ public class DiscreteItemProvider extends RateItemProvider implements IEditingDo
*
* @generated
*/
+
private static Pattern ACTIVITY_EDGE_PREFIX_PATTERN = Pattern.compile("ActivityEdge");
/**
@@ -100,20 +107,28 @@ public class DiscreteItemProvider extends RateItemProvider implements IEditingDo
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
+ if(object instanceof Discrete) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
+ }
}
/**
* Handle Parameter stereotyped by Discrete
*/
if(object instanceof org.eclipse.uml2.uml.Parameter) {
+ org.eclipse.uml2.uml.Parameter element = (org.eclipse.uml2.uml.Parameter)object;
if(itemPropertyDescriptorsForparameter == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.PARAMETER);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForparameter = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForparameter.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.DISCRETE_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ }
}
return itemPropertyDescriptorsForparameter;
@@ -123,11 +138,17 @@ public class DiscreteItemProvider extends RateItemProvider implements IEditingDo
* Handle ActivityEdge stereotyped by Discrete
*/
if(object instanceof org.eclipse.uml2.uml.ActivityEdge) {
+ org.eclipse.uml2.uml.ActivityEdge element = (org.eclipse.uml2.uml.ActivityEdge)object;
if(itemPropertyDescriptorsForactivityEdge == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.ACTIVITY_EDGE);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForactivityEdge = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForactivityEdge.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.DISCRETE_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ }
}
return itemPropertyDescriptorsForactivityEdge;
@@ -256,10 +277,13 @@ public class DiscreteItemProvider extends RateItemProvider implements IEditingDo
*/
public ComposedImage composeVisibilityImage(Object object, ComposedImage composedImage) {
NamedElement namedElement = (NamedElement)object;
+
if(namedElement.isSetVisibility()) {
composedImage.getImages().add(UMLEditPlugin.INSTANCE.getImage("full/ovr16/VisibilityKind_" //$NON-NLS-1$
+ namedElement.getVisibility().getName()));
}
+
return composedImage;
}
+
}
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 0ca54c31f2c..b6d10d15700 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
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
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;
@@ -30,6 +31,7 @@ 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.activities.ActivitiesPackage;
import org.eclipse.papyrus.sysml.activities.NoBuffer;
@@ -48,12 +50,15 @@ import org.eclipse.uml2.uml.UMLPackage;
*
* @generated
*/
-public class NoBufferItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class NoBufferItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForobjectNode;
/**
@@ -68,6 +73,7 @@ public class NoBufferItemProvider extends SysMLItemProviderAdapter implements IE
*
* @generated
*/
+
private static Pattern OBJECT_NODE_PREFIX_PATTERN = Pattern.compile("ObjectNode");
/**
@@ -90,21 +96,31 @@ public class NoBufferItemProvider extends SysMLItemProviderAdapter implements IE
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
+ if(object instanceof NoBuffer) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
- addBase_ObjectNodePropertyDescriptor(object);
+ addBase_ObjectNodePropertyDescriptor(object);
+ }
}
/**
* Handle ObjectNode stereotyped by NoBuffer
*/
if(object instanceof org.eclipse.uml2.uml.ObjectNode) {
+ org.eclipse.uml2.uml.ObjectNode element = (org.eclipse.uml2.uml.ObjectNode)object;
if(itemPropertyDescriptorsForobjectNode == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.OBJECT_NODE);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForobjectNode = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForobjectNode.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.NO_BUFFER_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ addBase_ObjectNodePropertyDescriptorForObjectNode(steApplication);
+
+ }
}
return itemPropertyDescriptorsForobjectNode;
@@ -125,6 +141,29 @@ public class NoBufferItemProvider extends SysMLItemProviderAdapter implements IE
}
/**
+ * This adds a property descriptor for the Base Object Node feature for the UML element ObjectNode.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_ObjectNodePropertyDescriptorForObjectNode(Object object) {
+
+ itemPropertyDescriptorsForobjectNode.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_NoBuffer_base_ObjectNode_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_NoBuffer_base_ObjectNode_feature", "_UI_NoBuffer_type"),
+
+ ActivitiesPackage.Literals.NO_BUFFER__BASE_OBJECT_NODE, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This returns NoBuffer.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -223,4 +262,5 @@ public class NoBufferItemProvider extends SysMLItemProviderAdapter implements IE
public ResourceLocator getResourceLocator() {
return SysmlEditPlugin.INSTANCE;
}
+
}
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 d484d500b8f..4dff2b76ab6 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
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
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;
@@ -30,6 +31,7 @@ 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.activities.ActivitiesPackage;
import org.eclipse.papyrus.sysml.activities.Optional;
@@ -48,12 +50,15 @@ import org.eclipse.uml2.uml.UMLPackage;
*
* @generated
*/
-public class OptionalItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class OptionalItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForparameter;
/**
@@ -68,6 +73,7 @@ public class OptionalItemProvider extends SysMLItemProviderAdapter implements IE
*
* @generated
*/
+
private static Pattern PARAMETER_PREFIX_PATTERN = Pattern.compile("Parameter");
/**
@@ -90,21 +96,31 @@ public class OptionalItemProvider extends SysMLItemProviderAdapter implements IE
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
+ if(object instanceof Optional) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
- addBase_ParameterPropertyDescriptor(object);
+ addBase_ParameterPropertyDescriptor(object);
+ }
}
/**
* Handle Parameter stereotyped by Optional
*/
if(object instanceof org.eclipse.uml2.uml.Parameter) {
+ org.eclipse.uml2.uml.Parameter element = (org.eclipse.uml2.uml.Parameter)object;
if(itemPropertyDescriptorsForparameter == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.PARAMETER);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForparameter = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForparameter.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.OPTIONAL_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ addBase_ParameterPropertyDescriptorForParameter(steApplication);
+
+ }
}
return itemPropertyDescriptorsForparameter;
@@ -125,6 +141,29 @@ public class OptionalItemProvider extends SysMLItemProviderAdapter implements IE
}
/**
+ * This adds a property descriptor for the Base Parameter feature for the UML element Parameter.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_ParameterPropertyDescriptorForParameter(Object object) {
+
+ itemPropertyDescriptorsForparameter.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Optional_base_Parameter_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Optional_base_Parameter_feature", "_UI_Optional_type"),
+
+ ActivitiesPackage.Literals.OPTIONAL__BASE_PARAMETER, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This returns Optional.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -223,4 +262,5 @@ public class OptionalItemProvider extends SysMLItemProviderAdapter implements IE
public ResourceLocator getResourceLocator() {
return SysmlEditPlugin.INSTANCE;
}
+
}
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 42ed5ecd6ff..a89ae4fe1de 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
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
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;
@@ -30,6 +31,7 @@ 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.activities.ActivitiesPackage;
import org.eclipse.papyrus.sysml.activities.Overwrite;
@@ -48,12 +50,15 @@ import org.eclipse.uml2.uml.UMLPackage;
*
* @generated
*/
-public class OverwriteItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class OverwriteItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForobjectNode;
/**
@@ -68,6 +73,7 @@ public class OverwriteItemProvider extends SysMLItemProviderAdapter implements I
*
* @generated
*/
+
private static Pattern OBJECT_NODE_PREFIX_PATTERN = Pattern.compile("ObjectNode");
/**
@@ -90,21 +96,31 @@ public class OverwriteItemProvider extends SysMLItemProviderAdapter implements I
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
+ if(object instanceof Overwrite) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
- addBase_ObjectNodePropertyDescriptor(object);
+ addBase_ObjectNodePropertyDescriptor(object);
+ }
}
/**
* Handle ObjectNode stereotyped by Overwrite
*/
if(object instanceof org.eclipse.uml2.uml.ObjectNode) {
+ org.eclipse.uml2.uml.ObjectNode element = (org.eclipse.uml2.uml.ObjectNode)object;
if(itemPropertyDescriptorsForobjectNode == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.OBJECT_NODE);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForobjectNode = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForobjectNode.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.OVERWRITE_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ addBase_ObjectNodePropertyDescriptorForObjectNode(steApplication);
+
+ }
}
return itemPropertyDescriptorsForobjectNode;
@@ -125,6 +141,29 @@ public class OverwriteItemProvider extends SysMLItemProviderAdapter implements I
}
/**
+ * This adds a property descriptor for the Base Object Node feature for the UML element ObjectNode.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_ObjectNodePropertyDescriptorForObjectNode(Object object) {
+
+ itemPropertyDescriptorsForobjectNode.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Overwrite_base_ObjectNode_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Overwrite_base_ObjectNode_feature", "_UI_Overwrite_type"),
+
+ ActivitiesPackage.Literals.OVERWRITE__BASE_OBJECT_NODE, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This returns Overwrite.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -223,4 +262,5 @@ public class OverwriteItemProvider extends SysMLItemProviderAdapter implements I
public ResourceLocator getResourceLocator() {
return SysmlEditPlugin.INSTANCE;
}
+
}
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 2d8783f79eb..91f2a0fa7d9 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
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
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;
@@ -30,6 +31,7 @@ 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.activities.ActivitiesPackage;
import org.eclipse.papyrus.sysml.activities.Probability;
@@ -48,18 +50,22 @@ import org.eclipse.uml2.uml.UMLPackage;
*
* @generated
*/
-public class ProbabilityItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class ProbabilityItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForactivityEdge;
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForparameterSet;
/**
@@ -74,6 +80,7 @@ public class ProbabilityItemProvider extends SysMLItemProviderAdapter implements
*
* @generated
*/
+
private static Pattern ACTIVITY_EDGE_PREFIX_PATTERN = Pattern.compile("ActivityEdge");
/**
@@ -81,6 +88,7 @@ public class ProbabilityItemProvider extends SysMLItemProviderAdapter implements
*
* @generated
*/
+
private static Pattern PARAMETER_SET_PREFIX_PATTERN = Pattern.compile("ParameterSet");
/**
@@ -103,23 +111,43 @@ public class ProbabilityItemProvider extends SysMLItemProviderAdapter implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
+ if(object instanceof Probability) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
- addBase_ActivityEdgePropertyDescriptor(object);
- addBase_ParameterSetPropertyDescriptor(object);
- addProbabilityPropertyDescriptor(object);
+ addBase_ActivityEdgePropertyDescriptor(object);
+ addBase_ParameterSetPropertyDescriptor(object);
+ addProbabilityPropertyDescriptor(object);
+ }
}
/**
* Handle ActivityEdge stereotyped by Probability
*/
if(object instanceof org.eclipse.uml2.uml.ActivityEdge) {
+ org.eclipse.uml2.uml.ActivityEdge element = (org.eclipse.uml2.uml.ActivityEdge)object;
if(itemPropertyDescriptorsForactivityEdge == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.ACTIVITY_EDGE);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForactivityEdge = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForactivityEdge.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.PROBABILITY_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ addBase_ActivityEdgePropertyDescriptorForActivityEdge(steApplication);
+
+ addBase_ActivityEdgePropertyDescriptorForParameterSet(steApplication);
+
+ addBase_ParameterSetPropertyDescriptorForActivityEdge(steApplication);
+
+ addBase_ParameterSetPropertyDescriptorForParameterSet(steApplication);
+
+ addProbabilityPropertyDescriptorForActivityEdge(steApplication);
+
+ addProbabilityPropertyDescriptorForParameterSet(steApplication);
+
+ }
}
return itemPropertyDescriptorsForactivityEdge;
@@ -129,11 +157,29 @@ public class ProbabilityItemProvider extends SysMLItemProviderAdapter implements
* Handle ParameterSet stereotyped by Probability
*/
if(object instanceof org.eclipse.uml2.uml.ParameterSet) {
+ org.eclipse.uml2.uml.ParameterSet element = (org.eclipse.uml2.uml.ParameterSet)object;
if(itemPropertyDescriptorsForparameterSet == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.PARAMETER_SET);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForparameterSet = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForparameterSet.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.PROBABILITY_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ addBase_ActivityEdgePropertyDescriptorForActivityEdge(steApplication);
+
+ addBase_ActivityEdgePropertyDescriptorForParameterSet(steApplication);
+
+ addBase_ParameterSetPropertyDescriptorForActivityEdge(steApplication);
+
+ addBase_ParameterSetPropertyDescriptorForParameterSet(steApplication);
+
+ addProbabilityPropertyDescriptorForActivityEdge(steApplication);
+
+ addProbabilityPropertyDescriptorForParameterSet(steApplication);
+
+ }
}
return itemPropertyDescriptorsForparameterSet;
@@ -154,6 +200,52 @@ public class ProbabilityItemProvider extends SysMLItemProviderAdapter implements
}
/**
+ * This adds a property descriptor for the Base Activity Edge feature for the UML element ActivityEdge.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_ActivityEdgePropertyDescriptorForActivityEdge(Object object) {
+
+ itemPropertyDescriptorsForactivityEdge.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Probability_base_ActivityEdge_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Probability_base_ActivityEdge_feature", "_UI_Probability_type"),
+
+ ActivitiesPackage.Literals.PROBABILITY__BASE_ACTIVITY_EDGE, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
+ * This adds a property descriptor for the Base Activity Edge feature for the UML element ParameterSet.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_ActivityEdgePropertyDescriptorForParameterSet(Object object) {
+
+ itemPropertyDescriptorsForparameterSet.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Probability_base_ActivityEdge_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Probability_base_ActivityEdge_feature", "_UI_Probability_type"),
+
+ ActivitiesPackage.Literals.PROBABILITY__BASE_ACTIVITY_EDGE, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Base Parameter Set feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -165,6 +257,52 @@ public class ProbabilityItemProvider extends SysMLItemProviderAdapter implements
}
/**
+ * This adds a property descriptor for the Base Parameter Set feature for the UML element ActivityEdge.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_ParameterSetPropertyDescriptorForActivityEdge(Object object) {
+
+ itemPropertyDescriptorsForactivityEdge.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Probability_base_ParameterSet_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Probability_base_ParameterSet_feature", "_UI_Probability_type"),
+
+ ActivitiesPackage.Literals.PROBABILITY__BASE_PARAMETER_SET, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
+ * This adds a property descriptor for the Base Parameter Set feature for the UML element ParameterSet.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_ParameterSetPropertyDescriptorForParameterSet(Object object) {
+
+ itemPropertyDescriptorsForparameterSet.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Probability_base_ParameterSet_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Probability_base_ParameterSet_feature", "_UI_Probability_type"),
+
+ ActivitiesPackage.Literals.PROBABILITY__BASE_PARAMETER_SET, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Probability feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -176,6 +314,52 @@ public class ProbabilityItemProvider extends SysMLItemProviderAdapter implements
}
/**
+ * This adds a property descriptor for the Probability feature for the UML element ActivityEdge.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addProbabilityPropertyDescriptorForActivityEdge(Object object) {
+
+ itemPropertyDescriptorsForactivityEdge.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Probability_probability_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Probability_probability_feature", "_UI_Probability_type"),
+
+ ActivitiesPackage.Literals.PROBABILITY__PROBABILITY, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
+ * This adds a property descriptor for the Probability feature for the UML element ParameterSet.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addProbabilityPropertyDescriptorForParameterSet(Object object) {
+
+ itemPropertyDescriptorsForparameterSet.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Probability_probability_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Probability_probability_feature", "_UI_Probability_type"),
+
+ ActivitiesPackage.Literals.PROBABILITY__PROBABILITY, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This returns Probability.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -296,4 +480,5 @@ public class ProbabilityItemProvider extends SysMLItemProviderAdapter implements
public ResourceLocator getResourceLocator() {
return SysmlEditPlugin.INSTANCE;
}
+
}
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 d32825904e0..2b1fbd81b92 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
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
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;
@@ -30,6 +31,7 @@ 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.activities.ActivitiesPackage;
import org.eclipse.papyrus.sysml.activities.Rate;
@@ -48,18 +50,22 @@ import org.eclipse.uml2.uml.UMLPackage;
*
* @generated
*/
-public class RateItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class RateItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForparameter;
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForactivityEdge;
/**
@@ -74,6 +80,7 @@ public class RateItemProvider extends SysMLItemProviderAdapter implements IEditi
*
* @generated
*/
+
private static Pattern PARAMETER_PREFIX_PATTERN = Pattern.compile("Parameter");
/**
@@ -81,6 +88,7 @@ public class RateItemProvider extends SysMLItemProviderAdapter implements IEditi
*
* @generated
*/
+
private static Pattern ACTIVITY_EDGE_PREFIX_PATTERN = Pattern.compile("ActivityEdge");
/**
@@ -103,23 +111,43 @@ public class RateItemProvider extends SysMLItemProviderAdapter implements IEditi
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
+ if(object instanceof Rate) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
- addBase_ParameterPropertyDescriptor(object);
- addBase_ActivityEdgePropertyDescriptor(object);
- addRatePropertyDescriptor(object);
+ addBase_ParameterPropertyDescriptor(object);
+ addBase_ActivityEdgePropertyDescriptor(object);
+ addRatePropertyDescriptor(object);
+ }
}
/**
* Handle Parameter stereotyped by Rate
*/
if(object instanceof org.eclipse.uml2.uml.Parameter) {
+ org.eclipse.uml2.uml.Parameter element = (org.eclipse.uml2.uml.Parameter)object;
if(itemPropertyDescriptorsForparameter == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.PARAMETER);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForparameter = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForparameter.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.RATE_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ addBase_ParameterPropertyDescriptorForParameter(steApplication);
+
+ addBase_ParameterPropertyDescriptorForActivityEdge(steApplication);
+
+ addBase_ActivityEdgePropertyDescriptorForParameter(steApplication);
+
+ addBase_ActivityEdgePropertyDescriptorForActivityEdge(steApplication);
+
+ addRatePropertyDescriptorForParameter(steApplication);
+
+ addRatePropertyDescriptorForActivityEdge(steApplication);
+
+ }
}
return itemPropertyDescriptorsForparameter;
@@ -129,11 +157,29 @@ public class RateItemProvider extends SysMLItemProviderAdapter implements IEditi
* Handle ActivityEdge stereotyped by Rate
*/
if(object instanceof org.eclipse.uml2.uml.ActivityEdge) {
+ org.eclipse.uml2.uml.ActivityEdge element = (org.eclipse.uml2.uml.ActivityEdge)object;
if(itemPropertyDescriptorsForactivityEdge == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.ACTIVITY_EDGE);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForactivityEdge = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForactivityEdge.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.RATE_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ addBase_ParameterPropertyDescriptorForParameter(steApplication);
+
+ addBase_ParameterPropertyDescriptorForActivityEdge(steApplication);
+
+ addBase_ActivityEdgePropertyDescriptorForParameter(steApplication);
+
+ addBase_ActivityEdgePropertyDescriptorForActivityEdge(steApplication);
+
+ addRatePropertyDescriptorForParameter(steApplication);
+
+ addRatePropertyDescriptorForActivityEdge(steApplication);
+
+ }
}
return itemPropertyDescriptorsForactivityEdge;
@@ -154,6 +200,52 @@ public class RateItemProvider extends SysMLItemProviderAdapter implements IEditi
}
/**
+ * This adds a property descriptor for the Base Parameter feature for the UML element Parameter.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_ParameterPropertyDescriptorForParameter(Object object) {
+
+ itemPropertyDescriptorsForparameter.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Rate_base_Parameter_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Rate_base_Parameter_feature", "_UI_Rate_type"),
+
+ ActivitiesPackage.Literals.RATE__BASE_PARAMETER, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
+ * This adds a property descriptor for the Base Parameter feature for the UML element ActivityEdge.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_ParameterPropertyDescriptorForActivityEdge(Object object) {
+
+ itemPropertyDescriptorsForactivityEdge.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Rate_base_Parameter_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Rate_base_Parameter_feature", "_UI_Rate_type"),
+
+ ActivitiesPackage.Literals.RATE__BASE_PARAMETER, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Base Activity Edge feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -165,6 +257,52 @@ public class RateItemProvider extends SysMLItemProviderAdapter implements IEditi
}
/**
+ * This adds a property descriptor for the Base Activity Edge feature for the UML element Parameter.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_ActivityEdgePropertyDescriptorForParameter(Object object) {
+
+ itemPropertyDescriptorsForparameter.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Rate_base_ActivityEdge_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Rate_base_ActivityEdge_feature", "_UI_Rate_type"),
+
+ ActivitiesPackage.Literals.RATE__BASE_ACTIVITY_EDGE, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
+ * This adds a property descriptor for the Base Activity Edge feature for the UML element ActivityEdge.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_ActivityEdgePropertyDescriptorForActivityEdge(Object object) {
+
+ itemPropertyDescriptorsForactivityEdge.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Rate_base_ActivityEdge_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Rate_base_ActivityEdge_feature", "_UI_Rate_type"),
+
+ ActivitiesPackage.Literals.RATE__BASE_ACTIVITY_EDGE, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Rate feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -176,6 +314,52 @@ public class RateItemProvider extends SysMLItemProviderAdapter implements IEditi
}
/**
+ * This adds a property descriptor for the Rate feature for the UML element Parameter.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addRatePropertyDescriptorForParameter(Object object) {
+
+ itemPropertyDescriptorsForparameter.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Rate_rate_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Rate_rate_feature", "_UI_Rate_type"),
+
+ ActivitiesPackage.Literals.RATE__RATE, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
+ * This adds a property descriptor for the Rate feature for the UML element ActivityEdge.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addRatePropertyDescriptorForActivityEdge(Object object) {
+
+ itemPropertyDescriptorsForactivityEdge.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Rate_rate_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Rate_rate_feature", "_UI_Rate_type"),
+
+ ActivitiesPackage.Literals.RATE__RATE, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This returns Rate.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -296,4 +480,5 @@ public class RateItemProvider extends SysMLItemProviderAdapter implements IEditi
public ResourceLocator getResourceLocator() {
return SysmlEditPlugin.INSTANCE;
}
+
}
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 3112039aea7..99312ccf3a5 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
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
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;
@@ -30,6 +31,7 @@ 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.allocations.AllocateActivityPartition;
import org.eclipse.papyrus.sysml.allocations.AllocationsPackage;
@@ -48,12 +50,15 @@ import org.eclipse.uml2.uml.UMLPackage;
*
* @generated
*/
-public class AllocateActivityPartitionItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class AllocateActivityPartitionItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForactivityPartition;
/**
@@ -68,6 +73,7 @@ public class AllocateActivityPartitionItemProvider extends SysMLItemProviderAdap
*
* @generated
*/
+
private static Pattern ACTIVITY_PARTITION_PREFIX_PATTERN = Pattern.compile("ActivityPartition");
/**
@@ -90,21 +96,31 @@ public class AllocateActivityPartitionItemProvider extends SysMLItemProviderAdap
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
+ if(object instanceof AllocateActivityPartition) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
- addBase_ActivityPartitionPropertyDescriptor(object);
+ addBase_ActivityPartitionPropertyDescriptor(object);
+ }
}
/**
* Handle ActivityPartition stereotyped by AllocateActivityPartition
*/
if(object instanceof org.eclipse.uml2.uml.ActivityPartition) {
+ org.eclipse.uml2.uml.ActivityPartition element = (org.eclipse.uml2.uml.ActivityPartition)object;
if(itemPropertyDescriptorsForactivityPartition == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.ACTIVITY_PARTITION);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForactivityPartition = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForactivityPartition.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.ALLOCATE_ACTIVITY_PARTITION_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ addBase_ActivityPartitionPropertyDescriptorForActivityPartition(steApplication);
+
+ }
}
return itemPropertyDescriptorsForactivityPartition;
@@ -125,6 +141,29 @@ public class AllocateActivityPartitionItemProvider extends SysMLItemProviderAdap
}
/**
+ * This adds a property descriptor for the Base Activity Partition feature for the UML element ActivityPartition.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_ActivityPartitionPropertyDescriptorForActivityPartition(Object object) {
+
+ itemPropertyDescriptorsForactivityPartition.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_AllocateActivityPartition_base_ActivityPartition_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_AllocateActivityPartition_base_ActivityPartition_feature", "_UI_AllocateActivityPartition_type"),
+
+ AllocationsPackage.Literals.ALLOCATE_ACTIVITY_PARTITION__BASE_ACTIVITY_PARTITION, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This returns AllocateActivityPartition.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -223,4 +262,5 @@ public class AllocateActivityPartitionItemProvider extends SysMLItemProviderAdap
public ResourceLocator getResourceLocator() {
return SysmlEditPlugin.INSTANCE;
}
+
}
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 b1b6ce76747..1e990cf7f73 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
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
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;
@@ -30,6 +31,7 @@ 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.allocations.Allocate;
import org.eclipse.papyrus.sysml.allocations.AllocationsPackage;
@@ -48,12 +50,15 @@ import org.eclipse.uml2.uml.UMLPackage;
*
* @generated
*/
-public class AllocateItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class AllocateItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForabstraction;
/**
@@ -68,6 +73,7 @@ public class AllocateItemProvider extends SysMLItemProviderAdapter implements IE
*
* @generated
*/
+
private static Pattern ABSTRACTION_PREFIX_PATTERN = Pattern.compile("Abstraction");
/**
@@ -90,21 +96,31 @@ public class AllocateItemProvider extends SysMLItemProviderAdapter implements IE
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
+ if(object instanceof Allocate) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
- addBase_AbstractionPropertyDescriptor(object);
+ addBase_AbstractionPropertyDescriptor(object);
+ }
}
/**
* Handle Abstraction stereotyped by Allocate
*/
if(object instanceof org.eclipse.uml2.uml.Abstraction) {
+ org.eclipse.uml2.uml.Abstraction element = (org.eclipse.uml2.uml.Abstraction)object;
if(itemPropertyDescriptorsForabstraction == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.ABSTRACTION);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForabstraction = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForabstraction.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.ALLOCATE_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ addBase_AbstractionPropertyDescriptorForAbstraction(steApplication);
+
+ }
}
return itemPropertyDescriptorsForabstraction;
@@ -125,6 +141,29 @@ public class AllocateItemProvider extends SysMLItemProviderAdapter implements IE
}
/**
+ * This adds a property descriptor for the Base Abstraction feature for the UML element Abstraction.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_AbstractionPropertyDescriptorForAbstraction(Object object) {
+
+ itemPropertyDescriptorsForabstraction.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Allocate_base_Abstraction_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Allocate_base_Abstraction_feature", "_UI_Allocate_type"),
+
+ AllocationsPackage.Literals.ALLOCATE__BASE_ABSTRACTION, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This returns Allocate.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -223,4 +262,5 @@ public class AllocateItemProvider extends SysMLItemProviderAdapter implements IE
public ResourceLocator getResourceLocator() {
return SysmlEditPlugin.INSTANCE;
}
+
}
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 873f5a04327..d6f843213ce 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
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
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;
@@ -30,6 +31,7 @@ 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.allocations.Allocated;
import org.eclipse.papyrus.sysml.allocations.AllocationsPackage;
@@ -48,12 +50,15 @@ import org.eclipse.uml2.uml.UMLPackage;
*
* @generated
*/
-public class AllocatedItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class AllocatedItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsFornamedElement;
/**
@@ -68,6 +73,7 @@ public class AllocatedItemProvider extends SysMLItemProviderAdapter implements I
*
* @generated
*/
+
private static Pattern NAMED_ELEMENT_PREFIX_PATTERN = Pattern.compile("NamedElement");
/**
@@ -90,23 +96,37 @@ public class AllocatedItemProvider extends SysMLItemProviderAdapter implements I
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
+ if(object instanceof Allocated) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
- addBase_NamedElementPropertyDescriptor(object);
- addAllocatedFromPropertyDescriptor(object);
- addAllocatedToPropertyDescriptor(object);
+ addBase_NamedElementPropertyDescriptor(object);
+ addAllocatedFromPropertyDescriptor(object);
+ addAllocatedToPropertyDescriptor(object);
+ }
}
/**
* Handle NamedElement stereotyped by Allocated
*/
if(object instanceof org.eclipse.uml2.uml.NamedElement) {
+ org.eclipse.uml2.uml.NamedElement element = (org.eclipse.uml2.uml.NamedElement)object;
if(itemPropertyDescriptorsFornamedElement == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.NAMED_ELEMENT);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsFornamedElement = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsFornamedElement.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.ALLOCATED_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ addBase_NamedElementPropertyDescriptorForNamedElement(steApplication);
+
+ addAllocatedFromPropertyDescriptorForNamedElement(steApplication);
+
+ addAllocatedToPropertyDescriptorForNamedElement(steApplication);
+
+ }
}
return itemPropertyDescriptorsFornamedElement;
@@ -127,6 +147,29 @@ public class AllocatedItemProvider extends SysMLItemProviderAdapter implements I
}
/**
+ * This adds a property descriptor for the Base Named Element feature for the UML element NamedElement.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_NamedElementPropertyDescriptorForNamedElement(Object object) {
+
+ itemPropertyDescriptorsFornamedElement.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Allocated_base_NamedElement_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Allocated_base_NamedElement_feature", "_UI_Allocated_type"),
+
+ AllocationsPackage.Literals.ALLOCATED__BASE_NAMED_ELEMENT, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Allocated From feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -138,6 +181,29 @@ public class AllocatedItemProvider extends SysMLItemProviderAdapter implements I
}
/**
+ * This adds a property descriptor for the Allocated From feature for the UML element NamedElement.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addAllocatedFromPropertyDescriptorForNamedElement(Object object) {
+
+ itemPropertyDescriptorsFornamedElement.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Allocated_allocatedFrom_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Allocated_allocatedFrom_feature", "_UI_Allocated_type"),
+
+ AllocationsPackage.Literals.ALLOCATED__ALLOCATED_FROM, false, false, false,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Allocated To feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -149,6 +215,29 @@ public class AllocatedItemProvider extends SysMLItemProviderAdapter implements I
}
/**
+ * This adds a property descriptor for the Allocated To feature for the UML element NamedElement.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addAllocatedToPropertyDescriptorForNamedElement(Object object) {
+
+ itemPropertyDescriptorsFornamedElement.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Allocated_allocatedTo_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Allocated_allocatedTo_feature", "_UI_Allocated_type"),
+
+ AllocationsPackage.Literals.ALLOCATED__ALLOCATED_TO, false, false, false,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This returns Allocated.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -247,4 +336,5 @@ public class AllocatedItemProvider extends SysMLItemProviderAdapter implements I
public ResourceLocator getResourceLocator() {
return SysmlEditPlugin.INSTANCE;
}
+
}
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 d10e747f39d..814f4c00672 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
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
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;
@@ -30,6 +31,7 @@ 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.blocks.BindingConnector;
import org.eclipse.papyrus.sysml.blocks.BlocksPackage;
@@ -48,12 +50,15 @@ import org.eclipse.uml2.uml.UMLPackage;
*
* @generated
*/
-public class BindingConnectorItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class BindingConnectorItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForconnector;
/**
@@ -68,6 +73,7 @@ public class BindingConnectorItemProvider extends SysMLItemProviderAdapter imple
*
* @generated
*/
+
private static Pattern CONNECTOR_PREFIX_PATTERN = Pattern.compile("Connector");
/**
@@ -90,21 +96,31 @@ public class BindingConnectorItemProvider extends SysMLItemProviderAdapter imple
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
+ if(object instanceof BindingConnector) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
- addBase_ConnectorPropertyDescriptor(object);
+ addBase_ConnectorPropertyDescriptor(object);
+ }
}
/**
* Handle Connector stereotyped by BindingConnector
*/
if(object instanceof org.eclipse.uml2.uml.Connector) {
+ org.eclipse.uml2.uml.Connector element = (org.eclipse.uml2.uml.Connector)object;
if(itemPropertyDescriptorsForconnector == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.CONNECTOR);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForconnector = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForconnector.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.BINDING_CONNECTOR_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ addBase_ConnectorPropertyDescriptorForConnector(steApplication);
+
+ }
}
return itemPropertyDescriptorsForconnector;
@@ -125,6 +141,29 @@ public class BindingConnectorItemProvider extends SysMLItemProviderAdapter imple
}
/**
+ * This adds a property descriptor for the Base Connector feature for the UML element Connector.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_ConnectorPropertyDescriptorForConnector(Object object) {
+
+ itemPropertyDescriptorsForconnector.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_BindingConnector_base_Connector_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_BindingConnector_base_Connector_feature", "_UI_BindingConnector_type"),
+
+ BlocksPackage.Literals.BINDING_CONNECTOR__BASE_CONNECTOR, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This returns BindingConnector.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -223,4 +262,5 @@ public class BindingConnectorItemProvider extends SysMLItemProviderAdapter imple
public ResourceLocator getResourceLocator() {
return SysmlEditPlugin.INSTANCE;
}
+
}
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 f8d03d085b6..c4c1e015264 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
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
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;
@@ -31,6 +32,7 @@ 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.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptorDecorator;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.papyrus.sysml.blocks.Block;
@@ -50,12 +52,15 @@ import org.eclipse.uml2.uml.UMLPackage;
*
* @generated
*/
-public class BlockItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class BlockItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForclass;
/**
@@ -70,6 +75,7 @@ public class BlockItemProvider extends SysMLItemProviderAdapter implements IEdit
*
* @generated
*/
+
private static Pattern CLASS_PREFIX_PATTERN = Pattern.compile("Class");
/**
@@ -92,22 +98,34 @@ public class BlockItemProvider extends SysMLItemProviderAdapter implements IEdit
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
+ if(object instanceof Block) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
- addIsEncapsulatedPropertyDescriptor(object);
- addBase_ClassPropertyDescriptor(object);
+ addIsEncapsulatedPropertyDescriptor(object);
+ addBase_ClassPropertyDescriptor(object);
+ }
}
/**
* Handle Class stereotyped by Block
*/
if(object instanceof org.eclipse.uml2.uml.Class) {
+ org.eclipse.uml2.uml.Class element = (org.eclipse.uml2.uml.Class)object;
if(itemPropertyDescriptorsForclass == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.CLASS);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForclass = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForclass.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.BLOCK_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ addIsEncapsulatedPropertyDescriptorForClass(steApplication);
+
+ addBase_ClassPropertyDescriptorForClass(steApplication);
+
+ }
}
return itemPropertyDescriptorsForclass;
@@ -128,6 +146,29 @@ public class BlockItemProvider extends SysMLItemProviderAdapter implements IEdit
}
/**
+ * This adds a property descriptor for the Is Encapsulated feature for the UML element Class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addIsEncapsulatedPropertyDescriptorForClass(Object object) {
+
+ itemPropertyDescriptorsForclass.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Block_isEncapsulated_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Block_isEncapsulated_feature", "_UI_Block_type"),
+
+ BlocksPackage.Literals.BLOCK__IS_ENCAPSULATED, true, false, false,
+
+ ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Base Class feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -139,6 +180,29 @@ public class BlockItemProvider extends SysMLItemProviderAdapter implements IEdit
}
/**
+ * This adds a property descriptor for the Base Class feature for the UML element Class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_ClassPropertyDescriptorForClass(Object object) {
+
+ itemPropertyDescriptorsForclass.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Block_base_Class_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Block_base_Class_feature", "_UI_Block_type"),
+
+ BlocksPackage.Literals.BLOCK__BASE_CLASS, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This returns Block.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -244,4 +308,5 @@ public class BlockItemProvider extends SysMLItemProviderAdapter implements IEdit
public ResourceLocator getResourceLocator() {
return SysmlEditPlugin.INSTANCE;
}
+
}
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 da38f139919..0df0ace701d 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
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
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;
@@ -30,6 +31,7 @@ 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.blocks.BlocksPackage;
import org.eclipse.papyrus.sysml.blocks.ConnectorProperty;
@@ -48,12 +50,15 @@ import org.eclipse.uml2.uml.UMLPackage;
*
* @generated
*/
-public class ConnectorPropertyItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class ConnectorPropertyItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForproperty;
/**
@@ -68,6 +73,7 @@ public class ConnectorPropertyItemProvider extends SysMLItemProviderAdapter impl
*
* @generated
*/
+
private static Pattern PROPERTY_PREFIX_PATTERN = Pattern.compile("Property");
/**
@@ -90,22 +96,34 @@ public class ConnectorPropertyItemProvider extends SysMLItemProviderAdapter impl
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
+ if(object instanceof ConnectorProperty) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
- addBase_PropertyPropertyDescriptor(object);
- addConnectorPropertyDescriptor(object);
+ addBase_PropertyPropertyDescriptor(object);
+ addConnectorPropertyDescriptor(object);
+ }
}
/**
* Handle Property stereotyped by ConnectorProperty
*/
if(object instanceof org.eclipse.uml2.uml.Property) {
+ org.eclipse.uml2.uml.Property element = (org.eclipse.uml2.uml.Property)object;
if(itemPropertyDescriptorsForproperty == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.PROPERTY);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForproperty = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForproperty.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.CONNECTOR_PROPERTY_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ addBase_PropertyPropertyDescriptorForProperty(steApplication);
+
+ addConnectorPropertyDescriptorForProperty(steApplication);
+
+ }
}
return itemPropertyDescriptorsForproperty;
@@ -126,6 +144,29 @@ public class ConnectorPropertyItemProvider extends SysMLItemProviderAdapter impl
}
/**
+ * This adds a property descriptor for the Base Property feature for the UML element Property.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_PropertyPropertyDescriptorForProperty(Object object) {
+
+ itemPropertyDescriptorsForproperty.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ConnectorProperty_base_Property_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_ConnectorProperty_base_Property_feature", "_UI_ConnectorProperty_type"),
+
+ BlocksPackage.Literals.CONNECTOR_PROPERTY__BASE_PROPERTY, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Connector feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -137,6 +178,29 @@ public class ConnectorPropertyItemProvider extends SysMLItemProviderAdapter impl
}
/**
+ * This adds a property descriptor for the Connector feature for the UML element Property.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addConnectorPropertyDescriptorForProperty(Object object) {
+
+ itemPropertyDescriptorsForproperty.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ConnectorProperty_connector_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_ConnectorProperty_connector_feature", "_UI_ConnectorProperty_type"),
+
+ BlocksPackage.Literals.CONNECTOR_PROPERTY__CONNECTOR, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This returns ConnectorProperty.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -235,4 +299,5 @@ public class ConnectorPropertyItemProvider extends SysMLItemProviderAdapter impl
public ResourceLocator getResourceLocator() {
return SysmlEditPlugin.INSTANCE;
}
+
}
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 dc76f24d71d..fc918abb4c2 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
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
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;
@@ -30,6 +31,7 @@ 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.blocks.BlocksPackage;
import org.eclipse.papyrus.sysml.blocks.Dimension;
@@ -48,12 +50,15 @@ import org.eclipse.uml2.uml.UMLPackage;
*
* @generated
*/
-public class DimensionItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class DimensionItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForinstanceSpecification;
/**
@@ -68,6 +73,7 @@ public class DimensionItemProvider extends SysMLItemProviderAdapter implements I
*
* @generated
*/
+
private static Pattern INSTANCE_SPECIFICATION_PREFIX_PATTERN = Pattern.compile("InstanceSpecification");
/**
@@ -90,21 +96,31 @@ public class DimensionItemProvider extends SysMLItemProviderAdapter implements I
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
+ if(object instanceof Dimension) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
- addBase_InstanceSpecificationPropertyDescriptor(object);
+ addBase_InstanceSpecificationPropertyDescriptor(object);
+ }
}
/**
* Handle InstanceSpecification stereotyped by Dimension
*/
if(object instanceof org.eclipse.uml2.uml.InstanceSpecification) {
+ org.eclipse.uml2.uml.InstanceSpecification element = (org.eclipse.uml2.uml.InstanceSpecification)object;
if(itemPropertyDescriptorsForinstanceSpecification == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.INSTANCE_SPECIFICATION);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForinstanceSpecification = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForinstanceSpecification.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.DIMENSION_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ addBase_InstanceSpecificationPropertyDescriptorForInstanceSpecification(steApplication);
+
+ }
}
return itemPropertyDescriptorsForinstanceSpecification;
@@ -125,6 +141,29 @@ public class DimensionItemProvider extends SysMLItemProviderAdapter implements I
}
/**
+ * This adds a property descriptor for the Base Instance Specification feature for the UML element InstanceSpecification.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_InstanceSpecificationPropertyDescriptorForInstanceSpecification(Object object) {
+
+ itemPropertyDescriptorsForinstanceSpecification.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Dimension_base_InstanceSpecification_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Dimension_base_InstanceSpecification_feature", "_UI_Dimension_type"),
+
+ BlocksPackage.Literals.DIMENSION__BASE_INSTANCE_SPECIFICATION, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This returns Dimension.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -223,4 +262,5 @@ public class DimensionItemProvider extends SysMLItemProviderAdapter implements I
public ResourceLocator getResourceLocator() {
return SysmlEditPlugin.INSTANCE;
}
+
}
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 71fc93da750..bc1b2501e53 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
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
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;
@@ -30,6 +31,7 @@ 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.blocks.BlocksPackage;
import org.eclipse.papyrus.sysml.blocks.DistributedProperty;
@@ -48,12 +50,15 @@ import org.eclipse.uml2.uml.UMLPackage;
*
* @generated
*/
-public class DistributedPropertyItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class DistributedPropertyItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForproperty;
/**
@@ -68,6 +73,7 @@ public class DistributedPropertyItemProvider extends SysMLItemProviderAdapter im
*
* @generated
*/
+
private static Pattern PROPERTY_PREFIX_PATTERN = Pattern.compile("Property");
/**
@@ -90,21 +96,31 @@ public class DistributedPropertyItemProvider extends SysMLItemProviderAdapter im
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
+ if(object instanceof DistributedProperty) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
- addBase_PropertyPropertyDescriptor(object);
+ addBase_PropertyPropertyDescriptor(object);
+ }
}
/**
* Handle Property stereotyped by DistributedProperty
*/
if(object instanceof org.eclipse.uml2.uml.Property) {
+ org.eclipse.uml2.uml.Property element = (org.eclipse.uml2.uml.Property)object;
if(itemPropertyDescriptorsForproperty == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.PROPERTY);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForproperty = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForproperty.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.DISTRIBUTED_PROPERTY_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ addBase_PropertyPropertyDescriptorForProperty(steApplication);
+
+ }
}
return itemPropertyDescriptorsForproperty;
@@ -125,6 +141,29 @@ public class DistributedPropertyItemProvider extends SysMLItemProviderAdapter im
}
/**
+ * This adds a property descriptor for the Base Property feature for the UML element Property.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_PropertyPropertyDescriptorForProperty(Object object) {
+
+ itemPropertyDescriptorsForproperty.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DistributedProperty_base_Property_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_DistributedProperty_base_Property_feature", "_UI_DistributedProperty_type"),
+
+ BlocksPackage.Literals.DISTRIBUTED_PROPERTY__BASE_PROPERTY, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This returns DistributedProperty.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -223,4 +262,5 @@ public class DistributedPropertyItemProvider extends SysMLItemProviderAdapter im
public ResourceLocator getResourceLocator() {
return SysmlEditPlugin.INSTANCE;
}
+
}
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 5104c2cf7d7..239aa7dfdee 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
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
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;
@@ -30,6 +31,7 @@ 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.blocks.BlocksPackage;
import org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd;
@@ -48,12 +50,15 @@ import org.eclipse.uml2.uml.UMLPackage;
*
* @generated
*/
-public class NestedConnectorEndItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class NestedConnectorEndItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForconnectorEnd;
/**
@@ -68,6 +73,7 @@ public class NestedConnectorEndItemProvider extends SysMLItemProviderAdapter imp
*
* @generated
*/
+
private static Pattern CONNECTOR_END_PREFIX_PATTERN = Pattern.compile("ConnectorEnd");
/**
@@ -90,22 +96,34 @@ public class NestedConnectorEndItemProvider extends SysMLItemProviderAdapter imp
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
+ if(object instanceof NestedConnectorEnd) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
- addPropertyPathPropertyDescriptor(object);
- addBase_ConnectorEndPropertyDescriptor(object);
+ addPropertyPathPropertyDescriptor(object);
+ addBase_ConnectorEndPropertyDescriptor(object);
+ }
}
/**
* Handle ConnectorEnd stereotyped by NestedConnectorEnd
*/
if(object instanceof org.eclipse.uml2.uml.ConnectorEnd) {
+ org.eclipse.uml2.uml.ConnectorEnd element = (org.eclipse.uml2.uml.ConnectorEnd)object;
if(itemPropertyDescriptorsForconnectorEnd == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.CONNECTOR_END);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForconnectorEnd = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForconnectorEnd.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.NESTED_CONNECTOR_END_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ addPropertyPathPropertyDescriptorForConnectorEnd(steApplication);
+
+ addBase_ConnectorEndPropertyDescriptorForConnectorEnd(steApplication);
+
+ }
}
return itemPropertyDescriptorsForconnectorEnd;
@@ -126,6 +144,29 @@ public class NestedConnectorEndItemProvider extends SysMLItemProviderAdapter imp
}
/**
+ * This adds a property descriptor for the Property Path feature for the UML element ConnectorEnd.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addPropertyPathPropertyDescriptorForConnectorEnd(Object object) {
+
+ itemPropertyDescriptorsForconnectorEnd.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_NestedConnectorEnd_propertyPath_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_NestedConnectorEnd_propertyPath_feature", "_UI_NestedConnectorEnd_type"),
+
+ BlocksPackage.Literals.NESTED_CONNECTOR_END__PROPERTY_PATH, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Base Connector End feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -137,6 +178,29 @@ public class NestedConnectorEndItemProvider extends SysMLItemProviderAdapter imp
}
/**
+ * This adds a property descriptor for the Base Connector End feature for the UML element ConnectorEnd.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_ConnectorEndPropertyDescriptorForConnectorEnd(Object object) {
+
+ itemPropertyDescriptorsForconnectorEnd.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_NestedConnectorEnd_base_ConnectorEnd_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_NestedConnectorEnd_base_ConnectorEnd_feature", "_UI_NestedConnectorEnd_type"),
+
+ BlocksPackage.Literals.NESTED_CONNECTOR_END__BASE_CONNECTOR_END, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This returns NestedConnectorEnd.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -235,4 +299,5 @@ public class NestedConnectorEndItemProvider extends SysMLItemProviderAdapter imp
public ResourceLocator getResourceLocator() {
return SysmlEditPlugin.INSTANCE;
}
+
}
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 129880c35a9..4346e878102 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
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
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;
@@ -30,6 +31,7 @@ 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.blocks.BlocksPackage;
import org.eclipse.papyrus.sysml.blocks.ParticipantProperty;
@@ -48,12 +50,15 @@ import org.eclipse.uml2.uml.UMLPackage;
*
* @generated
*/
-public class ParticipantPropertyItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class ParticipantPropertyItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForproperty;
/**
@@ -68,6 +73,7 @@ public class ParticipantPropertyItemProvider extends SysMLItemProviderAdapter im
*
* @generated
*/
+
private static Pattern PROPERTY_PREFIX_PATTERN = Pattern.compile("Property");
/**
@@ -90,22 +96,34 @@ public class ParticipantPropertyItemProvider extends SysMLItemProviderAdapter im
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
+ if(object instanceof ParticipantProperty) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
- addBase_PropertyPropertyDescriptor(object);
- addEndPropertyDescriptor(object);
+ addBase_PropertyPropertyDescriptor(object);
+ addEndPropertyDescriptor(object);
+ }
}
/**
* Handle Property stereotyped by ParticipantProperty
*/
if(object instanceof org.eclipse.uml2.uml.Property) {
+ org.eclipse.uml2.uml.Property element = (org.eclipse.uml2.uml.Property)object;
if(itemPropertyDescriptorsForproperty == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.PROPERTY);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForproperty = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForproperty.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.PARTICIPANT_PROPERTY_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ addBase_PropertyPropertyDescriptorForProperty(steApplication);
+
+ addEndPropertyDescriptorForProperty(steApplication);
+
+ }
}
return itemPropertyDescriptorsForproperty;
@@ -126,6 +144,29 @@ public class ParticipantPropertyItemProvider extends SysMLItemProviderAdapter im
}
/**
+ * This adds a property descriptor for the Base Property feature for the UML element Property.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_PropertyPropertyDescriptorForProperty(Object object) {
+
+ itemPropertyDescriptorsForproperty.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ParticipantProperty_base_Property_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_ParticipantProperty_base_Property_feature", "_UI_ParticipantProperty_type"),
+
+ BlocksPackage.Literals.PARTICIPANT_PROPERTY__BASE_PROPERTY, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the End feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -137,6 +178,29 @@ public class ParticipantPropertyItemProvider extends SysMLItemProviderAdapter im
}
/**
+ * This adds a property descriptor for the End feature for the UML element Property.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addEndPropertyDescriptorForProperty(Object object) {
+
+ itemPropertyDescriptorsForproperty.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ParticipantProperty_end_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_ParticipantProperty_end_feature", "_UI_ParticipantProperty_type"),
+
+ BlocksPackage.Literals.PARTICIPANT_PROPERTY__END, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This returns ParticipantProperty.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -235,4 +299,5 @@ public class ParticipantPropertyItemProvider extends SysMLItemProviderAdapter im
public ResourceLocator getResourceLocator() {
return SysmlEditPlugin.INSTANCE;
}
+
}
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 fd504bdcc84..51e80fd00d5 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
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
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;
@@ -30,6 +31,7 @@ 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.blocks.BlocksPackage;
import org.eclipse.papyrus.sysml.blocks.PropertySpecificType;
@@ -48,12 +50,15 @@ import org.eclipse.uml2.uml.UMLPackage;
*
* @generated
*/
-public class PropertySpecificTypeItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class PropertySpecificTypeItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForclassifier;
/**
@@ -68,6 +73,7 @@ public class PropertySpecificTypeItemProvider extends SysMLItemProviderAdapter i
*
* @generated
*/
+
private static Pattern CLASSIFIER_PREFIX_PATTERN = Pattern.compile("Classifier");
/**
@@ -90,21 +96,31 @@ public class PropertySpecificTypeItemProvider extends SysMLItemProviderAdapter i
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
+ if(object instanceof PropertySpecificType) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
- addBase_ClassifierPropertyDescriptor(object);
+ addBase_ClassifierPropertyDescriptor(object);
+ }
}
/**
* Handle Classifier stereotyped by PropertySpecificType
*/
if(object instanceof org.eclipse.uml2.uml.Classifier) {
+ org.eclipse.uml2.uml.Classifier element = (org.eclipse.uml2.uml.Classifier)object;
if(itemPropertyDescriptorsForclassifier == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.CLASSIFIER);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForclassifier = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForclassifier.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.PROPERTY_SPECIFIC_TYPE_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ addBase_ClassifierPropertyDescriptorForClassifier(steApplication);
+
+ }
}
return itemPropertyDescriptorsForclassifier;
@@ -125,6 +141,29 @@ public class PropertySpecificTypeItemProvider extends SysMLItemProviderAdapter i
}
/**
+ * This adds a property descriptor for the Base Classifier feature for the UML element Classifier.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_ClassifierPropertyDescriptorForClassifier(Object object) {
+
+ itemPropertyDescriptorsForclassifier.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_PropertySpecificType_base_Classifier_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_PropertySpecificType_base_Classifier_feature", "_UI_PropertySpecificType_type"),
+
+ BlocksPackage.Literals.PROPERTY_SPECIFIC_TYPE__BASE_CLASSIFIER, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This returns PropertySpecificType.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -223,4 +262,5 @@ public class PropertySpecificTypeItemProvider extends SysMLItemProviderAdapter i
public ResourceLocator getResourceLocator() {
return SysmlEditPlugin.INSTANCE;
}
+
}
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 af666f467a4..a7680eac3da 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
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
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;
@@ -30,6 +31,7 @@ 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.blocks.BlocksPackage;
import org.eclipse.papyrus.sysml.blocks.Unit;
@@ -48,12 +50,15 @@ import org.eclipse.uml2.uml.UMLPackage;
*
* @generated
*/
-public class UnitItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class UnitItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForinstanceSpecification;
/**
@@ -68,6 +73,7 @@ public class UnitItemProvider extends SysMLItemProviderAdapter implements IEditi
*
* @generated
*/
+
private static Pattern INSTANCE_SPECIFICATION_PREFIX_PATTERN = Pattern.compile("InstanceSpecification");
/**
@@ -90,22 +96,34 @@ public class UnitItemProvider extends SysMLItemProviderAdapter implements IEditi
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
+ if(object instanceof Unit) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
- addBase_InstanceSpecificationPropertyDescriptor(object);
- addDimensionPropertyDescriptor(object);
+ addBase_InstanceSpecificationPropertyDescriptor(object);
+ addDimensionPropertyDescriptor(object);
+ }
}
/**
* Handle InstanceSpecification stereotyped by Unit
*/
if(object instanceof org.eclipse.uml2.uml.InstanceSpecification) {
+ org.eclipse.uml2.uml.InstanceSpecification element = (org.eclipse.uml2.uml.InstanceSpecification)object;
if(itemPropertyDescriptorsForinstanceSpecification == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.INSTANCE_SPECIFICATION);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForinstanceSpecification = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForinstanceSpecification.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.UNIT_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ addBase_InstanceSpecificationPropertyDescriptorForInstanceSpecification(steApplication);
+
+ addDimensionPropertyDescriptorForInstanceSpecification(steApplication);
+
+ }
}
return itemPropertyDescriptorsForinstanceSpecification;
@@ -126,6 +144,29 @@ public class UnitItemProvider extends SysMLItemProviderAdapter implements IEditi
}
/**
+ * This adds a property descriptor for the Base Instance Specification feature for the UML element InstanceSpecification.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_InstanceSpecificationPropertyDescriptorForInstanceSpecification(Object object) {
+
+ itemPropertyDescriptorsForinstanceSpecification.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Unit_base_InstanceSpecification_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Unit_base_InstanceSpecification_feature", "_UI_Unit_type"),
+
+ BlocksPackage.Literals.UNIT__BASE_INSTANCE_SPECIFICATION, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Dimension feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -137,6 +178,29 @@ public class UnitItemProvider extends SysMLItemProviderAdapter implements IEditi
}
/**
+ * This adds a property descriptor for the Dimension feature for the UML element InstanceSpecification.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addDimensionPropertyDescriptorForInstanceSpecification(Object object) {
+
+ itemPropertyDescriptorsForinstanceSpecification.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Unit_dimension_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Unit_dimension_feature", "_UI_Unit_type"),
+
+ BlocksPackage.Literals.UNIT__DIMENSION, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This returns Unit.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -235,4 +299,5 @@ public class UnitItemProvider extends SysMLItemProviderAdapter implements IEditi
public ResourceLocator getResourceLocator() {
return SysmlEditPlugin.INSTANCE;
}
+
}
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 584a901d739..408a76665c6 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
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
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;
@@ -30,6 +31,7 @@ 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.blocks.BlocksPackage;
import org.eclipse.papyrus.sysml.blocks.ValueType;
@@ -48,12 +50,15 @@ import org.eclipse.uml2.uml.UMLPackage;
*
* @generated
*/
-public class ValueTypeItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class ValueTypeItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsFordataType;
/**
@@ -68,6 +73,7 @@ public class ValueTypeItemProvider extends SysMLItemProviderAdapter implements I
*
* @generated
*/
+
private static Pattern DATA_TYPE_PREFIX_PATTERN = Pattern.compile("DataType");
/**
@@ -90,23 +96,37 @@ public class ValueTypeItemProvider extends SysMLItemProviderAdapter implements I
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
+ if(object instanceof ValueType) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
- addBase_DataTypePropertyDescriptor(object);
- addUnitPropertyDescriptor(object);
- addDimensionPropertyDescriptor(object);
+ addBase_DataTypePropertyDescriptor(object);
+ addUnitPropertyDescriptor(object);
+ addDimensionPropertyDescriptor(object);
+ }
}
/**
* Handle DataType stereotyped by ValueType
*/
if(object instanceof org.eclipse.uml2.uml.DataType) {
+ org.eclipse.uml2.uml.DataType element = (org.eclipse.uml2.uml.DataType)object;
if(itemPropertyDescriptorsFordataType == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.DATA_TYPE);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsFordataType = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsFordataType.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.VALUE_TYPE_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ addBase_DataTypePropertyDescriptorForDataType(steApplication);
+
+ addUnitPropertyDescriptorForDataType(steApplication);
+
+ addDimensionPropertyDescriptorForDataType(steApplication);
+
+ }
}
return itemPropertyDescriptorsFordataType;
@@ -127,6 +147,29 @@ public class ValueTypeItemProvider extends SysMLItemProviderAdapter implements I
}
/**
+ * This adds a property descriptor for the Base Data Type feature for the UML element DataType.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_DataTypePropertyDescriptorForDataType(Object object) {
+
+ itemPropertyDescriptorsFordataType.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ValueType_base_DataType_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_ValueType_base_DataType_feature", "_UI_ValueType_type"),
+
+ BlocksPackage.Literals.VALUE_TYPE__BASE_DATA_TYPE, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Unit feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -138,6 +181,29 @@ public class ValueTypeItemProvider extends SysMLItemProviderAdapter implements I
}
/**
+ * This adds a property descriptor for the Unit feature for the UML element DataType.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addUnitPropertyDescriptorForDataType(Object object) {
+
+ itemPropertyDescriptorsFordataType.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ValueType_unit_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_ValueType_unit_feature", "_UI_ValueType_type"),
+
+ BlocksPackage.Literals.VALUE_TYPE__UNIT, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Dimension feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -149,6 +215,29 @@ public class ValueTypeItemProvider extends SysMLItemProviderAdapter implements I
}
/**
+ * This adds a property descriptor for the Dimension feature for the UML element DataType.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addDimensionPropertyDescriptorForDataType(Object object) {
+
+ itemPropertyDescriptorsFordataType.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ValueType_dimension_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_ValueType_dimension_feature", "_UI_ValueType_type"),
+
+ BlocksPackage.Literals.VALUE_TYPE__DIMENSION, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This returns ValueType.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -247,4 +336,5 @@ public class ValueTypeItemProvider extends SysMLItemProviderAdapter implements I
public ResourceLocator getResourceLocator() {
return SysmlEditPlugin.INSTANCE;
}
+
}
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 44ae69e1bea..581504f1c76 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
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
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.ComposedImage;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -48,12 +49,15 @@ import org.eclipse.uml2.uml.edit.UMLEditPlugin;
*
* @generated
*/
-public class ConstraintBlockItemProvider extends BlockItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IVisibilityOverlayImage {
+public class ConstraintBlockItemProvider extends BlockItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IVisibilityOverlayImage
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForclass;
/**
@@ -68,6 +72,7 @@ public class ConstraintBlockItemProvider extends BlockItemProvider implements IE
*
* @generated
*/
+
private static Pattern CLASS_PREFIX_PATTERN = Pattern.compile("Class");
/**
@@ -90,20 +95,28 @@ public class ConstraintBlockItemProvider extends BlockItemProvider implements IE
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
+ if(object instanceof ConstraintBlock) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
+ }
}
/**
* Handle Class stereotyped by ConstraintBlock
*/
if(object instanceof org.eclipse.uml2.uml.Class) {
+ org.eclipse.uml2.uml.Class element = (org.eclipse.uml2.uml.Class)object;
if(itemPropertyDescriptorsForclass == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.CLASS);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForclass = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForclass.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.CONSTRAINT_BLOCK_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ }
}
return itemPropertyDescriptorsForclass;
@@ -223,10 +236,13 @@ public class ConstraintBlockItemProvider extends BlockItemProvider implements IE
*/
public ComposedImage composeVisibilityImage(Object object, ComposedImage composedImage) {
NamedElement namedElement = (NamedElement)object;
+
if(namedElement.isSetVisibility()) {
composedImage.getImages().add(UMLEditPlugin.INSTANCE.getImage("full/ovr16/VisibilityKind_" //$NON-NLS-1$
+ namedElement.getVisibility().getName()));
}
+
return composedImage;
}
+
}
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 5d97c3c50f4..897fe1f09a6 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
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
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;
@@ -30,6 +31,7 @@ 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.constraints.ConstraintProperty;
import org.eclipse.papyrus.sysml.constraints.ConstraintsPackage;
@@ -48,12 +50,15 @@ import org.eclipse.uml2.uml.UMLPackage;
*
* @generated
*/
-public class ConstraintPropertyItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class ConstraintPropertyItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForproperty;
/**
@@ -68,6 +73,7 @@ public class ConstraintPropertyItemProvider extends SysMLItemProviderAdapter imp
*
* @generated
*/
+
private static Pattern PROPERTY_PREFIX_PATTERN = Pattern.compile("Property");
/**
@@ -90,21 +96,31 @@ public class ConstraintPropertyItemProvider extends SysMLItemProviderAdapter imp
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
+ if(object instanceof ConstraintProperty) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
- addBase_PropertyPropertyDescriptor(object);
+ addBase_PropertyPropertyDescriptor(object);
+ }
}
/**
* Handle Property stereotyped by ConstraintProperty
*/
if(object instanceof org.eclipse.uml2.uml.Property) {
+ org.eclipse.uml2.uml.Property element = (org.eclipse.uml2.uml.Property)object;
if(itemPropertyDescriptorsForproperty == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.PROPERTY);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForproperty = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForproperty.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.CONSTRAINT_PROPERTY_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ addBase_PropertyPropertyDescriptorForProperty(steApplication);
+
+ }
}
return itemPropertyDescriptorsForproperty;
@@ -125,6 +141,29 @@ public class ConstraintPropertyItemProvider extends SysMLItemProviderAdapter imp
}
/**
+ * This adds a property descriptor for the Base Property feature for the UML element Property.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_PropertyPropertyDescriptorForProperty(Object object) {
+
+ itemPropertyDescriptorsForproperty.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ConstraintProperty_base_Property_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_ConstraintProperty_base_Property_feature", "_UI_ConstraintProperty_type"),
+
+ ConstraintsPackage.Literals.CONSTRAINT_PROPERTY__BASE_PROPERTY, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This returns ConstraintProperty.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -223,4 +262,5 @@ public class ConstraintPropertyItemProvider extends SysMLItemProviderAdapter imp
public ResourceLocator getResourceLocator() {
return SysmlEditPlugin.INSTANCE;
}
+
}
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 cda4987c588..e7cf429aa81 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
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
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;
@@ -30,6 +31,7 @@ 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.SysMLItemProviderAdapter;
@@ -48,12 +50,15 @@ import org.eclipse.uml2.uml.UMLPackage;
*
* @generated
*/
-public class ConformItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class ConformItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsFordependency;
/**
@@ -68,6 +73,7 @@ public class ConformItemProvider extends SysMLItemProviderAdapter implements IEd
*
* @generated
*/
+
private static Pattern DEPENDENCY_PREFIX_PATTERN = Pattern.compile("Dependency");
/**
@@ -90,21 +96,31 @@ public class ConformItemProvider extends SysMLItemProviderAdapter implements IEd
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
+ if(object instanceof Conform) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
- addBase_DependencyPropertyDescriptor(object);
+ addBase_DependencyPropertyDescriptor(object);
+ }
}
/**
* Handle Dependency stereotyped by Conform
*/
if(object instanceof org.eclipse.uml2.uml.Dependency) {
+ org.eclipse.uml2.uml.Dependency element = (org.eclipse.uml2.uml.Dependency)object;
if(itemPropertyDescriptorsFordependency == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.DEPENDENCY);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsFordependency = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsFordependency.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.CONFORM_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ addBase_DependencyPropertyDescriptorForDependency(steApplication);
+
+ }
}
return itemPropertyDescriptorsFordependency;
@@ -125,6 +141,29 @@ public class ConformItemProvider extends SysMLItemProviderAdapter implements IEd
}
/**
+ * This adds a property descriptor for the Base Dependency feature for the UML element Dependency.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_DependencyPropertyDescriptorForDependency(Object object) {
+
+ itemPropertyDescriptorsFordependency.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Conform_base_Dependency_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Conform_base_Dependency_feature", "_UI_Conform_type"),
+
+ ModelelementsPackage.Literals.CONFORM__BASE_DEPENDENCY, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This returns Conform.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -223,4 +262,5 @@ public class ConformItemProvider extends SysMLItemProviderAdapter implements IEd
public ResourceLocator getResourceLocator() {
return SysmlEditPlugin.INSTANCE;
}
+
}
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 38655beb5fa..98c489155a8 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
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
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;
@@ -30,6 +31,7 @@ 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.SysMLItemProviderAdapter;
@@ -48,12 +50,15 @@ import org.eclipse.uml2.uml.UMLPackage;
*
* @generated
*/
-public class ProblemItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class ProblemItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForcomment;
/**
@@ -68,6 +73,7 @@ public class ProblemItemProvider extends SysMLItemProviderAdapter implements IEd
*
* @generated
*/
+
private static Pattern COMMENT_PREFIX_PATTERN = Pattern.compile("Comment");
/**
@@ -90,21 +96,31 @@ public class ProblemItemProvider extends SysMLItemProviderAdapter implements IEd
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
+ if(object instanceof Problem) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
- addBase_CommentPropertyDescriptor(object);
+ addBase_CommentPropertyDescriptor(object);
+ }
}
/**
* Handle Comment stereotyped by Problem
*/
if(object instanceof org.eclipse.uml2.uml.Comment) {
+ org.eclipse.uml2.uml.Comment element = (org.eclipse.uml2.uml.Comment)object;
if(itemPropertyDescriptorsForcomment == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.COMMENT);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForcomment = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForcomment.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.PROBLEM_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ addBase_CommentPropertyDescriptorForComment(steApplication);
+
+ }
}
return itemPropertyDescriptorsForcomment;
@@ -125,6 +141,29 @@ public class ProblemItemProvider extends SysMLItemProviderAdapter implements IEd
}
/**
+ * This adds a property descriptor for the Base Comment feature for the UML element Comment.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_CommentPropertyDescriptorForComment(Object object) {
+
+ itemPropertyDescriptorsForcomment.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Problem_base_Comment_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Problem_base_Comment_feature", "_UI_Problem_type"),
+
+ ModelelementsPackage.Literals.PROBLEM__BASE_COMMENT, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This returns Problem.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -223,4 +262,5 @@ public class ProblemItemProvider extends SysMLItemProviderAdapter implements IEd
public ResourceLocator getResourceLocator() {
return SysmlEditPlugin.INSTANCE;
}
+
}
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 0b7d2fbb4c9..e75c9a9f59b 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
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
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;
@@ -30,6 +31,7 @@ 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.SysMLItemProviderAdapter;
@@ -48,12 +50,15 @@ import org.eclipse.uml2.uml.UMLPackage;
*
* @generated
*/
-public class RationaleItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class RationaleItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForcomment;
/**
@@ -68,6 +73,7 @@ public class RationaleItemProvider extends SysMLItemProviderAdapter implements I
*
* @generated
*/
+
private static Pattern COMMENT_PREFIX_PATTERN = Pattern.compile("Comment");
/**
@@ -90,21 +96,31 @@ public class RationaleItemProvider extends SysMLItemProviderAdapter implements I
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
+ if(object instanceof Rationale) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
- addBase_CommentPropertyDescriptor(object);
+ addBase_CommentPropertyDescriptor(object);
+ }
}
/**
* Handle Comment stereotyped by Rationale
*/
if(object instanceof org.eclipse.uml2.uml.Comment) {
+ org.eclipse.uml2.uml.Comment element = (org.eclipse.uml2.uml.Comment)object;
if(itemPropertyDescriptorsForcomment == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.COMMENT);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForcomment = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForcomment.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.RATIONALE_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ addBase_CommentPropertyDescriptorForComment(steApplication);
+
+ }
}
return itemPropertyDescriptorsForcomment;
@@ -125,6 +141,29 @@ public class RationaleItemProvider extends SysMLItemProviderAdapter implements I
}
/**
+ * This adds a property descriptor for the Base Comment feature for the UML element Comment.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_CommentPropertyDescriptorForComment(Object object) {
+
+ itemPropertyDescriptorsForcomment.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Rationale_base_Comment_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Rationale_base_Comment_feature", "_UI_Rationale_type"),
+
+ ModelelementsPackage.Literals.RATIONALE__BASE_COMMENT, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This returns Rationale.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -223,4 +262,5 @@ public class RationaleItemProvider extends SysMLItemProviderAdapter implements I
public ResourceLocator getResourceLocator() {
return SysmlEditPlugin.INSTANCE;
}
+
}
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 c6db6432795..f5c731de637 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
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
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;
@@ -30,6 +31,7 @@ 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.SysMLItemProviderAdapter;
@@ -48,12 +50,15 @@ import org.eclipse.uml2.uml.UMLPackage;
*
* @generated
*/
-public class ViewItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class ViewItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForpackage;
/**
@@ -68,6 +73,7 @@ public class ViewItemProvider extends SysMLItemProviderAdapter implements IEditi
*
* @generated
*/
+
private static Pattern PACKAGE_PREFIX_PATTERN = Pattern.compile("Package");
/**
@@ -90,22 +96,34 @@ public class ViewItemProvider extends SysMLItemProviderAdapter implements IEditi
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
+ if(object instanceof View) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
- addViewPointPropertyDescriptor(object);
- addBase_PackagePropertyDescriptor(object);
+ addViewPointPropertyDescriptor(object);
+ addBase_PackagePropertyDescriptor(object);
+ }
}
/**
* Handle Package stereotyped by View
*/
if(object instanceof org.eclipse.uml2.uml.Package) {
+ org.eclipse.uml2.uml.Package element = (org.eclipse.uml2.uml.Package)object;
if(itemPropertyDescriptorsForpackage == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.PACKAGE);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForpackage = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForpackage.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.VIEW_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ addViewPointPropertyDescriptorForPackage(steApplication);
+
+ addBase_PackagePropertyDescriptorForPackage(steApplication);
+
+ }
}
return itemPropertyDescriptorsForpackage;
@@ -126,6 +144,29 @@ public class ViewItemProvider extends SysMLItemProviderAdapter implements IEditi
}
/**
+ * This adds a property descriptor for the View Point feature for the UML element Package.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addViewPointPropertyDescriptorForPackage(Object object) {
+
+ itemPropertyDescriptorsForpackage.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_View_viewPoint_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_View_viewPoint_feature", "_UI_View_type"),
+
+ ModelelementsPackage.Literals.VIEW__VIEW_POINT, false, false, false,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Base Package feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -137,6 +178,29 @@ public class ViewItemProvider extends SysMLItemProviderAdapter implements IEditi
}
/**
+ * This adds a property descriptor for the Base Package feature for the UML element Package.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_PackagePropertyDescriptorForPackage(Object object) {
+
+ itemPropertyDescriptorsForpackage.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_View_base_Package_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_View_base_Package_feature", "_UI_View_type"),
+
+ ModelelementsPackage.Literals.VIEW__BASE_PACKAGE, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This returns View.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -235,4 +299,5 @@ public class ViewItemProvider extends SysMLItemProviderAdapter implements IEditi
public ResourceLocator getResourceLocator() {
return SysmlEditPlugin.INSTANCE;
}
+
}
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 43ee09838bd..9431a7d9141 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
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
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;
@@ -31,6 +32,7 @@ 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.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptorDecorator;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.papyrus.sysml.edit.provider.IComposableAdapterFactory;
@@ -50,12 +52,15 @@ import org.eclipse.uml2.uml.UMLPackage;
*
* @generated
*/
-public class ViewPointItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class ViewPointItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForclass;
/**
@@ -70,6 +75,7 @@ public class ViewPointItemProvider extends SysMLItemProviderAdapter implements I
*
* @generated
*/
+
private static Pattern CLASS_PREFIX_PATTERN = Pattern.compile("Class");
/**
@@ -92,26 +98,46 @@ public class ViewPointItemProvider extends SysMLItemProviderAdapter implements I
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addBase_ClassPropertyDescriptor(object);
- addStakeHoldersPropertyDescriptor(object);
- addPurposePropertyDescriptor(object);
- addConcernsPropertyDescriptor(object);
- addLanguagesPropertyDescriptor(object);
- addMethodsPropertyDescriptor(object);
+ if(object instanceof ViewPoint) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
+
+ addBase_ClassPropertyDescriptor(object);
+ addStakeHoldersPropertyDescriptor(object);
+ addPurposePropertyDescriptor(object);
+ addConcernsPropertyDescriptor(object);
+ addLanguagesPropertyDescriptor(object);
+ addMethodsPropertyDescriptor(object);
+ }
}
/**
* Handle Class stereotyped by ViewPoint
*/
if(object instanceof org.eclipse.uml2.uml.Class) {
+ org.eclipse.uml2.uml.Class element = (org.eclipse.uml2.uml.Class)object;
if(itemPropertyDescriptorsForclass == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.CLASS);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForclass = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForclass.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.VIEW_POINT_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ addBase_ClassPropertyDescriptorForClass(steApplication);
+
+ addStakeHoldersPropertyDescriptorForClass(steApplication);
+
+ addPurposePropertyDescriptorForClass(steApplication);
+
+ addConcernsPropertyDescriptorForClass(steApplication);
+
+ addLanguagesPropertyDescriptorForClass(steApplication);
+
+ addMethodsPropertyDescriptorForClass(steApplication);
+
+ }
}
return itemPropertyDescriptorsForclass;
@@ -132,6 +158,29 @@ public class ViewPointItemProvider extends SysMLItemProviderAdapter implements I
}
/**
+ * This adds a property descriptor for the Base Class feature for the UML element Class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_ClassPropertyDescriptorForClass(Object object) {
+
+ itemPropertyDescriptorsForclass.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ViewPoint_base_Class_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_ViewPoint_base_Class_feature", "_UI_ViewPoint_type"),
+
+ ModelelementsPackage.Literals.VIEW_POINT__BASE_CLASS, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Stake Holders feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -143,6 +192,29 @@ public class ViewPointItemProvider extends SysMLItemProviderAdapter implements I
}
/**
+ * This adds a property descriptor for the Stake Holders feature for the UML element Class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addStakeHoldersPropertyDescriptorForClass(Object object) {
+
+ itemPropertyDescriptorsForclass.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ViewPoint_stakeHolders_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_ViewPoint_stakeHolders_feature", "_UI_ViewPoint_type"),
+
+ ModelelementsPackage.Literals.VIEW_POINT__STAKE_HOLDERS, true, false, false,
+
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Purpose feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -154,6 +226,29 @@ public class ViewPointItemProvider extends SysMLItemProviderAdapter implements I
}
/**
+ * This adds a property descriptor for the Purpose feature for the UML element Class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addPurposePropertyDescriptorForClass(Object object) {
+
+ itemPropertyDescriptorsForclass.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ViewPoint_purpose_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_ViewPoint_purpose_feature", "_UI_ViewPoint_type"),
+
+ ModelelementsPackage.Literals.VIEW_POINT__PURPOSE, true, false, false,
+
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Concerns feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -165,6 +260,29 @@ public class ViewPointItemProvider extends SysMLItemProviderAdapter implements I
}
/**
+ * This adds a property descriptor for the Concerns feature for the UML element Class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addConcernsPropertyDescriptorForClass(Object object) {
+
+ itemPropertyDescriptorsForclass.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ViewPoint_concerns_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_ViewPoint_concerns_feature", "_UI_ViewPoint_type"),
+
+ ModelelementsPackage.Literals.VIEW_POINT__CONCERNS, true, false, false,
+
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Languages feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -176,6 +294,29 @@ public class ViewPointItemProvider extends SysMLItemProviderAdapter implements I
}
/**
+ * This adds a property descriptor for the Languages feature for the UML element Class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addLanguagesPropertyDescriptorForClass(Object object) {
+
+ itemPropertyDescriptorsForclass.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ViewPoint_languages_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_ViewPoint_languages_feature", "_UI_ViewPoint_type"),
+
+ ModelelementsPackage.Literals.VIEW_POINT__LANGUAGES, true, false, false,
+
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Methods feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -187,6 +328,29 @@ public class ViewPointItemProvider extends SysMLItemProviderAdapter implements I
}
/**
+ * This adds a property descriptor for the Methods feature for the UML element Class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addMethodsPropertyDescriptorForClass(Object object) {
+
+ itemPropertyDescriptorsForclass.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ViewPoint_methods_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_ViewPoint_methods_feature", "_UI_ViewPoint_type"),
+
+ ModelelementsPackage.Literals.VIEW_POINT__METHODS, true, false, false,
+
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This returns ViewPoint.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -296,4 +460,5 @@ public class ViewPointItemProvider extends SysMLItemProviderAdapter implements I
public ResourceLocator getResourceLocator() {
return SysmlEditPlugin.INSTANCE;
}
+
}
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 6ccf7ac5835..c3577823630 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
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
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;
@@ -31,6 +32,7 @@ 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.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptorDecorator;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.papyrus.sysml.edit.provider.IComposableAdapterFactory;
@@ -50,12 +52,15 @@ import org.eclipse.uml2.uml.UMLPackage;
*
* @generated
*/
-public class FlowPortItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class FlowPortItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForport;
/**
@@ -70,6 +75,7 @@ public class FlowPortItemProvider extends SysMLItemProviderAdapter implements IE
*
* @generated
*/
+
private static Pattern PORT_PREFIX_PATTERN = Pattern.compile("Port");
/**
@@ -92,24 +98,40 @@ public class FlowPortItemProvider extends SysMLItemProviderAdapter implements IE
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
+ if(object instanceof FlowPort) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
- addBase_PortPropertyDescriptor(object);
- addIsAtomicPropertyDescriptor(object);
- addIsConjugatedPropertyDescriptor(object);
- addDirectionPropertyDescriptor(object);
+ addBase_PortPropertyDescriptor(object);
+ addIsAtomicPropertyDescriptor(object);
+ addIsConjugatedPropertyDescriptor(object);
+ addDirectionPropertyDescriptor(object);
+ }
}
/**
* Handle Port stereotyped by FlowPort
*/
if(object instanceof org.eclipse.uml2.uml.Port) {
+ org.eclipse.uml2.uml.Port element = (org.eclipse.uml2.uml.Port)object;
if(itemPropertyDescriptorsForport == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.PORT);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForport = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForport.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.FLOW_PORT_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ addBase_PortPropertyDescriptorForPort(steApplication);
+
+ addIsAtomicPropertyDescriptorForPort(steApplication);
+
+ addIsConjugatedPropertyDescriptorForPort(steApplication);
+
+ addDirectionPropertyDescriptorForPort(steApplication);
+
+ }
}
return itemPropertyDescriptorsForport;
@@ -130,6 +152,29 @@ public class FlowPortItemProvider extends SysMLItemProviderAdapter implements IE
}
/**
+ * This adds a property descriptor for the Base Port feature for the UML element Port.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_PortPropertyDescriptorForPort(Object object) {
+
+ itemPropertyDescriptorsForport.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_FlowPort_base_Port_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_FlowPort_base_Port_feature", "_UI_FlowPort_type"),
+
+ PortandflowsPackage.Literals.FLOW_PORT__BASE_PORT, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Is Atomic feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -141,6 +186,29 @@ public class FlowPortItemProvider extends SysMLItemProviderAdapter implements IE
}
/**
+ * This adds a property descriptor for the Is Atomic feature for the UML element Port.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addIsAtomicPropertyDescriptorForPort(Object object) {
+
+ itemPropertyDescriptorsForport.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_FlowPort_isAtomic_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_FlowPort_isAtomic_feature", "_UI_FlowPort_type"),
+
+ PortandflowsPackage.Literals.FLOW_PORT__IS_ATOMIC, false, false, false,
+
+ ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Is Conjugated feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -152,6 +220,29 @@ public class FlowPortItemProvider extends SysMLItemProviderAdapter implements IE
}
/**
+ * This adds a property descriptor for the Is Conjugated feature for the UML element Port.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addIsConjugatedPropertyDescriptorForPort(Object object) {
+
+ itemPropertyDescriptorsForport.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_FlowPort_isConjugated_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_FlowPort_isConjugated_feature", "_UI_FlowPort_type"),
+
+ PortandflowsPackage.Literals.FLOW_PORT__IS_CONJUGATED, true, false, false,
+
+ ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Direction feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -163,6 +254,29 @@ public class FlowPortItemProvider extends SysMLItemProviderAdapter implements IE
}
/**
+ * This adds a property descriptor for the Direction feature for the UML element Port.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addDirectionPropertyDescriptorForPort(Object object) {
+
+ itemPropertyDescriptorsForport.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_FlowPort_direction_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_FlowPort_direction_feature", "_UI_FlowPort_type"),
+
+ PortandflowsPackage.Literals.FLOW_PORT__DIRECTION, true, false, false,
+
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This returns FlowPort.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -270,4 +384,5 @@ public class FlowPortItemProvider extends SysMLItemProviderAdapter implements IE
public ResourceLocator getResourceLocator() {
return SysmlEditPlugin.INSTANCE;
}
+
}
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 8688f3b954f..93fbcca6f35 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
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
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;
@@ -31,6 +32,7 @@ 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.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptorDecorator;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.papyrus.sysml.edit.provider.IComposableAdapterFactory;
@@ -51,12 +53,15 @@ import org.eclipse.uml2.uml.UMLPackage;
*
* @generated
*/
-public class FlowPropertyItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class FlowPropertyItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForproperty;
/**
@@ -71,6 +76,7 @@ public class FlowPropertyItemProvider extends SysMLItemProviderAdapter implement
*
* @generated
*/
+
private static Pattern PROPERTY_PREFIX_PATTERN = Pattern.compile("Property");
/**
@@ -93,22 +99,34 @@ public class FlowPropertyItemProvider extends SysMLItemProviderAdapter implement
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
+ if(object instanceof FlowProperty) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
- addBase_PropertyPropertyDescriptor(object);
- addDirectionPropertyDescriptor(object);
+ addBase_PropertyPropertyDescriptor(object);
+ addDirectionPropertyDescriptor(object);
+ }
}
/**
* Handle Property stereotyped by FlowProperty
*/
if(object instanceof org.eclipse.uml2.uml.Property) {
+ org.eclipse.uml2.uml.Property element = (org.eclipse.uml2.uml.Property)object;
if(itemPropertyDescriptorsForproperty == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.PROPERTY);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForproperty = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForproperty.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.FLOW_PROPERTY_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ addBase_PropertyPropertyDescriptorForProperty(steApplication);
+
+ addDirectionPropertyDescriptorForProperty(steApplication);
+
+ }
}
return itemPropertyDescriptorsForproperty;
@@ -129,6 +147,29 @@ public class FlowPropertyItemProvider extends SysMLItemProviderAdapter implement
}
/**
+ * This adds a property descriptor for the Base Property feature for the UML element Property.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_PropertyPropertyDescriptorForProperty(Object object) {
+
+ itemPropertyDescriptorsForproperty.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_FlowProperty_base_Property_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_FlowProperty_base_Property_feature", "_UI_FlowProperty_type"),
+
+ PortandflowsPackage.Literals.FLOW_PROPERTY__BASE_PROPERTY, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Direction feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -140,6 +181,29 @@ public class FlowPropertyItemProvider extends SysMLItemProviderAdapter implement
}
/**
+ * This adds a property descriptor for the Direction feature for the UML element Property.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addDirectionPropertyDescriptorForProperty(Object object) {
+
+ itemPropertyDescriptorsForproperty.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_FlowProperty_direction_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_FlowProperty_direction_feature", "_UI_FlowProperty_type"),
+
+ PortandflowsPackage.Literals.FLOW_PROPERTY__DIRECTION, true, false, false,
+
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This returns FlowProperty.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -246,4 +310,5 @@ public class FlowPropertyItemProvider extends SysMLItemProviderAdapter implement
public ResourceLocator getResourceLocator() {
return SysmlEditPlugin.INSTANCE;
}
+
}
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 b16dcfa9fc3..464eda2cb62 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
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
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;
@@ -30,6 +31,7 @@ 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.SysMLItemProviderAdapter;
@@ -48,12 +50,15 @@ import org.eclipse.uml2.uml.UMLPackage;
*
* @generated
*/
-public class FlowSpecificationItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class FlowSpecificationItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForinterface;
/**
@@ -68,6 +73,7 @@ public class FlowSpecificationItemProvider extends SysMLItemProviderAdapter impl
*
* @generated
*/
+
private static Pattern INTERFACE_PREFIX_PATTERN = Pattern.compile("Interface");
/**
@@ -90,21 +96,31 @@ public class FlowSpecificationItemProvider extends SysMLItemProviderAdapter impl
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
+ if(object instanceof FlowSpecification) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
- addBase_InterfacePropertyDescriptor(object);
+ addBase_InterfacePropertyDescriptor(object);
+ }
}
/**
* Handle Interface stereotyped by FlowSpecification
*/
if(object instanceof org.eclipse.uml2.uml.Interface) {
+ org.eclipse.uml2.uml.Interface element = (org.eclipse.uml2.uml.Interface)object;
if(itemPropertyDescriptorsForinterface == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.INTERFACE);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForinterface = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForinterface.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.FLOW_SPECIFICATION_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ addBase_InterfacePropertyDescriptorForInterface(steApplication);
+
+ }
}
return itemPropertyDescriptorsForinterface;
@@ -125,6 +141,29 @@ public class FlowSpecificationItemProvider extends SysMLItemProviderAdapter impl
}
/**
+ * This adds a property descriptor for the Base Interface feature for the UML element Interface.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_InterfacePropertyDescriptorForInterface(Object object) {
+
+ itemPropertyDescriptorsForinterface.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_FlowSpecification_base_Interface_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_FlowSpecification_base_Interface_feature", "_UI_FlowSpecification_type"),
+
+ PortandflowsPackage.Literals.FLOW_SPECIFICATION__BASE_INTERFACE, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This returns FlowSpecification.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -223,4 +262,5 @@ public class FlowSpecificationItemProvider extends SysMLItemProviderAdapter impl
public ResourceLocator getResourceLocator() {
return SysmlEditPlugin.INSTANCE;
}
+
}
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 e9d063c5813..868e5f9713b 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
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
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;
@@ -30,6 +31,7 @@ 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.SysMLItemProviderAdapter;
@@ -48,12 +50,15 @@ import org.eclipse.uml2.uml.UMLPackage;
*
* @generated
*/
-public class ItemFlowItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class ItemFlowItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForinformationFlow;
/**
@@ -68,6 +73,7 @@ public class ItemFlowItemProvider extends SysMLItemProviderAdapter implements IE
*
* @generated
*/
+
private static Pattern INFORMATION_FLOW_PREFIX_PATTERN = Pattern.compile("InformationFlow");
/**
@@ -90,22 +96,34 @@ public class ItemFlowItemProvider extends SysMLItemProviderAdapter implements IE
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
+ if(object instanceof ItemFlow) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
- addBase_InformationFlowPropertyDescriptor(object);
- addItemPropertyPropertyDescriptor(object);
+ addBase_InformationFlowPropertyDescriptor(object);
+ addItemPropertyPropertyDescriptor(object);
+ }
}
/**
* Handle InformationFlow stereotyped by ItemFlow
*/
if(object instanceof org.eclipse.uml2.uml.InformationFlow) {
+ org.eclipse.uml2.uml.InformationFlow element = (org.eclipse.uml2.uml.InformationFlow)object;
if(itemPropertyDescriptorsForinformationFlow == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.INFORMATION_FLOW);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForinformationFlow = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForinformationFlow.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.ITEM_FLOW_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ addBase_InformationFlowPropertyDescriptorForInformationFlow(steApplication);
+
+ addItemPropertyPropertyDescriptorForInformationFlow(steApplication);
+
+ }
}
return itemPropertyDescriptorsForinformationFlow;
@@ -126,6 +144,29 @@ public class ItemFlowItemProvider extends SysMLItemProviderAdapter implements IE
}
/**
+ * This adds a property descriptor for the Base Information Flow feature for the UML element InformationFlow.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_InformationFlowPropertyDescriptorForInformationFlow(Object object) {
+
+ itemPropertyDescriptorsForinformationFlow.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ItemFlow_base_InformationFlow_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_ItemFlow_base_InformationFlow_feature", "_UI_ItemFlow_type"),
+
+ PortandflowsPackage.Literals.ITEM_FLOW__BASE_INFORMATION_FLOW, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Item Property feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -137,6 +178,29 @@ public class ItemFlowItemProvider extends SysMLItemProviderAdapter implements IE
}
/**
+ * This adds a property descriptor for the Item Property feature for the UML element InformationFlow.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addItemPropertyPropertyDescriptorForInformationFlow(Object object) {
+
+ itemPropertyDescriptorsForinformationFlow.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ItemFlow_itemProperty_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_ItemFlow_itemProperty_feature", "_UI_ItemFlow_type"),
+
+ PortandflowsPackage.Literals.ITEM_FLOW__ITEM_PROPERTY, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This returns ItemFlow.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -235,4 +299,5 @@ public class ItemFlowItemProvider extends SysMLItemProviderAdapter implements IE
public ResourceLocator getResourceLocator() {
return SysmlEditPlugin.INSTANCE;
}
+
}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/registry/SysmlRegistryAdapterFactoryRegistry.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/registry/SysmlRegistryAdapterFactoryRegistry.java
index d282b757723..ab95c9265b9 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/registry/SysmlRegistryAdapterFactoryRegistry.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/registry/SysmlRegistryAdapterFactoryRegistry.java
@@ -179,9 +179,9 @@ public class SysmlRegistryAdapterFactoryRegistry {
/**
* AdapterFactories for the ABSTRACTION elements
*/
- adapterFactoryRegistryMap.put(UMLPackage.Literals.ABSTRACTION, new ArrayList<AdapterFactory>(Collections.singletonList(allocationsAdapterFactoryItemProvider)));
+ adapterFactoryRegistryMap.put(UMLPackage.Literals.ABSTRACTION, new ArrayList<AdapterFactory>(Collections.singletonList(requirementsAdapterFactoryItemProvider)));
- adapterFactoryRegistryMap.get(UMLPackage.Literals.ABSTRACTION).add(requirementsAdapterFactoryItemProvider);
+ adapterFactoryRegistryMap.get(UMLPackage.Literals.ABSTRACTION).add(allocationsAdapterFactoryItemProvider);
/**
* AdapterFactories for the ACTIVITY_EDGE elements
@@ -203,9 +203,9 @@ public class SysmlRegistryAdapterFactoryRegistry {
/**
* AdapterFactories for the CLASS elements
*/
- adapterFactoryRegistryMap.put(UMLPackage.Literals.CLASS, new ArrayList<AdapterFactory>(Collections.singletonList(blocksAdapterFactoryItemProvider)));
+ adapterFactoryRegistryMap.put(UMLPackage.Literals.CLASS, new ArrayList<AdapterFactory>(Collections.singletonList(constraintsAdapterFactoryItemProvider)));
- adapterFactoryRegistryMap.get(UMLPackage.Literals.CLASS).add(constraintsAdapterFactoryItemProvider);
+ adapterFactoryRegistryMap.get(UMLPackage.Literals.CLASS).add(blocksAdapterFactoryItemProvider);
adapterFactoryRegistryMap.get(UMLPackage.Literals.CLASS).add(requirementsAdapterFactoryItemProvider);
@@ -259,9 +259,9 @@ public class SysmlRegistryAdapterFactoryRegistry {
/**
* AdapterFactories for the NAMED_ELEMENT elements
*/
- adapterFactoryRegistryMap.put(UMLPackage.Literals.NAMED_ELEMENT, new ArrayList<AdapterFactory>(Collections.singletonList(allocationsAdapterFactoryItemProvider)));
+ adapterFactoryRegistryMap.put(UMLPackage.Literals.NAMED_ELEMENT, new ArrayList<AdapterFactory>(Collections.singletonList(requirementsAdapterFactoryItemProvider)));
- adapterFactoryRegistryMap.get(UMLPackage.Literals.NAMED_ELEMENT).add(requirementsAdapterFactoryItemProvider);
+ adapterFactoryRegistryMap.get(UMLPackage.Literals.NAMED_ELEMENT).add(allocationsAdapterFactoryItemProvider);
/**
* AdapterFactories for the OBJECT_NODE elements
@@ -298,11 +298,11 @@ public class SysmlRegistryAdapterFactoryRegistry {
/**
* AdapterFactories for the PROPERTY elements
*/
- adapterFactoryRegistryMap.put(UMLPackage.Literals.PROPERTY, new ArrayList<AdapterFactory>(Collections.singletonList(blocksAdapterFactoryItemProvider)));
+ adapterFactoryRegistryMap.put(UMLPackage.Literals.PROPERTY, new ArrayList<AdapterFactory>(Collections.singletonList(constraintsAdapterFactoryItemProvider)));
adapterFactoryRegistryMap.get(UMLPackage.Literals.PROPERTY).add(portandflowsAdapterFactoryItemProvider);
- adapterFactoryRegistryMap.get(UMLPackage.Literals.PROPERTY).add(constraintsAdapterFactoryItemProvider);
+ adapterFactoryRegistryMap.get(UMLPackage.Literals.PROPERTY).add(blocksAdapterFactoryItemProvider);
}
@@ -382,49 +382,49 @@ public class SysmlRegistryAdapterFactoryRegistry {
public HashMap<EClass, ItemProviderAdapter> getUMLItemProviderClassifedByUMLElement(AdapterFactory rootAdapterFactory) {
HashMap<EClass, ItemProviderAdapter> result = new HashMap<EClass, ItemProviderAdapter>();
- result.put(UMLPackage.Literals.BEHAVIOR, new BehaviorItemProvider(rootAdapterFactory));
-
- result.put(UMLPackage.Literals.OBJECT_NODE, new ObjectNodeItemProvider(rootAdapterFactory));
+ result.put(UMLPackage.Literals.PACKAGE, new PackageItemProvider(rootAdapterFactory));
- result.put(UMLPackage.Literals.PARAMETER_SET, new ParameterSetItemProvider(rootAdapterFactory));
+ result.put(UMLPackage.Literals.ACTIVITY_EDGE, new ActivityEdgeItemProvider(rootAdapterFactory));
- result.put(UMLPackage.Literals.DEPENDENCY, new DependencyItemProvider(rootAdapterFactory));
+ result.put(UMLPackage.Literals.ABSTRACTION, new AbstractionItemProvider(rootAdapterFactory));
- result.put(UMLPackage.Literals.ACTIVITY_PARTITION, new ActivityPartitionItemProvider(rootAdapterFactory));
+ result.put(UMLPackage.Literals.NAMED_ELEMENT, new NamedElementItemProvider(rootAdapterFactory));
- result.put(UMLPackage.Literals.PORT, new PortItemProvider(rootAdapterFactory));
+ result.put(UMLPackage.Literals.DATA_TYPE, new DataTypeItemProvider(rootAdapterFactory));
- result.put(UMLPackage.Literals.ABSTRACTION, new AbstractionItemProvider(rootAdapterFactory));
+ result.put(UMLPackage.Literals.OPERATION, new OperationItemProvider(rootAdapterFactory));
- result.put(UMLPackage.Literals.CONNECTOR_END, new ConnectorEndItemProvider(rootAdapterFactory));
+ result.put(UMLPackage.Literals.ACTIVITY_PARTITION, new ActivityPartitionItemProvider(rootAdapterFactory));
- result.put(UMLPackage.Literals.INFORMATION_FLOW, new InformationFlowItemProvider(rootAdapterFactory));
+ result.put(UMLPackage.Literals.PARAMETER_SET, new ParameterSetItemProvider(rootAdapterFactory));
result.put(UMLPackage.Literals.PARAMETER, new ParameterItemProvider(rootAdapterFactory));
- result.put(UMLPackage.Literals.CONNECTOR, new ConnectorItemProvider(rootAdapterFactory));
+ result.put(UMLPackage.Literals.BEHAVIOR, new BehaviorItemProvider(rootAdapterFactory));
result.put(UMLPackage.Literals.PROPERTY, new PropertyItemProvider(rootAdapterFactory));
- result.put(UMLPackage.Literals.ACTIVITY_EDGE, new ActivityEdgeItemProvider(rootAdapterFactory));
+ result.put(UMLPackage.Literals.CLASS, new ClassItemProvider(rootAdapterFactory));
- result.put(UMLPackage.Literals.INSTANCE_SPECIFICATION, new InstanceSpecificationItemProvider(rootAdapterFactory));
+ result.put(UMLPackage.Literals.COMMENT, new CommentItemProvider(rootAdapterFactory));
result.put(UMLPackage.Literals.CLASSIFIER, new ClassifierItemProvider(rootAdapterFactory));
+ result.put(UMLPackage.Literals.INFORMATION_FLOW, new InformationFlowItemProvider(rootAdapterFactory));
+
result.put(UMLPackage.Literals.INTERFACE, new InterfaceItemProvider(rootAdapterFactory));
- result.put(UMLPackage.Literals.CLASS, new ClassItemProvider(rootAdapterFactory));
+ result.put(UMLPackage.Literals.CONNECTOR, new ConnectorItemProvider(rootAdapterFactory));
- result.put(UMLPackage.Literals.OPERATION, new OperationItemProvider(rootAdapterFactory));
+ result.put(UMLPackage.Literals.DEPENDENCY, new DependencyItemProvider(rootAdapterFactory));
- result.put(UMLPackage.Literals.PACKAGE, new PackageItemProvider(rootAdapterFactory));
+ result.put(UMLPackage.Literals.INSTANCE_SPECIFICATION, new InstanceSpecificationItemProvider(rootAdapterFactory));
- result.put(UMLPackage.Literals.DATA_TYPE, new DataTypeItemProvider(rootAdapterFactory));
+ result.put(UMLPackage.Literals.OBJECT_NODE, new ObjectNodeItemProvider(rootAdapterFactory));
- result.put(UMLPackage.Literals.COMMENT, new CommentItemProvider(rootAdapterFactory));
+ result.put(UMLPackage.Literals.PORT, new PortItemProvider(rootAdapterFactory));
- result.put(UMLPackage.Literals.NAMED_ELEMENT, new NamedElementItemProvider(rootAdapterFactory));
+ result.put(UMLPackage.Literals.CONNECTOR_END, new ConnectorEndItemProvider(rootAdapterFactory));
return result;
}
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 0134fc4c6d6..6f51938fa44 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
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
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.ComposedImage;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -48,12 +49,15 @@ import org.eclipse.uml2.uml.edit.UMLEditPlugin;
*
* @generated
*/
-public class CopyItemProvider extends TraceItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IVisibilityOverlayImage {
+public class CopyItemProvider extends TraceItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IVisibilityOverlayImage
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForabstraction;
/**
@@ -68,6 +72,7 @@ public class CopyItemProvider extends TraceItemProvider implements IEditingDomai
*
* @generated
*/
+
private static Pattern ABSTRACTION_PREFIX_PATTERN = Pattern.compile("Abstraction");
/**
@@ -90,20 +95,28 @@ public class CopyItemProvider extends TraceItemProvider implements IEditingDomai
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
+ if(object instanceof Copy) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
+ }
}
/**
* Handle Abstraction stereotyped by Copy
*/
if(object instanceof org.eclipse.uml2.uml.Abstraction) {
+ org.eclipse.uml2.uml.Abstraction element = (org.eclipse.uml2.uml.Abstraction)object;
if(itemPropertyDescriptorsForabstraction == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.ABSTRACTION);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForabstraction = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForabstraction.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.COPY_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ }
}
return itemPropertyDescriptorsForabstraction;
@@ -222,10 +235,13 @@ public class CopyItemProvider extends TraceItemProvider implements IEditingDomai
*/
public ComposedImage composeVisibilityImage(Object object, ComposedImage composedImage) {
NamedElement namedElement = (NamedElement)object;
+
if(namedElement.isSetVisibility()) {
composedImage.getImages().add(UMLEditPlugin.INSTANCE.getImage("full/ovr16/VisibilityKind_" //$NON-NLS-1$
+ namedElement.getVisibility().getName()));
}
+
return composedImage;
}
+
}
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 d99cd920e66..e68becc5084 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
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
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.ComposedImage;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -48,12 +49,15 @@ import org.eclipse.uml2.uml.edit.UMLEditPlugin;
*
* @generated
*/
-public class DeriveReqtItemProvider extends TraceItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IVisibilityOverlayImage {
+public class DeriveReqtItemProvider extends TraceItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IVisibilityOverlayImage
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForabstraction;
/**
@@ -68,6 +72,7 @@ public class DeriveReqtItemProvider extends TraceItemProvider implements IEditin
*
* @generated
*/
+
private static Pattern ABSTRACTION_PREFIX_PATTERN = Pattern.compile("Abstraction");
/**
@@ -90,20 +95,28 @@ public class DeriveReqtItemProvider extends TraceItemProvider implements IEditin
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
+ if(object instanceof DeriveReqt) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
+ }
}
/**
* Handle Abstraction stereotyped by DeriveReqt
*/
if(object instanceof org.eclipse.uml2.uml.Abstraction) {
+ org.eclipse.uml2.uml.Abstraction element = (org.eclipse.uml2.uml.Abstraction)object;
if(itemPropertyDescriptorsForabstraction == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.ABSTRACTION);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForabstraction = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForabstraction.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.DERIVE_REQT_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ }
}
return itemPropertyDescriptorsForabstraction;
@@ -222,10 +235,13 @@ public class DeriveReqtItemProvider extends TraceItemProvider implements IEditin
*/
public ComposedImage composeVisibilityImage(Object object, ComposedImage composedImage) {
NamedElement namedElement = (NamedElement)object;
+
if(namedElement.isSetVisibility()) {
composedImage.getImages().add(UMLEditPlugin.INSTANCE.getImage("full/ovr16/VisibilityKind_" //$NON-NLS-1$
+ namedElement.getVisibility().getName()));
}
+
return composedImage;
}
+
}
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 71e10ab2774..d55ac5bfd63 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
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
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;
@@ -31,6 +32,7 @@ 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.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptorDecorator;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.papyrus.sysml.edit.provider.IComposableAdapterFactory;
@@ -50,12 +52,15 @@ import org.eclipse.uml2.uml.UMLPackage;
*
* @generated
*/
-public class RequirementItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class RequirementItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForclass;
/**
@@ -70,6 +75,7 @@ public class RequirementItemProvider extends SysMLItemProviderAdapter implements
*
* @generated
*/
+
private static Pattern CLASS_PREFIX_PATTERN = Pattern.compile("Class");
/**
@@ -92,30 +98,58 @@ public class RequirementItemProvider extends SysMLItemProviderAdapter implements
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addTextPropertyDescriptor(object);
- addIdPropertyDescriptor(object);
- addDerivedPropertyDescriptor(object);
- addDerivedFromPropertyDescriptor(object);
- addSatisfiedByPropertyDescriptor(object);
- addRefinedByPropertyDescriptor(object);
- addTracedToPropertyDescriptor(object);
- addVerifiedByPropertyDescriptor(object);
- addMasterPropertyDescriptor(object);
- addBase_ClassPropertyDescriptor(object);
+ if(object instanceof Requirement) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
+
+ addTextPropertyDescriptor(object);
+ addIdPropertyDescriptor(object);
+ addDerivedPropertyDescriptor(object);
+ addDerivedFromPropertyDescriptor(object);
+ addSatisfiedByPropertyDescriptor(object);
+ addRefinedByPropertyDescriptor(object);
+ addTracedToPropertyDescriptor(object);
+ addVerifiedByPropertyDescriptor(object);
+ addMasterPropertyDescriptor(object);
+ addBase_ClassPropertyDescriptor(object);
+ }
}
/**
* Handle Class stereotyped by Requirement
*/
if(object instanceof org.eclipse.uml2.uml.Class) {
+ org.eclipse.uml2.uml.Class element = (org.eclipse.uml2.uml.Class)object;
if(itemPropertyDescriptorsForclass == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.CLASS);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForclass = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForclass.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.REQUIREMENT_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ addTextPropertyDescriptorForClass(steApplication);
+
+ addIdPropertyDescriptorForClass(steApplication);
+
+ addDerivedPropertyDescriptorForClass(steApplication);
+
+ addDerivedFromPropertyDescriptorForClass(steApplication);
+
+ addSatisfiedByPropertyDescriptorForClass(steApplication);
+
+ addRefinedByPropertyDescriptorForClass(steApplication);
+
+ addTracedToPropertyDescriptorForClass(steApplication);
+
+ addVerifiedByPropertyDescriptorForClass(steApplication);
+
+ addMasterPropertyDescriptorForClass(steApplication);
+
+ addBase_ClassPropertyDescriptorForClass(steApplication);
+
+ }
}
return itemPropertyDescriptorsForclass;
@@ -136,6 +170,29 @@ public class RequirementItemProvider extends SysMLItemProviderAdapter implements
}
/**
+ * This adds a property descriptor for the Text feature for the UML element Class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addTextPropertyDescriptorForClass(Object object) {
+
+ itemPropertyDescriptorsForclass.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_text_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Requirement_text_feature", "_UI_Requirement_type"),
+
+ RequirementsPackage.Literals.REQUIREMENT__TEXT, true, false, false,
+
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Id feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -147,6 +204,29 @@ public class RequirementItemProvider extends SysMLItemProviderAdapter implements
}
/**
+ * This adds a property descriptor for the Id feature for the UML element Class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addIdPropertyDescriptorForClass(Object object) {
+
+ itemPropertyDescriptorsForclass.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_id_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Requirement_id_feature", "_UI_Requirement_type"),
+
+ RequirementsPackage.Literals.REQUIREMENT__ID, true, false, false,
+
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Derived feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -158,6 +238,29 @@ public class RequirementItemProvider extends SysMLItemProviderAdapter implements
}
/**
+ * This adds a property descriptor for the Derived feature for the UML element Class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addDerivedPropertyDescriptorForClass(Object object) {
+
+ itemPropertyDescriptorsForclass.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_derived_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Requirement_derived_feature", "_UI_Requirement_type"),
+
+ RequirementsPackage.Literals.REQUIREMENT__DERIVED, false, false, false,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Derived From feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -169,6 +272,29 @@ public class RequirementItemProvider extends SysMLItemProviderAdapter implements
}
/**
+ * This adds a property descriptor for the Derived From feature for the UML element Class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addDerivedFromPropertyDescriptorForClass(Object object) {
+
+ itemPropertyDescriptorsForclass.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_derivedFrom_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Requirement_derivedFrom_feature", "_UI_Requirement_type"),
+
+ RequirementsPackage.Literals.REQUIREMENT__DERIVED_FROM, false, false, false,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Satisfied By feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -180,6 +306,29 @@ public class RequirementItemProvider extends SysMLItemProviderAdapter implements
}
/**
+ * This adds a property descriptor for the Satisfied By feature for the UML element Class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addSatisfiedByPropertyDescriptorForClass(Object object) {
+
+ itemPropertyDescriptorsForclass.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_satisfiedBy_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Requirement_satisfiedBy_feature", "_UI_Requirement_type"),
+
+ RequirementsPackage.Literals.REQUIREMENT__SATISFIED_BY, false, false, false,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Refined By feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -191,6 +340,29 @@ public class RequirementItemProvider extends SysMLItemProviderAdapter implements
}
/**
+ * This adds a property descriptor for the Refined By feature for the UML element Class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addRefinedByPropertyDescriptorForClass(Object object) {
+
+ itemPropertyDescriptorsForclass.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_refinedBy_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Requirement_refinedBy_feature", "_UI_Requirement_type"),
+
+ RequirementsPackage.Literals.REQUIREMENT__REFINED_BY, false, false, false,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Traced To feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -202,6 +374,29 @@ public class RequirementItemProvider extends SysMLItemProviderAdapter implements
}
/**
+ * This adds a property descriptor for the Traced To feature for the UML element Class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addTracedToPropertyDescriptorForClass(Object object) {
+
+ itemPropertyDescriptorsForclass.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_tracedTo_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Requirement_tracedTo_feature", "_UI_Requirement_type"),
+
+ RequirementsPackage.Literals.REQUIREMENT__TRACED_TO, false, false, false,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Verified By feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -213,6 +408,29 @@ public class RequirementItemProvider extends SysMLItemProviderAdapter implements
}
/**
+ * This adds a property descriptor for the Verified By feature for the UML element Class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addVerifiedByPropertyDescriptorForClass(Object object) {
+
+ itemPropertyDescriptorsForclass.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_verifiedBy_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Requirement_verifiedBy_feature", "_UI_Requirement_type"),
+
+ RequirementsPackage.Literals.REQUIREMENT__VERIFIED_BY, false, false, false,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Master feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -224,6 +442,29 @@ public class RequirementItemProvider extends SysMLItemProviderAdapter implements
}
/**
+ * This adds a property descriptor for the Master feature for the UML element Class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addMasterPropertyDescriptorForClass(Object object) {
+
+ itemPropertyDescriptorsForclass.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_master_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Requirement_master_feature", "_UI_Requirement_type"),
+
+ RequirementsPackage.Literals.REQUIREMENT__MASTER, false, false, false,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Base Class feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -235,6 +476,29 @@ public class RequirementItemProvider extends SysMLItemProviderAdapter implements
}
/**
+ * This adds a property descriptor for the Base Class feature for the UML element Class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_ClassPropertyDescriptorForClass(Object object) {
+
+ itemPropertyDescriptorsForclass.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Requirement_base_Class_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Requirement_base_Class_feature", "_UI_Requirement_type"),
+
+ RequirementsPackage.Literals.REQUIREMENT__BASE_CLASS, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This returns Requirement.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -341,4 +605,5 @@ public class RequirementItemProvider extends SysMLItemProviderAdapter implements
public ResourceLocator getResourceLocator() {
return SysmlEditPlugin.INSTANCE;
}
+
}
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 8cb1de1241d..ef1e8c79263 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
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
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;
@@ -30,6 +31,7 @@ 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.SysMLItemProviderAdapter;
@@ -48,12 +50,15 @@ import org.eclipse.uml2.uml.UMLPackage;
*
* @generated
*/
-public class RequirementRelatedItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class RequirementRelatedItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsFornamedElement;
/**
@@ -68,6 +73,7 @@ public class RequirementRelatedItemProvider extends SysMLItemProviderAdapter imp
*
* @generated
*/
+
private static Pattern NAMED_ELEMENT_PREFIX_PATTERN = Pattern.compile("NamedElement");
/**
@@ -90,25 +96,43 @@ public class RequirementRelatedItemProvider extends SysMLItemProviderAdapter imp
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addBase_NamedElementPropertyDescriptor(object);
- addTracedFromPropertyDescriptor(object);
- addSatisfiesPropertyDescriptor(object);
- addRefinesPropertyDescriptor(object);
- addVerifiesPropertyDescriptor(object);
+ if(object instanceof RequirementRelated) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
+
+ addBase_NamedElementPropertyDescriptor(object);
+ addTracedFromPropertyDescriptor(object);
+ addSatisfiesPropertyDescriptor(object);
+ addRefinesPropertyDescriptor(object);
+ addVerifiesPropertyDescriptor(object);
+ }
}
/**
* Handle NamedElement stereotyped by RequirementRelated
*/
if(object instanceof org.eclipse.uml2.uml.NamedElement) {
+ org.eclipse.uml2.uml.NamedElement element = (org.eclipse.uml2.uml.NamedElement)object;
if(itemPropertyDescriptorsFornamedElement == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.NAMED_ELEMENT);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsFornamedElement = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsFornamedElement.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.REQUIREMENT_RELATED_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ addBase_NamedElementPropertyDescriptorForNamedElement(steApplication);
+
+ addTracedFromPropertyDescriptorForNamedElement(steApplication);
+
+ addSatisfiesPropertyDescriptorForNamedElement(steApplication);
+
+ addRefinesPropertyDescriptorForNamedElement(steApplication);
+
+ addVerifiesPropertyDescriptorForNamedElement(steApplication);
+
+ }
}
return itemPropertyDescriptorsFornamedElement;
@@ -129,6 +153,29 @@ public class RequirementRelatedItemProvider extends SysMLItemProviderAdapter imp
}
/**
+ * This adds a property descriptor for the Base Named Element feature for the UML element NamedElement.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_NamedElementPropertyDescriptorForNamedElement(Object object) {
+
+ itemPropertyDescriptorsFornamedElement.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RequirementRelated_base_NamedElement_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_RequirementRelated_base_NamedElement_feature", "_UI_RequirementRelated_type"),
+
+ RequirementsPackage.Literals.REQUIREMENT_RELATED__BASE_NAMED_ELEMENT, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Traced From feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -140,6 +187,29 @@ public class RequirementRelatedItemProvider extends SysMLItemProviderAdapter imp
}
/**
+ * This adds a property descriptor for the Traced From feature for the UML element NamedElement.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addTracedFromPropertyDescriptorForNamedElement(Object object) {
+
+ itemPropertyDescriptorsFornamedElement.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RequirementRelated_tracedFrom_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_RequirementRelated_tracedFrom_feature", "_UI_RequirementRelated_type"),
+
+ RequirementsPackage.Literals.REQUIREMENT_RELATED__TRACED_FROM, false, false, false,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Satisfies feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -151,6 +221,29 @@ public class RequirementRelatedItemProvider extends SysMLItemProviderAdapter imp
}
/**
+ * This adds a property descriptor for the Satisfies feature for the UML element NamedElement.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addSatisfiesPropertyDescriptorForNamedElement(Object object) {
+
+ itemPropertyDescriptorsFornamedElement.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RequirementRelated_satisfies_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_RequirementRelated_satisfies_feature", "_UI_RequirementRelated_type"),
+
+ RequirementsPackage.Literals.REQUIREMENT_RELATED__SATISFIES, false, false, false,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Refines feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -162,6 +255,29 @@ public class RequirementRelatedItemProvider extends SysMLItemProviderAdapter imp
}
/**
+ * This adds a property descriptor for the Refines feature for the UML element NamedElement.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addRefinesPropertyDescriptorForNamedElement(Object object) {
+
+ itemPropertyDescriptorsFornamedElement.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RequirementRelated_refines_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_RequirementRelated_refines_feature", "_UI_RequirementRelated_type"),
+
+ RequirementsPackage.Literals.REQUIREMENT_RELATED__REFINES, false, false, false,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Verifies feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -173,6 +289,29 @@ public class RequirementRelatedItemProvider extends SysMLItemProviderAdapter imp
}
/**
+ * This adds a property descriptor for the Verifies feature for the UML element NamedElement.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addVerifiesPropertyDescriptorForNamedElement(Object object) {
+
+ itemPropertyDescriptorsFornamedElement.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RequirementRelated_verifies_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_RequirementRelated_verifies_feature", "_UI_RequirementRelated_type"),
+
+ RequirementsPackage.Literals.REQUIREMENT_RELATED__VERIFIES, false, false, false,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This returns RequirementRelated.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -271,4 +410,5 @@ public class RequirementRelatedItemProvider extends SysMLItemProviderAdapter imp
public ResourceLocator getResourceLocator() {
return SysmlEditPlugin.INSTANCE;
}
+
}
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 aa24b94d25d..0200045b9f6 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
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
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.ComposedImage;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -48,12 +49,15 @@ import org.eclipse.uml2.uml.edit.UMLEditPlugin;
*
* @generated
*/
-public class SatisfyItemProvider extends TraceItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IVisibilityOverlayImage {
+public class SatisfyItemProvider extends TraceItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IVisibilityOverlayImage
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForabstraction;
/**
@@ -68,6 +72,7 @@ public class SatisfyItemProvider extends TraceItemProvider implements IEditingDo
*
* @generated
*/
+
private static Pattern ABSTRACTION_PREFIX_PATTERN = Pattern.compile("Abstraction");
/**
@@ -90,20 +95,28 @@ public class SatisfyItemProvider extends TraceItemProvider implements IEditingDo
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
+ if(object instanceof Satisfy) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
+ }
}
/**
* Handle Abstraction stereotyped by Satisfy
*/
if(object instanceof org.eclipse.uml2.uml.Abstraction) {
+ org.eclipse.uml2.uml.Abstraction element = (org.eclipse.uml2.uml.Abstraction)object;
if(itemPropertyDescriptorsForabstraction == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.ABSTRACTION);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForabstraction = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForabstraction.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.SATISFY_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ }
}
return itemPropertyDescriptorsForabstraction;
@@ -222,10 +235,13 @@ public class SatisfyItemProvider extends TraceItemProvider implements IEditingDo
*/
public ComposedImage composeVisibilityImage(Object object, ComposedImage composedImage) {
NamedElement namedElement = (NamedElement)object;
+
if(namedElement.isSetVisibility()) {
composedImage.getImages().add(UMLEditPlugin.INSTANCE.getImage("full/ovr16/VisibilityKind_" //$NON-NLS-1$
+ namedElement.getVisibility().getName()));
}
+
return composedImage;
}
+
}
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 7491f811ee3..a6f6b36ff14 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
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
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;
@@ -30,6 +31,7 @@ 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.SysMLItemProviderAdapter;
@@ -48,18 +50,22 @@ import org.eclipse.uml2.uml.UMLPackage;
*
* @generated
*/
-public class TestCaseItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class TestCaseItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForbehavior;
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForoperation;
/**
@@ -74,6 +80,7 @@ public class TestCaseItemProvider extends SysMLItemProviderAdapter implements IE
*
* @generated
*/
+
private static Pattern BEHAVIOR_PREFIX_PATTERN = Pattern.compile("Behavior");
/**
@@ -81,6 +88,7 @@ public class TestCaseItemProvider extends SysMLItemProviderAdapter implements IE
*
* @generated
*/
+
private static Pattern OPERATION_PREFIX_PATTERN = Pattern.compile("Operation");
/**
@@ -103,23 +111,43 @@ public class TestCaseItemProvider extends SysMLItemProviderAdapter implements IE
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
+ if(object instanceof TestCase) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
- addBase_BehaviorPropertyDescriptor(object);
- addBase_OperationPropertyDescriptor(object);
- addVerifiesPropertyDescriptor(object);
+ addBase_BehaviorPropertyDescriptor(object);
+ addBase_OperationPropertyDescriptor(object);
+ addVerifiesPropertyDescriptor(object);
+ }
}
/**
* Handle Behavior stereotyped by TestCase
*/
if(object instanceof org.eclipse.uml2.uml.Behavior) {
+ org.eclipse.uml2.uml.Behavior element = (org.eclipse.uml2.uml.Behavior)object;
if(itemPropertyDescriptorsForbehavior == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.BEHAVIOR);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForbehavior = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForbehavior.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.TEST_CASE_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ addBase_BehaviorPropertyDescriptorForBehavior(steApplication);
+
+ addBase_BehaviorPropertyDescriptorForOperation(steApplication);
+
+ addBase_OperationPropertyDescriptorForBehavior(steApplication);
+
+ addBase_OperationPropertyDescriptorForOperation(steApplication);
+
+ addVerifiesPropertyDescriptorForBehavior(steApplication);
+
+ addVerifiesPropertyDescriptorForOperation(steApplication);
+
+ }
}
return itemPropertyDescriptorsForbehavior;
@@ -129,11 +157,29 @@ public class TestCaseItemProvider extends SysMLItemProviderAdapter implements IE
* Handle Operation stereotyped by TestCase
*/
if(object instanceof org.eclipse.uml2.uml.Operation) {
+ org.eclipse.uml2.uml.Operation element = (org.eclipse.uml2.uml.Operation)object;
if(itemPropertyDescriptorsForoperation == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.OPERATION);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForoperation = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForoperation.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.TEST_CASE_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ addBase_BehaviorPropertyDescriptorForBehavior(steApplication);
+
+ addBase_BehaviorPropertyDescriptorForOperation(steApplication);
+
+ addBase_OperationPropertyDescriptorForBehavior(steApplication);
+
+ addBase_OperationPropertyDescriptorForOperation(steApplication);
+
+ addVerifiesPropertyDescriptorForBehavior(steApplication);
+
+ addVerifiesPropertyDescriptorForOperation(steApplication);
+
+ }
}
return itemPropertyDescriptorsForoperation;
@@ -154,6 +200,52 @@ public class TestCaseItemProvider extends SysMLItemProviderAdapter implements IE
}
/**
+ * This adds a property descriptor for the Base Behavior feature for the UML element Behavior.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_BehaviorPropertyDescriptorForBehavior(Object object) {
+
+ itemPropertyDescriptorsForbehavior.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_TestCase_base_Behavior_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_TestCase_base_Behavior_feature", "_UI_TestCase_type"),
+
+ RequirementsPackage.Literals.TEST_CASE__BASE_BEHAVIOR, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
+ * This adds a property descriptor for the Base Behavior feature for the UML element Operation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_BehaviorPropertyDescriptorForOperation(Object object) {
+
+ itemPropertyDescriptorsForoperation.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_TestCase_base_Behavior_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_TestCase_base_Behavior_feature", "_UI_TestCase_type"),
+
+ RequirementsPackage.Literals.TEST_CASE__BASE_BEHAVIOR, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Base Operation feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -165,6 +257,52 @@ public class TestCaseItemProvider extends SysMLItemProviderAdapter implements IE
}
/**
+ * This adds a property descriptor for the Base Operation feature for the UML element Behavior.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_OperationPropertyDescriptorForBehavior(Object object) {
+
+ itemPropertyDescriptorsForbehavior.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_TestCase_base_Operation_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_TestCase_base_Operation_feature", "_UI_TestCase_type"),
+
+ RequirementsPackage.Literals.TEST_CASE__BASE_OPERATION, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
+ * This adds a property descriptor for the Base Operation feature for the UML element Operation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_OperationPropertyDescriptorForOperation(Object object) {
+
+ itemPropertyDescriptorsForoperation.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_TestCase_base_Operation_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_TestCase_base_Operation_feature", "_UI_TestCase_type"),
+
+ RequirementsPackage.Literals.TEST_CASE__BASE_OPERATION, true, false, true,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This adds a property descriptor for the Verifies feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -176,6 +314,52 @@ public class TestCaseItemProvider extends SysMLItemProviderAdapter implements IE
}
/**
+ * This adds a property descriptor for the Verifies feature for the UML element Behavior.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addVerifiesPropertyDescriptorForBehavior(Object object) {
+
+ itemPropertyDescriptorsForbehavior.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_TestCase_verifies_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_TestCase_verifies_feature", "_UI_TestCase_type"),
+
+ RequirementsPackage.Literals.TEST_CASE__VERIFIES, false, false, false,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
+ * This adds a property descriptor for the Verifies feature for the UML element Operation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addVerifiesPropertyDescriptorForOperation(Object object) {
+
+ itemPropertyDescriptorsForoperation.add(new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_TestCase_verifies_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_TestCase_verifies_feature", "_UI_TestCase_type"),
+
+ RequirementsPackage.Literals.TEST_CASE__VERIFIES, false, false, false,
+
+ null,
+
+ null,
+
+ null)));
+
+ }
+
+ /**
* This returns TestCase.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -296,4 +480,5 @@ public class TestCaseItemProvider extends SysMLItemProviderAdapter implements IE
public ResourceLocator getResourceLocator() {
return SysmlEditPlugin.INSTANCE;
}
+
}
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 1caff1ca498..1f6d910bc68 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
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
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.ComposedImage;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -48,12 +49,15 @@ import org.eclipse.uml2.uml.edit.UMLEditPlugin;
*
* @generated
*/
-public class VerifyItemProvider extends TraceItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IVisibilityOverlayImage {
+public class VerifyItemProvider extends TraceItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IVisibilityOverlayImage
+
+{
/**
* This is used to store all the property descriptors for aclass stereotyped with a block.
* Derived classes should add descriptors to this vector.
*/
+
protected List<IItemPropertyDescriptor> itemPropertyDescriptorsForabstraction;
/**
@@ -68,6 +72,7 @@ public class VerifyItemProvider extends TraceItemProvider implements IEditingDom
*
* @generated
*/
+
private static Pattern ABSTRACTION_PREFIX_PATTERN = Pattern.compile("Abstraction");
/**
@@ -90,20 +95,28 @@ public class VerifyItemProvider extends TraceItemProvider implements IEditingDom
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if(itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
+ if(object instanceof Verify) {
+ if(itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
+ }
}
/**
* Handle Abstraction stereotyped by Verify
*/
if(object instanceof org.eclipse.uml2.uml.Abstraction) {
+ org.eclipse.uml2.uml.Abstraction element = (org.eclipse.uml2.uml.Abstraction)object;
if(itemPropertyDescriptorsForabstraction == null) {
ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.ABSTRACTION);
final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForabstraction = new ArrayList<IItemPropertyDescriptor>();
itemPropertyDescriptorsForabstraction.addAll(propertyDescriptors);
+ Stereotype ste = (element).getAppliedStereotype(SysmlResource.VERIFY_ID);
+ if(ste != null) {
+ EObject steApplication = (element).getStereotypeApplication(ste);
+
+ }
}
return itemPropertyDescriptorsForabstraction;
@@ -222,10 +235,13 @@ public class VerifyItemProvider extends TraceItemProvider implements IEditingDom
*/
public ComposedImage composeVisibilityImage(Object object, ComposedImage composedImage) {
NamedElement namedElement = (NamedElement)object;
+
if(namedElement.isSetVisibility()) {
composedImage.getImages().add(UMLEditPlugin.INSTANCE.getImage("full/ovr16/VisibilityKind_" //$NON-NLS-1$
+ namedElement.getVisibility().getName()));
}
+
return composedImage;
}
+
}

Back to the top