From 3f34a61aa514c030783124957fbcc4ad54212fbf Mon Sep 17 00:00:00 2001 From: Camille Letavernier Date: Tue, 19 Jan 2016 11:08:03 +0100 Subject: Bug 486090: [Facet Metamodel] Regeneration does not work well https://bugs.eclipse.org/bugs/show_bug.cgi?id=486090 - Regenerate all metamodels related to/depending on the Facet metamodel to ensure consistency Change-Id: I4687d17fd117df8f4b62bc4090cec955674fbd27 Signed-off-by: Camille Letavernier --- .../META-INF/MANIFEST.MF | 9 +- .../CreateFacet_facetElements_EAttribute.gif | Bin 0 -> 223 bytes .../CreateFacet_facetElements_EReference.gif | Bin 0 -> 223 bytes .../icons/full/obj16/FacetSetCatalog.gif | Bin 0 -> 129 bytes .../plugin.properties | 4 + .../plugin.xml | 26 ++ .../efacet/provider/CategoryItemProvider.java | 64 +-- .../v0_2_0/efacet/provider/Efacet2EditPlugin.java | 2 + .../provider/FacetAttributeItemProvider.java | 398 +---------------- .../efacet/provider/FacetElementItemProvider.java | 226 +--------- .../v0_2_0/efacet/provider/FacetItemProvider.java | 131 +----- .../provider/FacetOperationItemProvider.java | 241 +--------- .../provider/FacetReferenceItemProvider.java | 488 +-------------------- .../efacet/provider/FacetSetItemProvider.java | 101 +---- ...edContainmentReferenceInstanceItemProvider.java | 97 +--- ...edContainmentReferenceInstanceItemProvider.java | 97 +--- .../META-INF/MANIFEST.MF | 3 +- .../model/efacet-0.2.0.ecore | 77 ++-- .../model/efacet-0.2.0.genmodel | 3 +- .../model/efacetcatalog-0.2.0.ecore | 7 +- .../model/efacetcatalog-0.2.0.genmodel | 11 +- .../plugin.properties | 17 - .../plugin.xml | 35 +- .../impl/EfacetcatalogFactoryImpl.java | 2 +- .../impl/EfacetcatalogPackageImpl.java | 11 +- .../efacetcatalog/impl/FacetSetCatalogImpl.java | 12 +- .../util/EfacetcatalogAdapterFactory.java | 29 +- .../efacetcatalog/util/EfacetcatalogSwitch.java | 7 +- .../.classpath | 3 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- .../META-INF/MANIFEST.MF | 2 +- 31 files changed, 198 insertions(+), 1911 deletions(-) create mode 100644 plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/icons/full/ctool16/CreateFacet_facetElements_EAttribute.gif create mode 100644 plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/icons/full/ctool16/CreateFacet_facetElements_EReference.gif create mode 100644 plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/icons/full/obj16/FacetSetCatalog.gif delete mode 100644 plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/plugin.properties diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/META-INF/MANIFEST.MF index 0ee622593c7..9c57cc8b3fb 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/META-INF/MANIFEST.MF @@ -5,10 +5,11 @@ Export-Package: org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.ext org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.runtime.provider, org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.serialization.provider Require-Bundle: org.eclipse.core.runtime, - org.eclipse.emf.edit, - org.eclipse.emf.ecore, - org.eclipse.emf.ecore.edit, - org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.2.0" + org.eclipse.emf.edit;visibility:=reexport, + org.eclipse.papyrus.emf.facet.util.emf.catalog;visibility:=reexport, + org.eclipse.emf.ecore;visibility:=reexport, + org.eclipse.emf.ecore.edit;visibility:=reexport, + org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.2.0";visibility:=reexport Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/icons/full/ctool16/CreateFacet_facetElements_EAttribute.gif b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/icons/full/ctool16/CreateFacet_facetElements_EAttribute.gif new file mode 100644 index 00000000000..e06d6105a5c Binary files /dev/null and b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/icons/full/ctool16/CreateFacet_facetElements_EAttribute.gif differ diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/icons/full/ctool16/CreateFacet_facetElements_EReference.gif b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/icons/full/ctool16/CreateFacet_facetElements_EReference.gif new file mode 100644 index 00000000000..99df60b4709 Binary files /dev/null and b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/icons/full/ctool16/CreateFacet_facetElements_EReference.gif differ diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/icons/full/obj16/FacetSetCatalog.gif b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/icons/full/obj16/FacetSetCatalog.gif new file mode 100644 index 00000000000..89ad5da38ab Binary files /dev/null and b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/icons/full/obj16/FacetSetCatalog.gif differ diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/plugin.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/plugin.properties index 1c38e005644..322d0879322 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/plugin.properties +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/plugin.properties @@ -157,3 +157,7 @@ _UI_EObjectLiteralQuery_element_feature = Element _UI_OperationCallQuery_operation_feature = Operation _UI_OperationCallQuery_arguments_feature = Arguments _UI_Facet_extendedFacets_feature = Extended Facets +_UI_Facet_allTypedElements_feature = All Typed Elements +_UI_Facet_allFacetOperations_feature = All Facet Operations +_UI_Facet_allFacetElements_feature = All Facet Elements +_UI_FacetSetCatalog_type = Facet Set Catalog diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/plugin.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/plugin.xml index 8671747e8d3..23713d0a71b 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/plugin.xml +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/plugin.xml @@ -69,4 +69,30 @@ org.eclipse.emf.edit.provider.IItemPropertySource"/> + + + + + + + + + + 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. * @@ -66,33 +64,11 @@ public class CategoryItemProvider if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); - addNamePropertyDescriptor(object); addDocumentationPropertyDescriptor(object); } return itemPropertyDescriptors; } - /** - * This adds a property descriptor for the Name feature. - * - * - * - * @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. * @@ -114,38 +90,6 @@ public class CategoryItemProvider null)); } - /** - * 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}. - * - * - * - * @generated - */ - @Override - public Collection getChildrenFeatures(Object object) { - if (childrenFeatures == null) { - super.getChildrenFeatures(object); - childrenFeatures.add(EcorePackage.Literals.EMODEL_ELEMENT__EANNOTATIONS); - } - return childrenFeatures; - } - - /** - * - * - * - * @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. * @@ -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. * @@ -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); @@ -91,363 +73,6 @@ public class FacetAttributeItemProvider return itemPropertyDescriptors; } - /** - * This adds a property descriptor for the Name feature. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. * @@ -524,8 +149,6 @@ public class FacetAttributeItemProvider public Collection 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. * @@ -66,188 +64,12 @@ 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); } return itemPropertyDescriptors; } - /** - * This adds a property descriptor for the Name feature. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. * @@ -290,39 +112,6 @@ public class FacetElementItemProvider null)); } - /** - * 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}. - * - * - * - * @generated - */ - @Override - public Collection 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; - } - - /** - * - * - * - * @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. * @@ -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. * @@ -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); @@ -85,111 +80,6 @@ public class FacetItemProvider return itemPropertyDescriptors; } - /** - * This adds a property descriptor for the Name feature. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. * @@ -350,8 +240,6 @@ public class FacetItemProvider public Collection 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. * @@ -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); @@ -83,195 +74,6 @@ public class FacetOperationItemProvider return itemPropertyDescriptors; } - /** - * This adds a property descriptor for the Name feature. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. * @@ -348,11 +150,6 @@ public class FacetOperationItemProvider public Collection 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; @@ -477,6 +262,28 @@ public class FacetOperationItemProvider QueryFactory.eINSTANCE.createOperationCallQuery())); } + /** + * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. + * + * + * + * @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. * 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. * @@ -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); @@ -95,447 +73,6 @@ public class FacetReferenceItemProvider return itemPropertyDescriptors; } - /** - * This adds a property descriptor for the Name feature. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. * @@ -612,8 +149,6 @@ public class FacetReferenceItemProvider public Collection 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. * @@ -68,99 +68,11 @@ 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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. - * - * - * - * @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. * @@ -195,9 +107,6 @@ public class FacetSetItemProvider public Collection 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())); } } diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/META-INF/MANIFEST.MF index ff9c2af3d18..05645683e86 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/META-INF/MANIFEST.MF @@ -18,7 +18,8 @@ Export-Package: org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet, org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacetcatalog.impl, org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacetcatalog.util Require-Bundle: org.eclipse.core.runtime, - org.eclipse.emf.ecore, + org.eclipse.emf.ecore;visibility:=reexport, + org.eclipse.papyrus.emf.facet.util.emf.catalog;visibility:=reexport, org.eclipse.papyrus.emf.facet.util.emf.core;bundle-version="1.2.0" Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/model/efacet-0.2.0.ecore b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/model/efacet-0.2.0.ecore index b8a2013871e..3949e6a0fba 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/model/efacet-0.2.0.ecore +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/model/efacet-0.2.0.ecore @@ -5,22 +5,22 @@
- +
- +
- +
- +
@@ -32,7 +32,7 @@ - +
@@ -45,13 +45,13 @@
- +
@@ -60,7 +60,7 @@ + eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//ETypedElement"/> @@ -68,20 +68,20 @@ - +
- +
@@ -106,34 +106,35 @@
- + eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EParameter"/> + - + + eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EReference"/> + eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject" + containment="true"/> + eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/> - + + eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/> - - + + eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/> + eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EAttribute"/>
- - + + - + @@ -182,10 +183,10 @@
+ eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/> - + @@ -203,16 +204,16 @@ - + - + - + - + @@ -234,7 +235,7 @@
- + @@ -255,7 +256,7 @@
- + @@ -266,7 +267,7 @@
+ lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//ETypedElement">
@@ -278,7 +279,7 @@ + eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/model/efacet-0.2.0.genmodel b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/model/efacet-0.2.0.genmodel index e4b284612aa..bce01786b27 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/model/efacet-0.2.0.genmodel +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/model/efacet-0.2.0.genmodel @@ -3,7 +3,8 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2011-2012 Mia-Software. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html Contributors: Gregoire Dupe (Mia-Software) - Design Nicolas Guyomar (Mia-Software) - Implementation Emmanuelle Rouillé (Mia-Software) - Bug 352618 - To be able to use non derived facet structural features and save them values. Nicolas Bros (Mia-Software) - Bug 361823 - [Restructuring] eFacet2 meta-model Gregoire Dupe (Mia-Software) - Bug 366055 - NavigationQuery Gregoire Dupe (Mia-Software) - Bug 369673 - [Facet] IsOneOfQuery Olivier Remaud (Soft-Maint) - Bug 369824 - Add a simple way to return string literal constants from a customization query Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework Gregoire Dupe (Mia-software) - Bug 364325 - [Restructuring] The user must be able to navigate into a model using the Facet. Nicolas Bros (Mia-Software) - Bug 372626 - [Facet] Aggregates Nicolas Bros (Mia-Software) - Bug 376941 - [EFacet] Facet operation arguments in Facet model Gregoire Dupe (Mia-Software) - Bug 376576 - [EFacet] Change the multiplicity of Facet::extendedFacet " modelDirectory="/org.eclipse.papyrus.emf.facet.efacet.metamodel/src" modelPluginID="org.eclipse.papyrus.emf.facet.efacet.metamodel" modelName="Efacet2" nonNLSMarkers="true" importerID="org.eclipse.emf.importer.ecore" - complianceLevel="5.0" copyrightFields="false" runtimeVersion="2.6" language=""> + complianceLevel="5.0" copyrightFields="false" runtimeVersion="2.6" language="" + usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> efacet-0.2.0.ecore diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/model/efacetcatalog-0.2.0.ecore b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/model/efacetcatalog-0.2.0.ecore index bc524f9b9f2..2a309a27bde 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/model/efacetcatalog-0.2.0.ecore +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/model/efacetcatalog-0.2.0.ecore @@ -1,8 +1,7 @@ - +
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/model/efacetcatalog-0.2.0.genmodel b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/model/efacetcatalog-0.2.0.genmodel index 2c2cb677f62..ef3b2582fce 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/model/efacetcatalog-0.2.0.genmodel +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/model/efacetcatalog-0.2.0.genmodel @@ -1,16 +1,13 @@ - + usedGenPackages="platform:/plugin/org.eclipse.papyrus.emf.facet.util.emf.catalog/model/catalog.genmodel#//catalog"> efacetcatalog-0.2.0.ecore - - - + diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/plugin.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/plugin.properties deleted file mode 100644 index a1e76334733..00000000000 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/plugin.properties +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (c) 2011,2012 Mia-Software. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Gregoire Dupe (Mia-Software) - Design -# Nicolas Guyomar (Mia-Software) - Implementation -# Emmanuelle Rouillé (Mia-Software) - Bug 352618 - To be able to use non-derived facet structural features and save their values. -# Nicolas Bros (Mia-Software) - Bug 370110 - Rename efacetcatalog2.ecore -# Grégoire Dupé (Mia-Software) - Bug 361817 - [Restructuring] Dynamic load to the facet catalog -# - -pluginName = Efacetcatalog Model -providerName = www.example.org diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/plugin.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/plugin.xml index bf33e375ec7..6569dd0b927 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/plugin.xml +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/plugin.xml @@ -19,20 +19,41 @@ + - + + + + + + + + + + + + + + + + + + diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/EfacetcatalogFactoryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/EfacetcatalogFactoryImpl.java index 1bea99979b8..46b3064224c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/EfacetcatalogFactoryImpl.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/EfacetcatalogFactoryImpl.java @@ -42,7 +42,7 @@ public class EfacetcatalogFactoryImpl extends EFactoryImpl implements Efacetcata */ public static EfacetcatalogFactory init() { try { - EfacetcatalogFactory theEfacetcatalogFactory = (EfacetcatalogFactory) EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacetcatalog"); //$NON-NLS-1$ + EfacetcatalogFactory theEfacetcatalogFactory = (EfacetcatalogFactory) EPackage.Registry.INSTANCE.getEFactory(EfacetcatalogPackage.eNS_URI); if (theEfacetcatalogFactory != null) { return theEfacetcatalogFactory; } diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/EfacetcatalogPackageImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/EfacetcatalogPackageImpl.java index 9884b923050..378f06fb15d 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/EfacetcatalogPackageImpl.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/EfacetcatalogPackageImpl.java @@ -19,7 +19,6 @@ package org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacetcatalog.impl import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.impl.EPackageImpl; -import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetPackage; import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacetcatalog.EfacetcatalogFactory; import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacetcatalog.EfacetcatalogPackage; import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacetcatalog.FacetSetCatalog; @@ -42,10 +41,15 @@ public class EfacetcatalogPackageImpl extends EPackageImpl implements Efacetcata private EClass facetSetCatalogEClass = null; /** - * Creates an instance of the model Package, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package + * Creates an instance of the model Package, registered with + * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package * package URI value. *

- * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. + * Note: the correct way to create the package is via the static + * factory method {@link #init init()}, which also performs + * initialization of the package, or returns the registered package, + * if one already exists. + * * * @see org.eclipse.emf.ecore.EPackage.Registry * @see org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacetcatalog.EfacetcatalogPackage#eNS_URI @@ -88,7 +92,6 @@ public class EfacetcatalogPackageImpl extends EPackageImpl implements Efacetcata // Initialize simple dependencies CatalogPackage.eINSTANCE.eClass(); - EFacetPackage.eINSTANCE.eClass(); // Create package meta-data objects theEfacetcatalogPackage.createPackageContents(); diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/FacetSetCatalogImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/FacetSetCatalogImpl.java index 32fc44ec2b5..eb9024f8d3f 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/FacetSetCatalogImpl.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/FacetSetCatalogImpl.java @@ -34,11 +34,11 @@ import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacetcatalog.Facet * *

* The following features are implemented: + *

*
    *
  • {@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacetcatalog.impl.FacetSetCatalogImpl#getInstalledEntries Installed Entries}
    • *
  • {@link org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacetcatalog.impl.FacetSetCatalogImpl#getName Name}
    • *
- *

* * @generated */ @@ -126,7 +126,7 @@ public class FacetSetCatalogImpl extends EObjectImpl implements FacetSetCatalog * * @generated */ - public void setName(final String newName) { + public void setName(String newName) { String oldName = name; name = newName; if (eNotificationRequired()) { @@ -141,7 +141,7 @@ public class FacetSetCatalogImpl extends EObjectImpl implements FacetSetCatalog * @generated */ @Override - public Object eGet(final int featureID, final boolean resolve, final boolean coreType) { + public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case EfacetcatalogPackage.FACET_SET_CATALOG__INSTALLED_ENTRIES: return getInstalledEntries(); @@ -159,7 +159,7 @@ public class FacetSetCatalogImpl extends EObjectImpl implements FacetSetCatalog */ @SuppressWarnings("unchecked") @Override - public void eSet(final int featureID, final Object newValue) { + public void eSet(int featureID, Object newValue) { switch (featureID) { case EfacetcatalogPackage.FACET_SET_CATALOG__INSTALLED_ENTRIES: getInstalledEntries().clear(); @@ -179,7 +179,7 @@ public class FacetSetCatalogImpl extends EObjectImpl implements FacetSetCatalog * @generated */ @Override - public void eUnset(final int featureID) { + public void eUnset(int featureID) { switch (featureID) { case EfacetcatalogPackage.FACET_SET_CATALOG__INSTALLED_ENTRIES: getInstalledEntries().clear(); @@ -198,7 +198,7 @@ public class FacetSetCatalogImpl extends EObjectImpl implements FacetSetCatalog * @generated */ @Override - public boolean eIsSet(final int featureID) { + public boolean eIsSet(int featureID) { switch (featureID) { case EfacetcatalogPackage.FACET_SET_CATALOG__INSTALLED_ENTRIES: return installedEntries != null && !installedEntries.isEmpty(); diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/util/EfacetcatalogAdapterFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/util/EfacetcatalogAdapterFactory.java index dfc2cef9b08..949f7132d94 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/util/EfacetcatalogAdapterFactory.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/util/EfacetcatalogAdapterFactory.java @@ -83,23 +83,22 @@ public class EfacetcatalogAdapterFactory extends AdapterFactoryImpl { * * @generated */ - protected EfacetcatalogSwitch modelSwitch = - new EfacetcatalogSwitch() { - @Override - public Adapter caseFacetSetCatalog(FacetSetCatalog object) { - return createFacetSetCatalogAdapter(); - } + protected EfacetcatalogSwitch modelSwitch = new EfacetcatalogSwitch() { + @Override + public Adapter caseFacetSetCatalog(FacetSetCatalog object) { + return createFacetSetCatalogAdapter(); + } - @Override - public Adapter caseCatalog(Catalog object) { - return createCatalogAdapter(); - } + @Override + public Adapter caseCatalog(Catalog object) { + return createCatalogAdapter(); + } - @Override - public Adapter defaultCase(EObject object) { - return createEObjectAdapter(); - } - }; + @Override + public Adapter defaultCase(EObject object) { + return createEObjectAdapter(); + } + }; /** * Creates an adapter for the target. diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/util/EfacetcatalogSwitch.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/util/EfacetcatalogSwitch.java index eac2563a6df..66b1a932c64 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/util/EfacetcatalogSwitch.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/util/EfacetcatalogSwitch.java @@ -83,12 +83,9 @@ public class EfacetcatalogSwitch { protected T doSwitch(EClass theEClass, EObject theEObject) { if (theEClass.eContainer() == modelPackage) { return doSwitch(theEClass.getClassifierID(), theEObject); - } - else { + } else { List eSuperTypes = theEClass.getESuperTypes(); - return eSuperTypes.isEmpty() ? - defaultCase(theEObject) : - doSwitch(eSuperTypes.get(0), theEObject); + return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject); } } diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/.classpath b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/.classpath index 6a42377b56a..8d79e849ffb 100644 --- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/.classpath +++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/.classpath @@ -1,8 +1,9 @@ - + + diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/.settings/org.eclipse.jdt.core.prefs index 9ca8e68231b..62a08f4494d 100644 --- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF index 6feb8cd0237..674001c61a8 100644 --- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF +++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF @@ -47,4 +47,4 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.modelexplorer.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.modelexplorer;singleton:=true -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -- cgit v1.2.3