diff options
Diffstat (limited to 'plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet')
10 files changed, 49 insertions, 1796 deletions
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/provider/CategoryItemProvider.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/provider/CategoryItemProvider.java index 0ad58ece590..06cfebfe2c6 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/provider/CategoryItemProvider.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/provider/CategoryItemProvider.java @@ -24,12 +24,10 @@ import java.util.List; 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.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.provider.ENamedElementItemProvider;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Category;
import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage;
@@ -42,7 +40,7 @@ import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackag * @generated
*/
public class CategoryItemProvider
- extends ItemProviderAdapter {
+ extends ENamedElementItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -66,34 +64,12 @@ public class CategoryItemProvider if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
- addNamePropertyDescriptor(object);
addDocumentationPropertyDescriptor(object);
}
return itemPropertyDescriptors;
}
/**
- * This adds a property descriptor for the Name feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ENamedElement_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ENamedElement_name_feature", "_UI_ENamedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ENAMED_ELEMENT__NAME,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
* This adds a property descriptor for the Documentation feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -115,38 +91,6 @@ public class CategoryItemProvider }
/**
- * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
- * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
- * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
- super.getChildrenFeatures(object);
- childrenFeatures.add(EcorePackage.Literals.EMODEL_ELEMENT__EANNOTATIONS);
- }
- return childrenFeatures;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected EStructuralFeature getChildFeature(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildFeature(object, child);
- }
-
- /**
* This returns Category.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -186,13 +130,9 @@ public class CategoryItemProvider updateChildren(notification);
switch (notification.getFeatureID(Category.class)) {
- case EFacetPackage.CATEGORY__NAME:
case EFacetPackage.CATEGORY__DOCUMENTATION:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
- case EFacetPackage.CATEGORY__EANNOTATIONS:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
}
super.notifyChanged(notification);
}
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/provider/Efacet2EditPlugin.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/provider/Efacet2EditPlugin.java index 4047262382d..316bfc3eb74 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/provider/Efacet2EditPlugin.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/provider/Efacet2EditPlugin.java @@ -19,6 +19,7 @@ package org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.provider; import org.eclipse.emf.common.EMFPlugin;
import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
/**
* This is the central singleton for the Efacet2 edit plugin.
@@ -55,6 +56,7 @@ public final class Efacet2EditPlugin extends EMFPlugin { */
public Efacet2EditPlugin() {
super(new ResourceLocator[] {
+ EcoreEditPlugin.INSTANCE,
});
}
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/provider/FacetAttributeItemProvider.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/provider/FacetAttributeItemProvider.java index cb792b0771d..8cc23f5923c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/provider/FacetAttributeItemProvider.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/provider/FacetAttributeItemProvider.java @@ -25,11 +25,10 @@ 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.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.provider.EAttributeItemProvider;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage;
import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetAttribute;
@@ -43,7 +42,7 @@ import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query.QueryF * @generated
*/
public class FacetAttributeItemProvider
- extends ItemProviderAdapter {
+ extends EAttributeItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -67,23 +66,6 @@ public class FacetAttributeItemProvider if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
- addNamePropertyDescriptor(object);
- addOrderedPropertyDescriptor(object);
- addUniquePropertyDescriptor(object);
- addLowerBoundPropertyDescriptor(object);
- addUpperBoundPropertyDescriptor(object);
- addManyPropertyDescriptor(object);
- addRequiredPropertyDescriptor(object);
- addETypePropertyDescriptor(object);
- addChangeablePropertyDescriptor(object);
- addVolatilePropertyDescriptor(object);
- addTransientPropertyDescriptor(object);
- addDefaultValueLiteralPropertyDescriptor(object);
- addDefaultValuePropertyDescriptor(object);
- addUnsettablePropertyDescriptor(object);
- addDerivedPropertyDescriptor(object);
- addIDPropertyDescriptor(object);
- addEAttributeTypePropertyDescriptor(object);
addDocumentationPropertyDescriptor(object);
addCategoriesPropertyDescriptor(object);
addOverridePropertyDescriptor(object);
@@ -92,363 +74,6 @@ public class FacetAttributeItemProvider }
/**
- * This adds a property descriptor for the Name feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ENamedElement_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ENamedElement_name_feature", "_UI_ENamedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ENAMED_ELEMENT__NAME,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Ordered feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addOrderedPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ETypedElement_ordered_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ETypedElement_ordered_feature", "_UI_ETypedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ETYPED_ELEMENT__ORDERED,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Unique feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addUniquePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ETypedElement_unique_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ETypedElement_unique_feature", "_UI_ETypedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ETYPED_ELEMENT__UNIQUE,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Lower Bound feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addLowerBoundPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ETypedElement_lowerBound_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ETypedElement_lowerBound_feature", "_UI_ETypedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ETYPED_ELEMENT__LOWER_BOUND,
- true,
- false,
- false,
- ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Upper Bound feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addUpperBoundPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ETypedElement_upperBound_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ETypedElement_upperBound_feature", "_UI_ETypedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ETYPED_ELEMENT__UPPER_BOUND,
- true,
- false,
- false,
- ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Many feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addManyPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ETypedElement_many_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ETypedElement_many_feature", "_UI_ETypedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ETYPED_ELEMENT__MANY,
- false,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Required feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addRequiredPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ETypedElement_required_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ETypedElement_required_feature", "_UI_ETypedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ETYPED_ELEMENT__REQUIRED,
- false,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the EType feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addETypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ETypedElement_eType_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ETypedElement_eType_feature", "_UI_ETypedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ETYPED_ELEMENT__ETYPE,
- true,
- false,
- true,
- null,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Changeable feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addChangeablePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_EStructuralFeature_changeable_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EStructuralFeature_changeable_feature", "_UI_EStructuralFeature_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ESTRUCTURAL_FEATURE__CHANGEABLE,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Volatile feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addVolatilePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_EStructuralFeature_volatile_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EStructuralFeature_volatile_feature", "_UI_EStructuralFeature_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ESTRUCTURAL_FEATURE__VOLATILE,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Transient feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addTransientPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_EStructuralFeature_transient_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EStructuralFeature_transient_feature", "_UI_EStructuralFeature_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ESTRUCTURAL_FEATURE__TRANSIENT,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Default Value Literal feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addDefaultValueLiteralPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_EStructuralFeature_defaultValueLiteral_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EStructuralFeature_defaultValueLiteral_feature", "_UI_EStructuralFeature_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ESTRUCTURAL_FEATURE__DEFAULT_VALUE_LITERAL,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Default Value feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addDefaultValuePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_EStructuralFeature_defaultValue_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EStructuralFeature_defaultValue_feature", "_UI_EStructuralFeature_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ESTRUCTURAL_FEATURE__DEFAULT_VALUE,
- false,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Unsettable feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addUnsettablePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_EStructuralFeature_unsettable_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EStructuralFeature_unsettable_feature", "_UI_EStructuralFeature_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ESTRUCTURAL_FEATURE__UNSETTABLE,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Derived feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addDerivedPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_EStructuralFeature_derived_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EStructuralFeature_derived_feature", "_UI_EStructuralFeature_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ESTRUCTURAL_FEATURE__DERIVED,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the ID feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addIDPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_EAttribute_iD_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EAttribute_iD_feature", "_UI_EAttribute_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.EATTRIBUTE__ID,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the EAttribute Type feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addEAttributeTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_EAttribute_eAttributeType_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EAttribute_eAttributeType_feature", "_UI_EAttribute_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.EATTRIBUTE__EATTRIBUTE_TYPE,
- false,
- false,
- false,
- null,
- null,
- null));
- }
-
- /**
* This adds a property descriptor for the Documentation feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -524,8 +149,6 @@ public class FacetAttributeItemProvider public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
if (childrenFeatures == null) {
super.getChildrenFeatures(object);
- childrenFeatures.add(EcorePackage.Literals.EMODEL_ELEMENT__EANNOTATIONS);
- childrenFeatures.add(EcorePackage.Literals.ETYPED_ELEMENT__EGENERIC_TYPE);
childrenFeatures.add(EFacetPackage.Literals.DERIVED_TYPED_ELEMENT__QUERY);
}
return childrenFeatures;
@@ -585,26 +208,9 @@ public class FacetAttributeItemProvider updateChildren(notification);
switch (notification.getFeatureID(FacetAttribute.class)) {
- case EFacetPackage.FACET_ATTRIBUTE__NAME:
- case EFacetPackage.FACET_ATTRIBUTE__ORDERED:
- case EFacetPackage.FACET_ATTRIBUTE__UNIQUE:
- case EFacetPackage.FACET_ATTRIBUTE__LOWER_BOUND:
- case EFacetPackage.FACET_ATTRIBUTE__UPPER_BOUND:
- case EFacetPackage.FACET_ATTRIBUTE__MANY:
- case EFacetPackage.FACET_ATTRIBUTE__REQUIRED:
- case EFacetPackage.FACET_ATTRIBUTE__CHANGEABLE:
- case EFacetPackage.FACET_ATTRIBUTE__VOLATILE:
- case EFacetPackage.FACET_ATTRIBUTE__TRANSIENT:
- case EFacetPackage.FACET_ATTRIBUTE__DEFAULT_VALUE_LITERAL:
- case EFacetPackage.FACET_ATTRIBUTE__DEFAULT_VALUE:
- case EFacetPackage.FACET_ATTRIBUTE__UNSETTABLE:
- case EFacetPackage.FACET_ATTRIBUTE__DERIVED:
- case EFacetPackage.FACET_ATTRIBUTE__ID:
case EFacetPackage.FACET_ATTRIBUTE__DOCUMENTATION:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
- case EFacetPackage.FACET_ATTRIBUTE__EANNOTATIONS:
- case EFacetPackage.FACET_ATTRIBUTE__EGENERIC_TYPE:
case EFacetPackage.FACET_ATTRIBUTE__QUERY:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return;
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/provider/FacetElementItemProvider.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/provider/FacetElementItemProvider.java index 9390d5e80e2..35945830f7f 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/provider/FacetElementItemProvider.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/provider/FacetElementItemProvider.java @@ -24,12 +24,10 @@ import java.util.List; 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.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.provider.ETypedElementItemProvider;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage;
import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetElement;
@@ -42,7 +40,7 @@ import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetElement * @generated
*/
public class FacetElementItemProvider
- extends ItemProviderAdapter {
+ extends ETypedElementItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -66,14 +64,6 @@ public class FacetElementItemProvider if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
- addNamePropertyDescriptor(object);
- addOrderedPropertyDescriptor(object);
- addUniquePropertyDescriptor(object);
- addLowerBoundPropertyDescriptor(object);
- addUpperBoundPropertyDescriptor(object);
- addManyPropertyDescriptor(object);
- addRequiredPropertyDescriptor(object);
- addETypePropertyDescriptor(object);
addDocumentationPropertyDescriptor(object);
addCategoriesPropertyDescriptor(object);
}
@@ -81,174 +71,6 @@ public class FacetElementItemProvider }
/**
- * This adds a property descriptor for the Name feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ENamedElement_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ENamedElement_name_feature", "_UI_ENamedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ENAMED_ELEMENT__NAME,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Ordered feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addOrderedPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ETypedElement_ordered_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ETypedElement_ordered_feature", "_UI_ETypedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ETYPED_ELEMENT__ORDERED,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Unique feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addUniquePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ETypedElement_unique_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ETypedElement_unique_feature", "_UI_ETypedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ETYPED_ELEMENT__UNIQUE,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Lower Bound feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addLowerBoundPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ETypedElement_lowerBound_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ETypedElement_lowerBound_feature", "_UI_ETypedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ETYPED_ELEMENT__LOWER_BOUND,
- true,
- false,
- false,
- ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Upper Bound feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addUpperBoundPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ETypedElement_upperBound_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ETypedElement_upperBound_feature", "_UI_ETypedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ETYPED_ELEMENT__UPPER_BOUND,
- true,
- false,
- false,
- ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Many feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addManyPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ETypedElement_many_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ETypedElement_many_feature", "_UI_ETypedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ETYPED_ELEMENT__MANY,
- false,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Required feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addRequiredPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ETypedElement_required_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ETypedElement_required_feature", "_UI_ETypedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ETYPED_ELEMENT__REQUIRED,
- false,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the EType feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addETypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ETypedElement_eType_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ETypedElement_eType_feature", "_UI_ETypedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ETYPED_ELEMENT__ETYPE,
- true,
- false,
- true,
- null,
- null,
- null));
- }
-
- /**
* This adds a property descriptor for the Documentation feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -291,39 +113,6 @@ public class FacetElementItemProvider }
/**
- * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
- * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
- * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
- super.getChildrenFeatures(object);
- childrenFeatures.add(EcorePackage.Literals.EMODEL_ELEMENT__EANNOTATIONS);
- childrenFeatures.add(EcorePackage.Literals.ETYPED_ELEMENT__EGENERIC_TYPE);
- }
- return childrenFeatures;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected EStructuralFeature getChildFeature(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildFeature(object, child);
- }
-
- /**
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -351,20 +140,9 @@ public class FacetElementItemProvider updateChildren(notification);
switch (notification.getFeatureID(FacetElement.class)) {
- case EFacetPackage.FACET_ELEMENT__NAME:
- case EFacetPackage.FACET_ELEMENT__ORDERED:
- case EFacetPackage.FACET_ELEMENT__UNIQUE:
- case EFacetPackage.FACET_ELEMENT__LOWER_BOUND:
- case EFacetPackage.FACET_ELEMENT__UPPER_BOUND:
- case EFacetPackage.FACET_ELEMENT__MANY:
- case EFacetPackage.FACET_ELEMENT__REQUIRED:
case EFacetPackage.FACET_ELEMENT__DOCUMENTATION:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
- case EFacetPackage.FACET_ELEMENT__EANNOTATIONS:
- case EFacetPackage.FACET_ELEMENT__EGENERIC_TYPE:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
}
super.notifyChanged(notification);
}
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/provider/FacetItemProvider.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/provider/FacetItemProvider.java index 4527ed56205..89ab119e990 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/provider/FacetItemProvider.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/provider/FacetItemProvider.java @@ -27,11 +27,11 @@ 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.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.EcoreFactory;
+import org.eclipse.emf.ecore.provider.EClassifierItemProvider;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetFactory;
import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage;
@@ -45,7 +45,7 @@ import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet; * @generated
*/
public class FacetItemProvider
- extends ItemProviderAdapter {
+ extends EClassifierItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -69,11 +69,6 @@ public class FacetItemProvider if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
- addNamePropertyDescriptor(object);
- addInstanceClassNamePropertyDescriptor(object);
- addInstanceClassPropertyDescriptor(object);
- addDefaultValuePropertyDescriptor(object);
- addInstanceTypeNamePropertyDescriptor(object);
addDocumentationPropertyDescriptor(object);
addExtendedMetaclassPropertyDescriptor(object);
addConformanceTypedElementPropertyDescriptor(object);
@@ -86,111 +81,6 @@ public class FacetItemProvider }
/**
- * This adds a property descriptor for the Name feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ENamedElement_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ENamedElement_name_feature", "_UI_ENamedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ENAMED_ELEMENT__NAME,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Instance Class Name feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addInstanceClassNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_EClassifier_instanceClassName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EClassifier_instanceClassName_feature", "_UI_EClassifier_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ECLASSIFIER__INSTANCE_CLASS_NAME,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Instance Class feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addInstanceClassPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_EClassifier_instanceClass_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EClassifier_instanceClass_feature", "_UI_EClassifier_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ECLASSIFIER__INSTANCE_CLASS,
- false,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Default Value feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addDefaultValuePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_EClassifier_defaultValue_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EClassifier_defaultValue_feature", "_UI_EClassifier_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ECLASSIFIER__DEFAULT_VALUE,
- false,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Instance Type Name feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addInstanceTypeNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_EClassifier_instanceTypeName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EClassifier_instanceTypeName_feature", "_UI_EClassifier_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ECLASSIFIER__INSTANCE_TYPE_NAME,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
* This adds a property descriptor for the Documentation feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -350,8 +240,6 @@ public class FacetItemProvider public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
if (childrenFeatures == null) {
super.getChildrenFeatures(object);
- childrenFeatures.add(EcorePackage.Literals.EMODEL_ELEMENT__EANNOTATIONS);
- childrenFeatures.add(EcorePackage.Literals.ECLASSIFIER__ETYPE_PARAMETERS);
childrenFeatures.add(EFacetPackage.Literals.FACET__FACET_ELEMENTS);
childrenFeatures.add(EFacetPackage.Literals.FACET__FACET_OPERATIONS);
}
@@ -412,16 +300,9 @@ public class FacetItemProvider updateChildren(notification);
switch (notification.getFeatureID(Facet.class)) {
- case EFacetPackage.FACET__NAME:
- case EFacetPackage.FACET__INSTANCE_CLASS_NAME:
- case EFacetPackage.FACET__INSTANCE_CLASS:
- case EFacetPackage.FACET__DEFAULT_VALUE:
- case EFacetPackage.FACET__INSTANCE_TYPE_NAME:
case EFacetPackage.FACET__DOCUMENTATION:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
- case EFacetPackage.FACET__EANNOTATIONS:
- case EFacetPackage.FACET__ETYPE_PARAMETERS:
case EFacetPackage.FACET__FACET_ELEMENTS:
case EFacetPackage.FACET__FACET_OPERATIONS:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
@@ -448,6 +329,12 @@ public class FacetItemProvider newChildDescriptors.add(createChildParameter(EFacetPackage.Literals.FACET__FACET_ELEMENTS,
EFacetFactory.eINSTANCE.createFacetReference()));
+ newChildDescriptors.add(createChildParameter(EFacetPackage.Literals.FACET__FACET_ELEMENTS,
+ EcoreFactory.eINSTANCE.createEAttribute()));
+
+ newChildDescriptors.add(createChildParameter(EFacetPackage.Literals.FACET__FACET_ELEMENTS,
+ EcoreFactory.eINSTANCE.createEReference()));
+
newChildDescriptors.add(createChildParameter(EFacetPackage.Literals.FACET__FACET_OPERATIONS,
EFacetFactory.eINSTANCE.createFacetOperation()));
}
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/provider/FacetOperationItemProvider.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/provider/FacetOperationItemProvider.java index e19c8650d35..dae287910dd 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/provider/FacetOperationItemProvider.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/provider/FacetOperationItemProvider.java @@ -26,10 +26,10 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.ResourceLocator;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.provider.EOperationItemProvider;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage;
import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation;
@@ -43,7 +43,7 @@ import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query.QueryF * @generated
*/
public class FacetOperationItemProvider
- extends ItemProviderAdapter {
+ extends EOperationItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -67,15 +67,6 @@ public class FacetOperationItemProvider if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
- addNamePropertyDescriptor(object);
- addOrderedPropertyDescriptor(object);
- addUniquePropertyDescriptor(object);
- addLowerBoundPropertyDescriptor(object);
- addUpperBoundPropertyDescriptor(object);
- addManyPropertyDescriptor(object);
- addRequiredPropertyDescriptor(object);
- addETypePropertyDescriptor(object);
- addEExceptionsPropertyDescriptor(object);
addDocumentationPropertyDescriptor(object);
addCategoriesPropertyDescriptor(object);
addOverridePropertyDescriptor(object);
@@ -84,195 +75,6 @@ public class FacetOperationItemProvider }
/**
- * This adds a property descriptor for the Name feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ENamedElement_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ENamedElement_name_feature", "_UI_ENamedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ENAMED_ELEMENT__NAME,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Ordered feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addOrderedPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ETypedElement_ordered_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ETypedElement_ordered_feature", "_UI_ETypedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ETYPED_ELEMENT__ORDERED,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Unique feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addUniquePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ETypedElement_unique_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ETypedElement_unique_feature", "_UI_ETypedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ETYPED_ELEMENT__UNIQUE,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Lower Bound feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addLowerBoundPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ETypedElement_lowerBound_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ETypedElement_lowerBound_feature", "_UI_ETypedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ETYPED_ELEMENT__LOWER_BOUND,
- true,
- false,
- false,
- ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Upper Bound feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addUpperBoundPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ETypedElement_upperBound_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ETypedElement_upperBound_feature", "_UI_ETypedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ETYPED_ELEMENT__UPPER_BOUND,
- true,
- false,
- false,
- ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Many feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addManyPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ETypedElement_many_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ETypedElement_many_feature", "_UI_ETypedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ETYPED_ELEMENT__MANY,
- false,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Required feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addRequiredPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ETypedElement_required_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ETypedElement_required_feature", "_UI_ETypedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ETYPED_ELEMENT__REQUIRED,
- false,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the EType feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addETypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ETypedElement_eType_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ETypedElement_eType_feature", "_UI_ETypedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ETYPED_ELEMENT__ETYPE,
- true,
- false,
- true,
- null,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the EExceptions feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addEExceptionsPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_EOperation_eExceptions_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EOperation_eExceptions_feature", "_UI_EOperation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.EOPERATION__EEXCEPTIONS,
- true,
- false,
- true,
- null,
- null,
- null));
- }
-
- /**
* This adds a property descriptor for the Documentation feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -348,11 +150,6 @@ public class FacetOperationItemProvider public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
if (childrenFeatures == null) {
super.getChildrenFeatures(object);
- childrenFeatures.add(EcorePackage.Literals.EMODEL_ELEMENT__EANNOTATIONS);
- childrenFeatures.add(EcorePackage.Literals.ETYPED_ELEMENT__EGENERIC_TYPE);
- childrenFeatures.add(EcorePackage.Literals.EOPERATION__ETYPE_PARAMETERS);
- childrenFeatures.add(EcorePackage.Literals.EOPERATION__EPARAMETERS);
- childrenFeatures.add(EcorePackage.Literals.EOPERATION__EGENERIC_EXCEPTIONS);
childrenFeatures.add(EFacetPackage.Literals.DERIVED_TYPED_ELEMENT__QUERY);
}
return childrenFeatures;
@@ -412,21 +209,9 @@ public class FacetOperationItemProvider updateChildren(notification);
switch (notification.getFeatureID(FacetOperation.class)) {
- case EFacetPackage.FACET_OPERATION__NAME:
- case EFacetPackage.FACET_OPERATION__ORDERED:
- case EFacetPackage.FACET_OPERATION__UNIQUE:
- case EFacetPackage.FACET_OPERATION__LOWER_BOUND:
- case EFacetPackage.FACET_OPERATION__UPPER_BOUND:
- case EFacetPackage.FACET_OPERATION__MANY:
- case EFacetPackage.FACET_OPERATION__REQUIRED:
case EFacetPackage.FACET_OPERATION__DOCUMENTATION:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
- case EFacetPackage.FACET_OPERATION__EANNOTATIONS:
- case EFacetPackage.FACET_OPERATION__EGENERIC_TYPE:
- case EFacetPackage.FACET_OPERATION__ETYPE_PARAMETERS:
- case EFacetPackage.FACET_OPERATION__EPARAMETERS:
- case EFacetPackage.FACET_OPERATION__EGENERIC_EXCEPTIONS:
case EFacetPackage.FACET_OPERATION__QUERY:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return;
@@ -478,6 +263,28 @@ public class FacetOperationItemProvider }
/**
+ * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
+ Object childFeature = feature;
+ Object childObject = child;
+
+ boolean qualify = childFeature == EcorePackage.Literals.ETYPED_ELEMENT__EGENERIC_TYPE ||
+ childFeature == EcorePackage.Literals.EOPERATION__EGENERIC_EXCEPTIONS;
+
+ if (qualify) {
+ return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+ new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+ }
+ return super.getCreateChildText(owner, feature, child, selection);
+ }
+
+ /**
* Return the resource locator for this item provider's resources.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/provider/FacetReferenceItemProvider.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/provider/FacetReferenceItemProvider.java index 1a0537acbd8..bd605de3e45 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/provider/FacetReferenceItemProvider.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/provider/FacetReferenceItemProvider.java @@ -25,11 +25,10 @@ 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.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.provider.EReferenceItemProvider;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage;
import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetReference;
@@ -43,7 +42,7 @@ import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query.QueryF * @generated
*/
public class FacetReferenceItemProvider
- extends ItemProviderAdapter {
+ extends EReferenceItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -67,27 +66,6 @@ public class FacetReferenceItemProvider if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
- addNamePropertyDescriptor(object);
- addOrderedPropertyDescriptor(object);
- addUniquePropertyDescriptor(object);
- addLowerBoundPropertyDescriptor(object);
- addUpperBoundPropertyDescriptor(object);
- addManyPropertyDescriptor(object);
- addRequiredPropertyDescriptor(object);
- addETypePropertyDescriptor(object);
- addChangeablePropertyDescriptor(object);
- addVolatilePropertyDescriptor(object);
- addTransientPropertyDescriptor(object);
- addDefaultValueLiteralPropertyDescriptor(object);
- addDefaultValuePropertyDescriptor(object);
- addUnsettablePropertyDescriptor(object);
- addDerivedPropertyDescriptor(object);
- addContainmentPropertyDescriptor(object);
- addContainerPropertyDescriptor(object);
- addResolveProxiesPropertyDescriptor(object);
- addEOppositePropertyDescriptor(object);
- addEReferenceTypePropertyDescriptor(object);
- addEKeysPropertyDescriptor(object);
addDocumentationPropertyDescriptor(object);
addCategoriesPropertyDescriptor(object);
addOverridePropertyDescriptor(object);
@@ -96,447 +74,6 @@ public class FacetReferenceItemProvider }
/**
- * This adds a property descriptor for the Name feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ENamedElement_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ENamedElement_name_feature", "_UI_ENamedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ENAMED_ELEMENT__NAME,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Ordered feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addOrderedPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ETypedElement_ordered_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ETypedElement_ordered_feature", "_UI_ETypedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ETYPED_ELEMENT__ORDERED,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Unique feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addUniquePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ETypedElement_unique_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ETypedElement_unique_feature", "_UI_ETypedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ETYPED_ELEMENT__UNIQUE,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Lower Bound feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addLowerBoundPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ETypedElement_lowerBound_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ETypedElement_lowerBound_feature", "_UI_ETypedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ETYPED_ELEMENT__LOWER_BOUND,
- true,
- false,
- false,
- ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Upper Bound feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addUpperBoundPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ETypedElement_upperBound_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ETypedElement_upperBound_feature", "_UI_ETypedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ETYPED_ELEMENT__UPPER_BOUND,
- true,
- false,
- false,
- ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Many feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addManyPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ETypedElement_many_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ETypedElement_many_feature", "_UI_ETypedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ETYPED_ELEMENT__MANY,
- false,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Required feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addRequiredPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ETypedElement_required_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ETypedElement_required_feature", "_UI_ETypedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ETYPED_ELEMENT__REQUIRED,
- false,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the EType feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addETypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ETypedElement_eType_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ETypedElement_eType_feature", "_UI_ETypedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ETYPED_ELEMENT__ETYPE,
- true,
- false,
- true,
- null,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Changeable feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addChangeablePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_EStructuralFeature_changeable_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EStructuralFeature_changeable_feature", "_UI_EStructuralFeature_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ESTRUCTURAL_FEATURE__CHANGEABLE,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Volatile feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addVolatilePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_EStructuralFeature_volatile_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EStructuralFeature_volatile_feature", "_UI_EStructuralFeature_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ESTRUCTURAL_FEATURE__VOLATILE,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Transient feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addTransientPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_EStructuralFeature_transient_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EStructuralFeature_transient_feature", "_UI_EStructuralFeature_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ESTRUCTURAL_FEATURE__TRANSIENT,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Default Value Literal feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addDefaultValueLiteralPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_EStructuralFeature_defaultValueLiteral_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EStructuralFeature_defaultValueLiteral_feature", "_UI_EStructuralFeature_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ESTRUCTURAL_FEATURE__DEFAULT_VALUE_LITERAL,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Default Value feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addDefaultValuePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_EStructuralFeature_defaultValue_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EStructuralFeature_defaultValue_feature", "_UI_EStructuralFeature_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ESTRUCTURAL_FEATURE__DEFAULT_VALUE,
- false,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Unsettable feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addUnsettablePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_EStructuralFeature_unsettable_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EStructuralFeature_unsettable_feature", "_UI_EStructuralFeature_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ESTRUCTURAL_FEATURE__UNSETTABLE,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Derived feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addDerivedPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_EStructuralFeature_derived_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EStructuralFeature_derived_feature", "_UI_EStructuralFeature_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ESTRUCTURAL_FEATURE__DERIVED,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Containment feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addContainmentPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_EReference_containment_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EReference_containment_feature", "_UI_EReference_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.EREFERENCE__CONTAINMENT,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Container feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addContainerPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_EReference_container_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EReference_container_feature", "_UI_EReference_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.EREFERENCE__CONTAINER,
- false,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Resolve Proxies feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addResolveProxiesPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_EReference_resolveProxies_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EReference_resolveProxies_feature", "_UI_EReference_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.EREFERENCE__RESOLVE_PROXIES,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the EOpposite feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addEOppositePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_EReference_eOpposite_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EReference_eOpposite_feature", "_UI_EReference_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.EREFERENCE__EOPPOSITE,
- true,
- false,
- true,
- null,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the EReference Type feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addEReferenceTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_EReference_eReferenceType_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EReference_eReferenceType_feature", "_UI_EReference_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.EREFERENCE__EREFERENCE_TYPE,
- false,
- false,
- false,
- null,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the EKeys feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addEKeysPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_EReference_eKeys_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EReference_eKeys_feature", "_UI_EReference_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.EREFERENCE__EKEYS,
- true,
- false,
- true,
- null,
- null,
- null));
- }
-
- /**
* This adds a property descriptor for the Documentation feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -612,8 +149,6 @@ public class FacetReferenceItemProvider public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
if (childrenFeatures == null) {
super.getChildrenFeatures(object);
- childrenFeatures.add(EcorePackage.Literals.EMODEL_ELEMENT__EANNOTATIONS);
- childrenFeatures.add(EcorePackage.Literals.ETYPED_ELEMENT__EGENERIC_TYPE);
childrenFeatures.add(EFacetPackage.Literals.DERIVED_TYPED_ELEMENT__QUERY);
}
return childrenFeatures;
@@ -673,28 +208,9 @@ public class FacetReferenceItemProvider updateChildren(notification);
switch (notification.getFeatureID(FacetReference.class)) {
- case EFacetPackage.FACET_REFERENCE__NAME:
- case EFacetPackage.FACET_REFERENCE__ORDERED:
- case EFacetPackage.FACET_REFERENCE__UNIQUE:
- case EFacetPackage.FACET_REFERENCE__LOWER_BOUND:
- case EFacetPackage.FACET_REFERENCE__UPPER_BOUND:
- case EFacetPackage.FACET_REFERENCE__MANY:
- case EFacetPackage.FACET_REFERENCE__REQUIRED:
- case EFacetPackage.FACET_REFERENCE__CHANGEABLE:
- case EFacetPackage.FACET_REFERENCE__VOLATILE:
- case EFacetPackage.FACET_REFERENCE__TRANSIENT:
- case EFacetPackage.FACET_REFERENCE__DEFAULT_VALUE_LITERAL:
- case EFacetPackage.FACET_REFERENCE__DEFAULT_VALUE:
- case EFacetPackage.FACET_REFERENCE__UNSETTABLE:
- case EFacetPackage.FACET_REFERENCE__DERIVED:
- case EFacetPackage.FACET_REFERENCE__CONTAINMENT:
- case EFacetPackage.FACET_REFERENCE__CONTAINER:
- case EFacetPackage.FACET_REFERENCE__RESOLVE_PROXIES:
case EFacetPackage.FACET_REFERENCE__DOCUMENTATION:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
- case EFacetPackage.FACET_REFERENCE__EANNOTATIONS:
- case EFacetPackage.FACET_REFERENCE__EGENERIC_TYPE:
case EFacetPackage.FACET_REFERENCE__QUERY:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return;
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/provider/FacetSetItemProvider.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/provider/FacetSetItemProvider.java index 6edae6a499d..119541f12e3 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/provider/FacetSetItemProvider.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/provider/FacetSetItemProvider.java @@ -27,10 +27,10 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.ResourceLocator;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.provider.EPackageItemProvider;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetFactory;
import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage;
@@ -44,7 +44,7 @@ import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet; * @generated
*/
public class FacetSetItemProvider
- extends ItemProviderAdapter {
+ extends EPackageItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -68,100 +68,12 @@ public class FacetSetItemProvider if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
- addNamePropertyDescriptor(object);
- addNsURIPropertyDescriptor(object);
- addNsPrefixPropertyDescriptor(object);
- addEFactoryInstancePropertyDescriptor(object);
addDocumentationPropertyDescriptor(object);
}
return itemPropertyDescriptors;
}
/**
- * This adds a property descriptor for the Name feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ENamedElement_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ENamedElement_name_feature", "_UI_ENamedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.ENAMED_ELEMENT__NAME,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Ns URI feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addNsURIPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_EPackage_nsURI_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EPackage_nsURI_feature", "_UI_EPackage_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.EPACKAGE__NS_URI,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Ns Prefix feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addNsPrefixPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_EPackage_nsPrefix_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EPackage_nsPrefix_feature", "_UI_EPackage_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.EPACKAGE__NS_PREFIX,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the EFactory Instance feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addEFactoryInstancePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_EPackage_eFactoryInstance_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EPackage_eFactoryInstance_feature", "_UI_EPackage_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EcorePackage.Literals.EPACKAGE__EFACTORY_INSTANCE,
- true,
- false,
- true,
- null,
- null,
- null));
- }
-
- /**
* This adds a property descriptor for the Documentation feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -195,9 +107,6 @@ public class FacetSetItemProvider public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
if (childrenFeatures == null) {
super.getChildrenFeatures(object);
- childrenFeatures.add(EcorePackage.Literals.EMODEL_ELEMENT__EANNOTATIONS);
- childrenFeatures.add(EcorePackage.Literals.EPACKAGE__ECLASSIFIERS);
- childrenFeatures.add(EcorePackage.Literals.EPACKAGE__ESUBPACKAGES);
childrenFeatures.add(EFacetPackage.Literals.FACET_SET__CATEGORIES);
}
return childrenFeatures;
@@ -257,15 +166,9 @@ public class FacetSetItemProvider updateChildren(notification);
switch (notification.getFeatureID(FacetSet.class)) {
- case EFacetPackage.FACET_SET__NAME:
- case EFacetPackage.FACET_SET__NS_URI:
- case EFacetPackage.FACET_SET__NS_PREFIX:
case EFacetPackage.FACET_SET__DOCUMENTATION:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
- case EFacetPackage.FACET_SET__EANNOTATIONS:
- case EFacetPackage.FACET_SET__ECLASSIFIERS:
- case EFacetPackage.FACET_SET__ESUBPACKAGES:
case EFacetPackage.FACET_SET__CATEGORIES:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return;
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/provider/MultiValuedContainmentReferenceInstanceItemProvider.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/provider/MultiValuedContainmentReferenceInstanceItemProvider.java index 05b3ad79d11..b7ef6191348 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/provider/MultiValuedContainmentReferenceInstanceItemProvider.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/provider/MultiValuedContainmentReferenceInstanceItemProvider.java @@ -25,13 +25,10 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.EcoreFactory;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetFactory;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query.QueryFactory;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.runtime.RuntimeFactory;
import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.serialization.MultiValuedContainmentReferenceInstance;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.serialization.SerializationFactory;
import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.serialization.SerializationPackage;
/**
@@ -159,97 +156,7 @@ public class MultiValuedContainmentReferenceInstanceItemProvider super.collectNewChildDescriptors(newChildDescriptors, object);
newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.MULTI_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENTS,
- SerializationFactory.eINSTANCE.createAbstractReferenceInstance()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.MULTI_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENTS,
- SerializationFactory.eINSTANCE.createMultiValuedContainmentReferenceInstance()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.MULTI_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENTS,
- SerializationFactory.eINSTANCE.createMultiValuedReferenceInstance()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.MULTI_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENTS,
- SerializationFactory.eINSTANCE.createAbstractAttributeInstance()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.MULTI_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENTS,
- SerializationFactory.eINSTANCE.createSingleValuedAttributeInstance()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.MULTI_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENTS,
- SerializationFactory.eINSTANCE.createExtendedEObjectReference()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.MULTI_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENTS,
- SerializationFactory.eINSTANCE.createSingleValuedContainmentReferenceInstance()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.MULTI_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENTS,
- SerializationFactory.eINSTANCE.createSingleValuedReferenceInstance()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.MULTI_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENTS,
- SerializationFactory.eINSTANCE.createMultiValuedAttributeInstance()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.MULTI_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENTS,
- EFacetFactory.eINSTANCE.createFacetAttribute()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.MULTI_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENTS,
- EFacetFactory.eINSTANCE.createFacetReference()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.MULTI_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENTS,
- EFacetFactory.eINSTANCE.createFacetOperation()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.MULTI_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENTS,
- EFacetFactory.eINSTANCE.createFacetSet()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.MULTI_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENTS,
- EFacetFactory.eINSTANCE.createFacet()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.MULTI_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENTS,
- EFacetFactory.eINSTANCE.createCategory()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.MULTI_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENTS,
- EFacetFactory.eINSTANCE.createParameterValue()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.MULTI_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENTS,
- EFacetFactory.eINSTANCE.createDocumentedElement()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.MULTI_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENTS,
- QueryFactory.eINSTANCE.createNavigationQuery()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.MULTI_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENTS,
- QueryFactory.eINSTANCE.createIsOneOfQuery()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.MULTI_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENTS,
- QueryFactory.eINSTANCE.createStringLiteralQuery()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.MULTI_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENTS,
- QueryFactory.eINSTANCE.createTrueLiteralQuery()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.MULTI_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENTS,
- QueryFactory.eINSTANCE.createFalseLiteralQuery()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.MULTI_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENTS,
- QueryFactory.eINSTANCE.createNullLiteralQuery()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.MULTI_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENTS,
- QueryFactory.eINSTANCE.createIntegerLiteralQuery()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.MULTI_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENTS,
- QueryFactory.eINSTANCE.createFloatLiteralQuery()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.MULTI_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENTS,
- QueryFactory.eINSTANCE.createEObjectLiteralQuery()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.MULTI_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENTS,
- QueryFactory.eINSTANCE.createOperationCallQuery()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.MULTI_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENTS,
- RuntimeFactory.eINSTANCE.createETypedElementPrimitiveTypeResult()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.MULTI_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENTS,
- RuntimeFactory.eINSTANCE.createETypedElementEObjectResult()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.MULTI_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENTS,
- RuntimeFactory.eINSTANCE.createETypedElementPrimitiveTypeListResult()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.MULTI_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENTS,
- RuntimeFactory.eINSTANCE.createETypedElementEObjectListResult()));
+ EcoreFactory.eINSTANCE.createEObject()));
}
}
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/provider/SingleValuedContainmentReferenceInstanceItemProvider.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/provider/SingleValuedContainmentReferenceInstanceItemProvider.java index 6555d109880..6d3af5114ee 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/provider/SingleValuedContainmentReferenceInstanceItemProvider.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/provider/SingleValuedContainmentReferenceInstanceItemProvider.java @@ -25,12 +25,9 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.EcoreFactory;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetFactory;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.query.QueryFactory;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.runtime.RuntimeFactory;
-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.serialization.SerializationFactory;
import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.serialization.SerializationPackage;
import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.serialization.SingleValuedContainmentReferenceInstance;
@@ -159,97 +156,7 @@ public class SingleValuedContainmentReferenceInstanceItemProvider super.collectNewChildDescriptors(newChildDescriptors, object);
newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.SINGLE_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENT,
- SerializationFactory.eINSTANCE.createAbstractReferenceInstance()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.SINGLE_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENT,
- SerializationFactory.eINSTANCE.createMultiValuedContainmentReferenceInstance()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.SINGLE_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENT,
- SerializationFactory.eINSTANCE.createMultiValuedReferenceInstance()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.SINGLE_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENT,
- SerializationFactory.eINSTANCE.createAbstractAttributeInstance()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.SINGLE_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENT,
- SerializationFactory.eINSTANCE.createSingleValuedAttributeInstance()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.SINGLE_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENT,
- SerializationFactory.eINSTANCE.createExtendedEObjectReference()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.SINGLE_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENT,
- SerializationFactory.eINSTANCE.createSingleValuedContainmentReferenceInstance()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.SINGLE_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENT,
- SerializationFactory.eINSTANCE.createSingleValuedReferenceInstance()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.SINGLE_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENT,
- SerializationFactory.eINSTANCE.createMultiValuedAttributeInstance()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.SINGLE_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENT,
- EFacetFactory.eINSTANCE.createFacetAttribute()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.SINGLE_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENT,
- EFacetFactory.eINSTANCE.createFacetReference()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.SINGLE_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENT,
- EFacetFactory.eINSTANCE.createFacetOperation()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.SINGLE_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENT,
- EFacetFactory.eINSTANCE.createFacetSet()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.SINGLE_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENT,
- EFacetFactory.eINSTANCE.createFacet()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.SINGLE_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENT,
- EFacetFactory.eINSTANCE.createCategory()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.SINGLE_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENT,
- EFacetFactory.eINSTANCE.createParameterValue()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.SINGLE_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENT,
- EFacetFactory.eINSTANCE.createDocumentedElement()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.SINGLE_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENT,
- QueryFactory.eINSTANCE.createNavigationQuery()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.SINGLE_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENT,
- QueryFactory.eINSTANCE.createIsOneOfQuery()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.SINGLE_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENT,
- QueryFactory.eINSTANCE.createStringLiteralQuery()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.SINGLE_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENT,
- QueryFactory.eINSTANCE.createTrueLiteralQuery()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.SINGLE_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENT,
- QueryFactory.eINSTANCE.createFalseLiteralQuery()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.SINGLE_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENT,
- QueryFactory.eINSTANCE.createNullLiteralQuery()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.SINGLE_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENT,
- QueryFactory.eINSTANCE.createIntegerLiteralQuery()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.SINGLE_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENT,
- QueryFactory.eINSTANCE.createFloatLiteralQuery()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.SINGLE_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENT,
- QueryFactory.eINSTANCE.createEObjectLiteralQuery()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.SINGLE_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENT,
- QueryFactory.eINSTANCE.createOperationCallQuery()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.SINGLE_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENT,
- RuntimeFactory.eINSTANCE.createETypedElementPrimitiveTypeResult()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.SINGLE_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENT,
- RuntimeFactory.eINSTANCE.createETypedElementEObjectResult()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.SINGLE_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENT,
- RuntimeFactory.eINSTANCE.createETypedElementPrimitiveTypeListResult()));
-
- newChildDescriptors.add(createChildParameter(SerializationPackage.Literals.SINGLE_VALUED_CONTAINMENT_REFERENCE_INSTANCE__OWNED_ELEMENT,
- RuntimeFactory.eINSTANCE.createETypedElementEObjectListResult()));
+ EcoreFactory.eINSTANCE.createEObject()));
}
}
|