diff options
| author | Camille Letavernier | 2017-08-29 13:37:14 +0000 |
|---|---|---|
| committer | Camille Letavernier | 2017-08-30 16:00:43 +0000 |
| commit | 7ddcae6ccc2a62506055d12a173dc961814bf2f3 (patch) | |
| tree | 1a6c1febe4bddb698deb15aab08440f310a00857 | |
| parent | 91aeb97aee4eca4cdf8098f27564d713d2d26c54 (diff) | |
| download | org.eclipse.papyrus-7ddcae6ccc2a62506055d12a173dc961814bf2f3.tar.gz org.eclipse.papyrus-7ddcae6ccc2a62506055d12a173dc961814bf2f3.tar.xz org.eclipse.papyrus-7ddcae6ccc2a62506055d12a173dc961814bf2f3.zip | |
Bug 521468: [Palette] Required profiles are not taken into account
anymore
https://bugs.eclipse.org/bugs/show_bug.cgi?id=521468
- Add extended new child menus to the Palette Editor
- Regenerate all filter metamodels to properly contribute new child
extensions
Change-Id: I94a562f5c3ef5ed54c66385b8635eca4a89e9074
Signed-off-by: Camille Letavernier <cletavernier@eclipsesource.com>
135 files changed, 3483 insertions, 2987 deletions
diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/.settings/.api_filters b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/.settings/.api_filters new file mode 100644 index 00000000000..8fae0beab5b --- /dev/null +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.filters.edit" version="2"> + <resource path="src-gen/org/eclipse/papyrus/infra/filters/provider/FiltersItemProviderAdapterFactory.java" type="org.eclipse.papyrus.infra.filters.provider.FiltersItemProviderAdapterFactory"> + <filter comment="Generated code" id="336658481"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.filters.provider.FiltersItemProviderAdapterFactory"/> + <message_argument value="filteredElementItemProvider"/> + </message_arguments> + </filter> + </resource> +</component> diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/META-INF/MANIFEST.MF b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/META-INF/MANIFEST.MF index 1e8f83341cc..209708f74f9 100644 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: . -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.4.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/plugin.properties b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/plugin.properties index 0cdde9edcf4..651d0a1eae8 100644 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/plugin.properties +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/plugin.properties @@ -38,3 +38,5 @@ _UI_OperatorKind_xor_literal = xor _UI_OperatorKind_not_literal = not _UI_Equals_type = Equals _UI_Equals_object_feature = Object +_UI_FilteredElement_type = Filtered Element +_UI_FilteredElement_filter_feature = Filter diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/pom.xml b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/pom.xml index 56cf0037cde..5479b151ab3 100644 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/pom.xml +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/pom.xml @@ -8,6 +8,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.filters.edit</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/CompoundFilterItemProvider.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/CompoundFilterItemProvider.java index 01494ebc69b..f27169fe9f9 100644 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/CompoundFilterItemProvider.java +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/CompoundFilterItemProvider.java @@ -37,6 +37,7 @@ import org.eclipse.papyrus.infra.filters.FiltersFactory; import org.eclipse.papyrus.infra.filters.FiltersPackage; import org.eclipse.uml2.common.edit.command.SubsetAddCommand; import org.eclipse.uml2.common.edit.command.SubsetSupersetReplaceCommand; +import org.eclipse.uml2.common.edit.command.SubsetSupersetSetCommand; import org.eclipse.uml2.common.edit.command.SupersetRemoveCommand; /** @@ -68,8 +69,7 @@ public class CompoundFilterItemProvider extends ItemProviderAdapter implements I */ @Override public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) - { + if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); addNamePropertyDescriptor(object); @@ -86,21 +86,18 @@ public class CompoundFilterItemProvider extends ItemProviderAdapter implements I * * @generated */ - protected void addNamePropertyDescriptor(Object object) - { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Filter_name_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_Filter_name_feature", "_UI_Filter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - FiltersPackage.Literals.FILTER__NAME, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); + protected void addNamePropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Filter_name_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_Filter_name_feature", "_UI_Filter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + FiltersPackage.Literals.FILTER__NAME, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); } /** @@ -110,21 +107,18 @@ public class CompoundFilterItemProvider extends ItemProviderAdapter implements I * * @generated */ - protected void addFilterPropertyDescriptor(Object object) - { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_CompoundFilter_filter_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_CompoundFilter_filter_feature", "_UI_CompoundFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - FiltersPackage.Literals.COMPOUND_FILTER__FILTER, - true, - false, - true, - null, - null, - null)); + protected void addFilterPropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_CompoundFilter_filter_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_CompoundFilter_filter_feature", "_UI_CompoundFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + FiltersPackage.Literals.COMPOUND_FILTER__FILTER, + true, + false, + true, + null, + null, + null)); } /** @@ -135,23 +129,22 @@ public class CompoundFilterItemProvider extends ItemProviderAdapter implements I * @generated */ protected void addOperatorPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_CompoundFilter_operator_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_CompoundFilter_operator_feature", "_UI_CompoundFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - FiltersPackage.Literals.COMPOUND_FILTER__OPERATOR, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_CompoundFilter_operator_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_CompoundFilter_operator_feature", "_UI_CompoundFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + FiltersPackage.Literals.COMPOUND_FILTER__OPERATOR, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + 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 + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -160,8 +153,7 @@ public class CompoundFilterItemProvider extends ItemProviderAdapter implements I */ @Override public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) { - if (childrenFeatures == null) - { + if (childrenFeatures == null) { super.getChildrenFeatures(object); childrenFeatures.add(FiltersPackage.Literals.COMPOUND_FILTER__OWNED_FILTER); } @@ -201,8 +193,7 @@ public class CompoundFilterItemProvider extends ItemProviderAdapter implements I * @generated */ @Override - protected boolean shouldComposeCreationImage() - { + protected boolean shouldComposeCreationImage() { return true; } @@ -216,8 +207,7 @@ public class CompoundFilterItemProvider extends ItemProviderAdapter implements I @Override public String getText(Object object) { String label = ((CompoundFilter) object).getName(); - return label == null || label.length() == 0 ? - getString("_UI_CompoundFilter_type") : //$NON-NLS-1$ + return label == null || label.length() == 0 ? getString("_UI_CompoundFilter_type") : //$NON-NLS-1$ getString("_UI_CompoundFilter_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ } @@ -234,8 +224,7 @@ public class CompoundFilterItemProvider extends ItemProviderAdapter implements I public void notifyChanged(Notification notification) { updateChildren(notification); - switch (notification.getFeatureID(CompoundFilter.class)) - { + switch (notification.getFeatureID(CompoundFilter.class)) { case FiltersPackage.COMPOUND_FILTER__NAME: case FiltersPackage.COMPOUND_FILTER__FILTER: case FiltersPackage.COMPOUND_FILTER__OPERATOR: @@ -260,15 +249,11 @@ public class CompoundFilterItemProvider extends ItemProviderAdapter implements I protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add - (createChildParameter - (FiltersPackage.Literals.COMPOUND_FILTER__OWNED_FILTER, - FiltersFactory.eINSTANCE.createCompoundFilter())); + newChildDescriptors.add(createChildParameter(FiltersPackage.Literals.COMPOUND_FILTER__OWNED_FILTER, + FiltersFactory.eINSTANCE.createCompoundFilter())); - newChildDescriptors.add - (createChildParameter - (FiltersPackage.Literals.COMPOUND_FILTER__OWNED_FILTER, - FiltersFactory.eINSTANCE.createEquals())); + newChildDescriptors.add(createChildParameter(FiltersPackage.Literals.COMPOUND_FILTER__OWNED_FILTER, + FiltersFactory.eINSTANCE.createEquals())); } /** @@ -279,8 +264,7 @@ public class CompoundFilterItemProvider extends ItemProviderAdapter implements I * @generated */ @Override - public ResourceLocator getResourceLocator() - { + public ResourceLocator getResourceLocator() { return ((IChildCreationExtender) adapterFactory).getResourceLocator(); } @@ -329,4 +313,21 @@ public class CompoundFilterItemProvider extends ItemProviderAdapter implements I return super.createReplaceCommand(domain, owner, feature, value, collection); } + /** + * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#createSetCommand(org.eclipse.emf.edit.domain.EditingDomain, org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature, java.lang.Object) + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected Command createSetCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Object value) { + if (feature == FiltersPackage.Literals.COMPOUND_FILTER__OWNED_FILTER) { + return new SubsetSupersetSetCommand(domain, owner, feature, new EStructuralFeature[] { FiltersPackage.Literals.COMPOUND_FILTER__FILTER }, null, value); + } + if (feature == FiltersPackage.Literals.COMPOUND_FILTER__FILTER) { + return new SubsetSupersetSetCommand(domain, owner, feature, null, new EStructuralFeature[] { FiltersPackage.Literals.COMPOUND_FILTER__OWNED_FILTER }, value); + } + return super.createSetCommand(domain, owner, feature, value); + } + } diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/EqualsItemProvider.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/EqualsItemProvider.java index e5d3920f441..5ee4621ebdb 100644 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/EqualsItemProvider.java +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/EqualsItemProvider.java @@ -41,8 +41,7 @@ import org.eclipse.papyrus.infra.filters.FiltersPackage; * * @generated */ -public class EqualsItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource -{ +public class EqualsItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { /** * This constructs an instance from a factory and a notifier. * <!-- begin-user-doc --> @@ -50,8 +49,7 @@ public class EqualsItemProvider extends ItemProviderAdapter implements IEditingD * * @generated */ - public EqualsItemProvider(AdapterFactory adapterFactory) - { + public EqualsItemProvider(AdapterFactory adapterFactory) { super(adapterFactory); } @@ -63,10 +61,8 @@ public class EqualsItemProvider extends ItemProviderAdapter implements IEditingD * @generated */ @Override - public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) - { - if (itemPropertyDescriptors == null) - { + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { + if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); addNamePropertyDescriptor(object); @@ -82,21 +78,18 @@ public class EqualsItemProvider extends ItemProviderAdapter implements IEditingD * * @generated */ - protected void addNamePropertyDescriptor(Object object) - { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Filter_name_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_Filter_name_feature", "_UI_Filter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - FiltersPackage.Literals.FILTER__NAME, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); + protected void addNamePropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Filter_name_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_Filter_name_feature", "_UI_Filter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + FiltersPackage.Literals.FILTER__NAME, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); } /** @@ -106,21 +99,18 @@ public class EqualsItemProvider extends ItemProviderAdapter implements IEditingD * * @generated */ - protected void addObjectPropertyDescriptor(Object object) - { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Equals_object_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_Equals_object_feature", "_UI_Equals_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - FiltersPackage.Literals.EQUALS__OBJECT, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); + protected void addObjectPropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Equals_object_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_Equals_object_feature", "_UI_Equals_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + FiltersPackage.Literals.EQUALS__OBJECT, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); } /** @@ -131,8 +121,7 @@ public class EqualsItemProvider extends ItemProviderAdapter implements IEditingD * @generated */ @Override - public Object getImage(Object object) - { + public Object getImage(Object object) { return overlayImage(object, getResourceLocator().getImage("full/obj16/Equals")); //$NON-NLS-1$ } @@ -143,8 +132,7 @@ public class EqualsItemProvider extends ItemProviderAdapter implements IEditingD * @generated */ @Override - protected boolean shouldComposeCreationImage() - { + protected boolean shouldComposeCreationImage() { return true; } @@ -156,11 +144,9 @@ public class EqualsItemProvider extends ItemProviderAdapter implements IEditingD * @generated */ @Override - public String getText(Object object) - { + public String getText(Object object) { String label = ((Equals) object).getName(); - return label == null || label.length() == 0 ? - getString("_UI_Equals_type") : //$NON-NLS-1$ + return label == null || label.length() == 0 ? getString("_UI_Equals_type") : //$NON-NLS-1$ getString("_UI_Equals_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ } @@ -174,12 +160,10 @@ public class EqualsItemProvider extends ItemProviderAdapter implements IEditingD * @generated */ @Override - public void notifyChanged(Notification notification) - { + public void notifyChanged(Notification notification) { updateChildren(notification); - switch (notification.getFeatureID(Equals.class)) - { + switch (notification.getFeatureID(Equals.class)) { case FiltersPackage.EQUALS__NAME: case FiltersPackage.EQUALS__OBJECT: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); @@ -197,8 +181,7 @@ public class EqualsItemProvider extends ItemProviderAdapter implements IEditingD * @generated */ @Override - protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) - { + protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); } @@ -210,8 +193,7 @@ public class EqualsItemProvider extends ItemProviderAdapter implements IEditingD * @generated */ @Override - public ResourceLocator getResourceLocator() - { + public ResourceLocator getResourceLocator() { return ((IChildCreationExtender) adapterFactory).getResourceLocator(); } diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/FilteredElementItemProvider.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/FilteredElementItemProvider.java new file mode 100644 index 00000000000..c7c2ddee5d1 --- /dev/null +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/FilteredElementItemProvider.java @@ -0,0 +1,189 @@ +/** + * Copyright (c) 2014 Christian W. Damus and others. + * + * 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: + * Christian W. Damus - Initial API and implementation + */ +package org.eclipse.papyrus.infra.filters.provider; + + +import java.util.Collection; +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.edit.provider.IChildCreationExtender; +import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; +import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.IItemPropertySource; +import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; +import org.eclipse.emf.edit.provider.ITreeItemContentProvider; +import org.eclipse.emf.edit.provider.ItemProviderAdapter; +import org.eclipse.emf.edit.provider.ViewerNotification; + +import org.eclipse.papyrus.infra.filters.FilteredElement; +import org.eclipse.papyrus.infra.filters.FiltersFactory; +import org.eclipse.papyrus.infra.filters.FiltersPackage; + +/** + * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.filters.FilteredElement} object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @since 1.4 + */ +public class FilteredElementItemProvider + extends ItemProviderAdapter + implements + IEditingDomainItemProvider, + IStructuredItemContentProvider, + ITreeItemContentProvider, + IItemLabelProvider, + IItemPropertySource { + /** + * This constructs an instance from a factory and a notifier. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public FilteredElementItemProvider(AdapterFactory adapterFactory) { + super(adapterFactory); + } + + /** + * This returns the property descriptors for the adapted class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { + if (itemPropertyDescriptors == null) { + super.getPropertyDescriptors(object); + + } + return itemPropertyDescriptors; + } + + /** + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) { + if (childrenFeatures == null) { + super.getChildrenFeatures(object); + childrenFeatures.add(FiltersPackage.Literals.FILTERED_ELEMENT__FILTER); + } + return childrenFeatures; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + protected EStructuralFeature getChildFeature(Object object, Object child) { + // Check the type of the specified child object and return the proper feature to use for + // adding (see {@link AddCommand}) it as a child. + + return super.getChildFeature(object, child); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + protected boolean shouldComposeCreationImage() { + return true; + } + + /** + * This returns the label text for the adapted class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + public String getText(Object object) { + return getString("_UI_FilteredElement_type"); //$NON-NLS-1$ + } + + + /** + * This handles model notifications by calling {@link #updateChildren} to update any cached + * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + public void notifyChanged(Notification notification) { + updateChildren(notification); + + switch (notification.getFeatureID(FilteredElement.class)) { + case FiltersPackage.FILTERED_ELEMENT__FILTER: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; + } + super.notifyChanged(notification); + } + + /** + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children + * that can be created under this object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { + super.collectNewChildDescriptors(newChildDescriptors, object); + + newChildDescriptors.add(createChildParameter(FiltersPackage.Literals.FILTERED_ELEMENT__FILTER, + FiltersFactory.eINSTANCE.createCompoundFilter())); + + newChildDescriptors.add(createChildParameter(FiltersPackage.Literals.FILTERED_ELEMENT__FILTER, + FiltersFactory.eINSTANCE.createEquals())); + } + + /** + * Return the resource locator for this item provider's resources. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + public ResourceLocator getResourceLocator() { + return ((IChildCreationExtender) adapterFactory).getResourceLocator(); + } + +} diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/FiltersEditPlugin.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/FiltersEditPlugin.java index 19619082810..983c2f66777 100644 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/FiltersEditPlugin.java +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/FiltersEditPlugin.java @@ -50,9 +50,8 @@ public final class FiltersEditPlugin extends EMFPlugin { * @generated */ public FiltersEditPlugin() { - super(new ResourceLocator[] - { - }); + super(new ResourceLocator[] { + }); } /** diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/FiltersItemProviderAdapterFactory.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/FiltersItemProviderAdapterFactory.java index 937b66356d1..de547ea9ee5 100644 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/FiltersItemProviderAdapterFactory.java +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/FiltersItemProviderAdapterFactory.java @@ -84,7 +84,7 @@ public class FiltersItemProviderAdapterFactory extends FiltersAdapterFactory imp * * @generated */ - protected Collection<Object> supportedTypes = new ArrayList<Object>(); + protected Collection<Object> supportedTypes = new ArrayList<>(); /** * This constructs an instance. @@ -118,10 +118,8 @@ public class FiltersItemProviderAdapterFactory extends FiltersAdapterFactory imp * @generated */ @Override - public Adapter createCompoundFilterAdapter() - { - if (compoundFilterItemProvider == null) - { + public Adapter createCompoundFilterAdapter() { + if (compoundFilterItemProvider == null) { compoundFilterItemProvider = new CompoundFilterItemProvider(this); } @@ -145,10 +143,8 @@ public class FiltersItemProviderAdapterFactory extends FiltersAdapterFactory imp * @generated */ @Override - public Adapter createEqualsAdapter() - { - if (equalsItemProvider == null) - { + public Adapter createEqualsAdapter() { + if (equalsItemProvider == null) { equalsItemProvider = new EqualsItemProvider(this); } @@ -156,6 +152,32 @@ public class FiltersItemProviderAdapterFactory extends FiltersAdapterFactory imp } /** + * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.filters.FilteredElement} instances. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @since 1.4 + */ + protected FilteredElementItemProvider filteredElementItemProvider; + + /** + * This creates an adapter for a {@link org.eclipse.papyrus.infra.filters.FilteredElement}. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + public Adapter createFilteredElementAdapter() { + if (filteredElementItemProvider == null) { + filteredElementItemProvider = new FilteredElementItemProvider(this); + } + + return filteredElementItemProvider; + } + + /** * This returns the root adapter factory that contains this factory. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -210,11 +232,9 @@ public class FiltersItemProviderAdapterFactory extends FiltersAdapterFactory imp */ @Override public Object adapt(Object object, Object type) { - if (isFactoryForType(type)) - { + if (isFactoryForType(type)) { Object adapter = super.adapt(object, type); - if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) - { + if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) { return adapter; } } @@ -228,8 +248,7 @@ public class FiltersItemProviderAdapterFactory extends FiltersAdapterFactory imp * * @generated */ - public List<IChildCreationExtender> getChildCreationExtenders() - { + public List<IChildCreationExtender> getChildCreationExtenders() { return childCreationExtenderManager.getChildCreationExtenders(); } @@ -240,8 +259,7 @@ public class FiltersItemProviderAdapterFactory extends FiltersAdapterFactory imp * @generated */ @Override - public Collection<?> getNewChildDescriptors(Object object, EditingDomain editingDomain) - { + public Collection<?> getNewChildDescriptors(Object object, EditingDomain editingDomain) { return childCreationExtenderManager.getNewChildDescriptors(object, editingDomain); } @@ -252,8 +270,7 @@ public class FiltersItemProviderAdapterFactory extends FiltersAdapterFactory imp * @generated */ @Override - public ResourceLocator getResourceLocator() - { + public ResourceLocator getResourceLocator() { return childCreationExtenderManager; } @@ -292,8 +309,7 @@ public class FiltersItemProviderAdapterFactory extends FiltersAdapterFactory imp public void fireNotifyChanged(Notification notification) { changeNotifier.fireNotifyChanged(notification); - if (parentAdapterFactory != null) - { + if (parentAdapterFactory != null) { parentAdapterFactory.fireNotifyChanged(notification); } } @@ -313,6 +329,9 @@ public class FiltersItemProviderAdapterFactory extends FiltersAdapterFactory imp if (equalsItemProvider != null) { equalsItemProvider.dispose(); } + if (filteredElementItemProvider != null) { + filteredElementItemProvider.dispose(); + } } } diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/.settings/.api_filters b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/.settings/.api_filters new file mode 100644 index 00000000000..ae1959fe35b --- /dev/null +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/.settings/.api_filters @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.filters" version="2"> + <resource path="src-gen/org/eclipse/papyrus/infra/filters/FiltersFactory.java" type="org.eclipse.papyrus.infra.filters.FiltersFactory"> + <filter comment="Generated code" id="403804204"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.filters.FiltersFactory"/> + <message_argument value="createFilteredElement()"/> + </message_arguments> + </filter> + </resource> + <resource path="src-gen/org/eclipse/papyrus/infra/filters/FiltersPackage.java" type="org.eclipse.papyrus.infra.filters.FiltersPackage"> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.filters.FiltersPackage"/> + <message_argument value="OBJECT"/> + <message_argument value="4"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.filters.FiltersPackage"/> + <message_argument value="OPERATOR_KIND"/> + <message_argument value="3"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="403804204"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.filters.FiltersPackage"/> + <message_argument value="getFilteredElement()"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="403804204"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.filters.FiltersPackage"/> + <message_argument value="getFilteredElement_Filter()"/> + </message_arguments> + </filter> + </resource> +</component> diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/META-INF/MANIFEST.MF b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/META-INF/MANIFEST.MF index a298a1ab49f..80b311780f5 100644 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/META-INF/MANIFEST.MF +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/META-INF/MANIFEST.MF @@ -1,5 +1,6 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.11.0,3.0.0)";visibility:=reexport, +Require-Bundle: org.eclipse.core.runtime, + org.eclipse.emf.ecore;bundle-version="[2.11.0,3.0.0)";visibility:=reexport, org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, org.eclipse.uml2.common;bundle-version="[2.1.0,3.0.0)";visibility:=reexport, org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)" @@ -11,7 +12,7 @@ Export-Package: org.eclipse.papyrus.infra.filters, Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: . -Bundle-Version: 1.2.0.qualifier +Bundle-Version: 1.3.0.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.filters.internal.FiltersPlugin$Implementation diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/model/FilteredElement.xmi b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/model/FilteredElement.xmi new file mode 100644 index 00000000000..aa050d4251f --- /dev/null +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/model/FilteredElement.xmi @@ -0,0 +1,3 @@ +<?xml version="1.0" encoding="UTF-8"?> +<filters:FilteredElement xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:filters="http://www.eclipse.org/Papyrus/2014/common/filters" xsi:schemaLocation="http://www.eclipse.org/Papyrus/2014/common/filters filters.ecore"/> diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/model/filters.ecore b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/model/filters.ecore index 5607ca0f7a9..ba13dac3e01 100644 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/model/filters.ecore +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/model/filters.ecore @@ -48,4 +48,8 @@ <eStructuralFeatures xsi:type="ecore:EAttribute" name="object" ordered="false" lowerBound="1" eType="#//Object"/> </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="FilteredElement"> + <eStructuralFeatures xsi:type="ecore:EReference" name="filter" ordered="false" + eType="#//Filter" containment="true"/> + </eClassifiers> </ecore:EPackage> diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/model/filters.genmodel b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/model/filters.genmodel index 611f5ea8d41..14189bed5a3 100644 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/model/filters.genmodel +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/model/filters.genmodel @@ -67,5 +67,9 @@ <genClasses xsi:type="genmodel:GenClass" ecoreClass="filters.ecore#//Equals"> <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute filters.ecore#//Equals/object"/> </genClasses> + <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="filters.ecore#//FilteredElement"> + <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true" + createChild="true" ecoreFeature="ecore:EReference filters.ecore#//FilteredElement/filter"/> + </genClasses> </genPackages> </genmodel:GenModel> diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/model/filters.notation b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/model/filters.notation index 46dad1f49b7..f16e6a6717d 100644 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/model/filters.notation +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/model/filters.notation @@ -1,34 +1,30 @@ <?xml version="1.0" encoding="UTF-8"?> -<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"> +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"> <notation:Diagram xmi:id="_u1eJYG86EeSumdlFUM6GVw" type="PapyrusUMLClassDiagram" name="classes" measurementUnit="Pixel"> - <children xmi:type="notation:Shape" xmi:id="_lJJGoG89EeSumdlFUM6GVw" type="2009"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mcj2UG89EeSumdlFUM6GVw" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mcj2UW89EeSumdlFUM6GVw" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mckdYG89EeSumdlFUM6GVw" key="StereotypeList" value="Ecore::EDataType"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mckdYW89EeSumdlFUM6GVw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mckdYm89EeSumdlFUM6GVw" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mckdY289EeSumdlFUM6GVw" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_lJJtsG89EeSumdlFUM6GVw" type="5032"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_lJJtsW89EeSumdlFUM6GVw" type="7039"> + <children xmi:type="notation:Shape" xmi:id="_lJJGoG89EeSumdlFUM6GVw" type="PrimitiveType_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_lJJtsG89EeSumdlFUM6GVw" type="PrimitiveType_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_lJJtsW89EeSumdlFUM6GVw" type="PrimitiveType_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_lJJtsm89EeSumdlFUM6GVw"/> <styles xmi:type="notation:SortingStyle" xmi:id="_lJJts289EeSumdlFUM6GVw"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_lJJttG89EeSumdlFUM6GVw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lJJttW89EeSumdlFUM6GVw"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_lJJttm89EeSumdlFUM6GVw" type="7040"> + <children xmi:type="notation:BasicCompartment" xmi:id="_lJJttm89EeSumdlFUM6GVw" type="PrimitiveType_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_lJJtt289EeSumdlFUM6GVw"/> <styles xmi:type="notation:SortingStyle" xmi:id="_lJJtuG89EeSumdlFUM6GVw"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_lJJtuW89EeSumdlFUM6GVw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lJJtum89EeSumdlFUM6GVw"/> </children> + <children xmi:type="notation:DecorationNode" xmi:id="_ko_U4IytEeeCnq5i7PgOZA" type="PrimitiveType_FloatingNameLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_ko_U4YytEeeCnq5i7PgOZA" y="5"/> + </children> <element xmi:type="uml:PrimitiveType" href="filters.uml#_lJH4gG89EeSumdlFUM6GVw"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lJJGoW89EeSumdlFUM6GVw" x="616" y="45"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lJJGoW89EeSumdlFUM6GVw" x="840" y="40"/> </children> - <children xmi:type="notation:Shape" xmi:id="_JBY8UG8-EeSumdlFUM6GVw" type="2008"> - <children xmi:type="notation:DecorationNode" xmi:id="_JBY8Um8-EeSumdlFUM6GVw" type="5029"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_JBZjYG8-EeSumdlFUM6GVw" type="7017"> - <children xmi:type="notation:Shape" xmi:id="_q8yDwG8-EeSumdlFUM6GVw" type="3012"> + <children xmi:type="notation:Shape" xmi:id="_JBY8UG8-EeSumdlFUM6GVw" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_JBY8Um8-EeSumdlFUM6GVw" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_JBZjYG8-EeSumdlFUM6GVw" type="Class_AttributeCompartment"> + <children xmi:type="notation:Shape" xmi:id="_q8yDwG8-EeSumdlFUM6GVw" type="Property_ClassAttributeLabel"> <element xmi:type="uml:Property" href="filters.uml#_q8wOkG8-EeSumdlFUM6GVw"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_q8yDwW8-EeSumdlFUM6GVw"/> </children> @@ -37,37 +33,40 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_JBZjY28-EeSumdlFUM6GVw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JBZjZG8-EeSumdlFUM6GVw"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_JBZjZW8-EeSumdlFUM6GVw" type="7018"> + <children xmi:type="notation:BasicCompartment" xmi:id="_JBZjZW8-EeSumdlFUM6GVw" type="Class_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_JBZjZm8-EeSumdlFUM6GVw"/> <styles xmi:type="notation:SortingStyle" xmi:id="_JBZjZ28-EeSumdlFUM6GVw"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_JBZjaG8-EeSumdlFUM6GVw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JBZjaW8-EeSumdlFUM6GVw"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_JBZjam8-EeSumdlFUM6GVw" type="7019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_JBZjam8-EeSumdlFUM6GVw" type="Class_NestedClassifierCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_JBZja28-EeSumdlFUM6GVw"/> <styles xmi:type="notation:SortingStyle" xmi:id="_JBZjbG8-EeSumdlFUM6GVw"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_JBZjbW8-EeSumdlFUM6GVw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JBZjbm8-EeSumdlFUM6GVw"/> </children> + <children xmi:type="notation:DecorationNode" xmi:id="_ko_U4oytEeeCnq5i7PgOZA" type="Class_FloatingNameLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_ko_U44ytEeeCnq5i7PgOZA" y="5"/> + </children> <element xmi:type="uml:Class" href="filters.uml#_JBXuMG8-EeSumdlFUM6GVw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JBY8UW8-EeSumdlFUM6GVw" x="163" y="244"/> </children> - <children xmi:type="notation:Shape" xmi:id="_Lp3acG8-EeSumdlFUM6GVw" type="2006"> - <children xmi:type="notation:DecorationNode" xmi:id="_Lp4BgG8-EeSumdlFUM6GVw" type="5023"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_Lp4BgW8-EeSumdlFUM6GVw" type="7015"> - <children xmi:type="notation:Shape" xmi:id="_N107sG8-EeSumdlFUM6GVw" type="3017"> + <children xmi:type="notation:Shape" xmi:id="_Lp3acG8-EeSumdlFUM6GVw" type="Enumeration_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_Lp4BgG8-EeSumdlFUM6GVw" type="Enumeration_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_Lp4BgW8-EeSumdlFUM6GVw" type="Enumeration_LiteralCompartment"> + <children xmi:type="notation:Shape" xmi:id="_N107sG8-EeSumdlFUM6GVw" type="EnumerationLiteral_LiteralLabel"> <element xmi:type="uml:EnumerationLiteral" href="filters.uml#_N1rKsG8-EeSumdlFUM6GVw"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_N107sW8-EeSumdlFUM6GVw"/> </children> - <children xmi:type="notation:Shape" xmi:id="_O1TbsG8-EeSumdlFUM6GVw" type="3017"> + <children xmi:type="notation:Shape" xmi:id="_O1TbsG8-EeSumdlFUM6GVw" type="EnumerationLiteral_LiteralLabel"> <element xmi:type="uml:EnumerationLiteral" href="filters.uml#_O1SNkG8-EeSumdlFUM6GVw"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_O1TbsW8-EeSumdlFUM6GVw"/> </children> - <children xmi:type="notation:Shape" xmi:id="_Po0jUG8-EeSumdlFUM6GVw" type="3017"> + <children xmi:type="notation:Shape" xmi:id="_Po0jUG8-EeSumdlFUM6GVw" type="EnumerationLiteral_LiteralLabel"> <element xmi:type="uml:EnumerationLiteral" href="filters.uml#_PozVMG8-EeSumdlFUM6GVw"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_Po0jUW8-EeSumdlFUM6GVw"/> </children> - <children xmi:type="notation:Shape" xmi:id="_X5O6UG8-EeSumdlFUM6GVw" type="3017"> + <children xmi:type="notation:Shape" xmi:id="_X5O6UG8-EeSumdlFUM6GVw" type="EnumerationLiteral_LiteralLabel"> <element xmi:type="uml:EnumerationLiteral" href="filters.uml#_X5NsMG8-EeSumdlFUM6GVw"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_X5O6UW8-EeSumdlFUM6GVw"/> </children> @@ -76,13 +75,16 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_Lp4BhG8-EeSumdlFUM6GVw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Lp4BhW8-EeSumdlFUM6GVw"/> </children> + <children xmi:type="notation:DecorationNode" xmi:id="_ko_U5IytEeeCnq5i7PgOZA" type="Enumeration_FloatingNameLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_ko_U5YytEeeCnq5i7PgOZA" y="5"/> + </children> <element xmi:type="uml:Enumeration" href="filters.uml#_Lp2MUG8-EeSumdlFUM6GVw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Lp3acW8-EeSumdlFUM6GVw" x="28" y="243"/> </children> - <children xmi:type="notation:Shape" xmi:id="_XO9ycHBIEeSbg_BqWNBy6A" type="2008"> - <children xmi:type="notation:DecorationNode" xmi:id="_XO-ZgHBIEeSbg_BqWNBy6A" type="5029"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_XO-ZgXBIEeSbg_BqWNBy6A" type="7017"> - <children xmi:type="notation:Shape" xmi:id="_zAtbEHBIEeSbg_BqWNBy6A" type="3012"> + <children xmi:type="notation:Shape" xmi:id="_XO9ycHBIEeSbg_BqWNBy6A" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_XO-ZgHBIEeSbg_BqWNBy6A" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_XO-ZgXBIEeSbg_BqWNBy6A" type="Class_AttributeCompartment"> + <children xmi:type="notation:Shape" xmi:id="_zAtbEHBIEeSbg_BqWNBy6A" type="Property_ClassAttributeLabel"> <element xmi:type="uml:Property" href="filters.uml#_zAsM8HBIEeSbg_BqWNBy6A"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_zAtbEXBIEeSbg_BqWNBy6A"/> </children> @@ -91,25 +93,28 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_XO-ZhHBIEeSbg_BqWNBy6A"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XO-ZhXBIEeSbg_BqWNBy6A"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_XO-ZhnBIEeSbg_BqWNBy6A" type="7018"> + <children xmi:type="notation:BasicCompartment" xmi:id="_XO-ZhnBIEeSbg_BqWNBy6A" type="Class_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_XO-Zh3BIEeSbg_BqWNBy6A"/> <styles xmi:type="notation:SortingStyle" xmi:id="_XO-ZiHBIEeSbg_BqWNBy6A"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_XO-ZiXBIEeSbg_BqWNBy6A"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XO-ZinBIEeSbg_BqWNBy6A"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_XO-Zi3BIEeSbg_BqWNBy6A" type="7019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_XO-Zi3BIEeSbg_BqWNBy6A" type="Class_NestedClassifierCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_XO-ZjHBIEeSbg_BqWNBy6A"/> <styles xmi:type="notation:SortingStyle" xmi:id="_XO-ZjXBIEeSbg_BqWNBy6A"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_XO-ZjnBIEeSbg_BqWNBy6A"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XO-Zj3BIEeSbg_BqWNBy6A"/> </children> + <children xmi:type="notation:DecorationNode" xmi:id="_ko_U5oytEeeCnq5i7PgOZA" type="Class_FloatingNameLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_ko_U54ytEeeCnq5i7PgOZA" y="5"/> + </children> <element xmi:type="uml:Class" href="filters.uml#_XOtTwHBIEeSbg_BqWNBy6A"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XO9ycXBIEeSbg_BqWNBy6A" x="375" y="244"/> </children> - <children xmi:type="notation:Shape" xmi:id="_fvId4HBiEeSbg_BqWNBy6A" type="2004"> - <children xmi:type="notation:DecorationNode" xmi:id="_fvK6IHBiEeSbg_BqWNBy6A" type="5011"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_fvK6IXBiEeSbg_BqWNBy6A" type="7006"> - <children xmi:type="notation:Shape" xmi:id="_jjSsAHBiEeSbg_BqWNBy6A" type="3006"> + <children xmi:type="notation:Shape" xmi:id="_fvId4HBiEeSbg_BqWNBy6A" type="Interface_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_fvK6IHBiEeSbg_BqWNBy6A" type="Interface_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_fvK6IXBiEeSbg_BqWNBy6A" type="Interface_AttributeCompartment"> + <children xmi:type="notation:Shape" xmi:id="_jjSsAHBiEeSbg_BqWNBy6A" type="Property_InterfaceAttributeLabel"> <element xmi:type="uml:Property" href="filters.uml#_jBYu8G9IEeSumdlFUM6GVw"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_jjSsAXBiEeSbg_BqWNBy6A"/> </children> @@ -118,8 +123,8 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_fvK6JHBiEeSbg_BqWNBy6A"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fvK6JXBiEeSbg_BqWNBy6A"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_fvK6JnBiEeSbg_BqWNBy6A" type="7007"> - <children xmi:type="notation:Shape" xmi:id="_jjSsAnBiEeSbg_BqWNBy6A" type="3007"> + <children xmi:type="notation:BasicCompartment" xmi:id="_fvK6JnBiEeSbg_BqWNBy6A" type="Interface_OperationCompartment"> + <children xmi:type="notation:Shape" xmi:id="_jjSsAnBiEeSbg_BqWNBy6A" type="Operation_InterfaceOperationLabel"> <element xmi:type="uml:Operation" href="filters.uml#_61IZUG86EeSumdlFUM6GVw"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_jjSsA3BiEeSbg_BqWNBy6A"/> </children> @@ -128,44 +133,81 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_fvK6KXBiEeSbg_BqWNBy6A"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fvK6KnBiEeSbg_BqWNBy6A"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_fvLhMHBiEeSbg_BqWNBy6A" type="7008"> + <children xmi:type="notation:BasicCompartment" xmi:id="_fvLhMHBiEeSbg_BqWNBy6A" type="Interface_NestedClassifierCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_fvLhMXBiEeSbg_BqWNBy6A"/> <styles xmi:type="notation:SortingStyle" xmi:id="_fvLhMnBiEeSbg_BqWNBy6A"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_fvLhM3BiEeSbg_BqWNBy6A"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fvLhNHBiEeSbg_BqWNBy6A"/> </children> + <children xmi:type="notation:DecorationNode" xmi:id="_ko_U6IytEeeCnq5i7PgOZA" type="Interface_FloatingNameLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_ko_U6YytEeeCnq5i7PgOZA" y="5"/> + </children> <element xmi:type="uml:Interface" href="filters.uml#_ftlkkHBIEeSbg_BqWNBy6A"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fvId4XBiEeSbg_BqWNBy6A" x="252" y="46"/> </children> - <children xmi:type="notation:Shape" xmi:id="_owbBUHDoEeSd2uG9uLSAYg" type="2011"> - <children xmi:type="notation:DecorationNode" xmi:id="_owboYXDoEeSd2uG9uLSAYg" type="5037"/> - <children xmi:type="notation:DecorationNode" xmi:id="_owboYnDoEeSd2uG9uLSAYg" type="5159"/> + <children xmi:type="notation:Shape" xmi:id="_owbBUHDoEeSd2uG9uLSAYg" type="Constraint_PackagedElementShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_owboYXDoEeSd2uG9uLSAYg" type="Constraint_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_owboYnDoEeSd2uG9uLSAYg" type="Constraint_BodyLabel"/> <element xmi:type="uml:Constraint" href="filters.uml#_owJUgHDoEeSd2uG9uLSAYg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_owboYHDoEeSd2uG9uLSAYg" x="275" y="431"/> </children> - <styles xmi:type="notation:StringValueStyle" xmi:id="_u1eJYW86EeSumdlFUM6GVw" name="diagram_compatibility_version" stringValue="1.0.0"/> + <children xmi:type="notation:Shape" xmi:id="_kpDmUIytEeeCnq5i7PgOZA" type="StereotypeComment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kpDmUYytEeeCnq5i7PgOZA"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_kpDmU4ytEeeCnq5i7PgOZA" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:PrimitiveType" href="filters.uml#_lJH4gG89EeSumdlFUM6GVw"/> + </styles> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kpDmUoytEeeCnq5i7PgOZA" x="200" y="100"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_xqqJgIyvEeesNNBCp0L8sw" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_xqrXoIyvEeesNNBCp0L8sw" type="Class_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_xqrXoYyvEeesNNBCp0L8sw" type="Class_FloatingNameLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_xqrXooyvEeesNNBCp0L8sw" y="15"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_xqrXo4yvEeesNNBCp0L8sw" type="Class_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_xqrXpIyvEeesNNBCp0L8sw"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_xqrXpYyvEeesNNBCp0L8sw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_xqrXpoyvEeesNNBCp0L8sw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xqrXp4yvEeesNNBCp0L8sw"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_xqr-sIyvEeesNNBCp0L8sw" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_xqr-sYyvEeesNNBCp0L8sw"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_xqr-soyvEeesNNBCp0L8sw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_xqr-s4yvEeesNNBCp0L8sw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xqr-tIyvEeesNNBCp0L8sw"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_xqr-tYyvEeesNNBCp0L8sw" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_xqr-toyvEeesNNBCp0L8sw"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_xqr-t4yvEeesNNBCp0L8sw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_xqr-uIyvEeesNNBCp0L8sw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xqr-uYyvEeesNNBCp0L8sw"/> + </children> + <element xmi:type="uml:Class" href="filters.uml#_xqfKYIyvEeesNNBCp0L8sw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xqqJgYyvEeesNNBCp0L8sw" x="640" y="46"/> + </children> + <styles xmi:type="notation:StringValueStyle" xmi:id="_u1eJYW86EeSumdlFUM6GVw" name="diagram_compatibility_version" stringValue="1.3.0"/> <styles xmi:type="notation:DiagramStyle" xmi:id="_u1eJYm86EeSumdlFUM6GVw"/> - <styles xmi:type="style:PapyrusViewStyle" xmi:id="_u1eJY286EeSumdlFUM6GVw"> + <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_ko-t0IytEeeCnq5i7PgOZA" diagramKindId="org.eclipse.papyrus.uml.diagram.class"> <owner xmi:type="uml:Model" href="filters.uml#_u1APUG86EeSumdlFUM6GVw"/> </styles> <element xmi:type="uml:Model" href="filters.uml#_u1APUG86EeSumdlFUM6GVw"/> - <edges xmi:type="notation:Connector" xmi:id="_aNwhsG8-EeSumdlFUM6GVw" type="4001" source="_JBY8UG8-EeSumdlFUM6GVw" target="_fvId4HBiEeSbg_BqWNBy6A" routing="Rectilinear"> - <children xmi:type="notation:DecorationNode" xmi:id="_aNxIwG8-EeSumdlFUM6GVw" type="6001"> + <edges xmi:type="notation:Connector" xmi:id="_aNwhsG8-EeSumdlFUM6GVw" type="Association_Edge" source="_JBY8UG8-EeSumdlFUM6GVw" target="_fvId4HBiEeSbg_BqWNBy6A" routing="Rectilinear"> + <children xmi:type="notation:DecorationNode" xmi:id="_aNxIwG8-EeSumdlFUM6GVw" type="Association_StereotypeLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_aNxIwW8-EeSumdlFUM6GVw" y="-20"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_aNxIwm8-EeSumdlFUM6GVw" type="6002"> + <children xmi:type="notation:DecorationNode" xmi:id="_aNxIwm8-EeSumdlFUM6GVw" type="Association_NameLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_aNxIw28-EeSumdlFUM6GVw" y="20"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_aNxv0G8-EeSumdlFUM6GVw" type="6003"> + <children xmi:type="notation:DecorationNode" xmi:id="_aNxv0G8-EeSumdlFUM6GVw" type="Association_TargetRoleLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_aNxv0W8-EeSumdlFUM6GVw" x="-1" y="-49"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_aNxv0m8-EeSumdlFUM6GVw" type="6005"> + <children xmi:type="notation:DecorationNode" xmi:id="_aNxv0m8-EeSumdlFUM6GVw" type="Association_SourceRoleLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_aNxv028-EeSumdlFUM6GVw" y="20"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_aNxv1G8-EeSumdlFUM6GVw" type="6033"> + <children xmi:type="notation:DecorationNode" xmi:id="_aNxv1G8-EeSumdlFUM6GVw" type="Association_SourceMultiplicityLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_aNxv1W8-EeSumdlFUM6GVw" x="13" y="-17"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_aNyW4G8-EeSumdlFUM6GVw" type="6034"> + <children xmi:type="notation:DecorationNode" xmi:id="_aNyW4G8-EeSumdlFUM6GVw" type="Association_TargetMultiplicityLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_aNyW4W8-EeSumdlFUM6GVw" y="-20"/> </children> <styles xmi:type="notation:FontStyle" xmi:id="_aNwhsW8-EeSumdlFUM6GVw"/> @@ -174,23 +216,23 @@ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aO04sG8-EeSumdlFUM6GVw" id="(0.08227848101265822,0.0)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vJps0G8-EeSumdlFUM6GVw" id="(0.0,0.18421052631578946)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_bUeeAHBCEeSbg_BqWNBy6A" type="4001" source="_JBY8UG8-EeSumdlFUM6GVw" target="_fvId4HBiEeSbg_BqWNBy6A" routing="Rectilinear"> - <children xmi:type="notation:DecorationNode" xmi:id="_bUgTMHBCEeSbg_BqWNBy6A" type="6001"> + <edges xmi:type="notation:Connector" xmi:id="_bUeeAHBCEeSbg_BqWNBy6A" type="Association_Edge" source="_JBY8UG8-EeSumdlFUM6GVw" target="_fvId4HBiEeSbg_BqWNBy6A" routing="Rectilinear"> + <children xmi:type="notation:DecorationNode" xmi:id="_bUgTMHBCEeSbg_BqWNBy6A" type="Association_StereotypeLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_bUgTMXBCEeSbg_BqWNBy6A" y="-20"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_bUg6QHBCEeSbg_BqWNBy6A" type="6002"> + <children xmi:type="notation:DecorationNode" xmi:id="_bUg6QHBCEeSbg_BqWNBy6A" type="Association_NameLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_bUg6QXBCEeSbg_BqWNBy6A" y="20"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_bUg6QnBCEeSbg_BqWNBy6A" type="6003"> + <children xmi:type="notation:DecorationNode" xmi:id="_bUg6QnBCEeSbg_BqWNBy6A" type="Association_TargetRoleLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_bUg6Q3BCEeSbg_BqWNBy6A" x="13" y="31"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_bUhhUHBCEeSbg_BqWNBy6A" type="6005"> + <children xmi:type="notation:DecorationNode" xmi:id="_bUhhUHBCEeSbg_BqWNBy6A" type="Association_SourceRoleLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_bUhhUXBCEeSbg_BqWNBy6A" y="20"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_bUhhUnBCEeSbg_BqWNBy6A" type="6033"> + <children xmi:type="notation:DecorationNode" xmi:id="_bUhhUnBCEeSbg_BqWNBy6A" type="Association_SourceMultiplicityLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_bUhhU3BCEeSbg_BqWNBy6A" x="-2" y="14"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_bUhhVHBCEeSbg_BqWNBy6A" type="6034"> + <children xmi:type="notation:DecorationNode" xmi:id="_bUhhVHBCEeSbg_BqWNBy6A" type="Association_TargetMultiplicityLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_bUhhVXBCEeSbg_BqWNBy6A" y="-20"/> </children> <styles xmi:type="notation:FontStyle" xmi:id="_bUeeAXBCEeSbg_BqWNBy6A"/> @@ -199,8 +241,8 @@ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bUynEHBCEeSbg_BqWNBy6A" id="(0.2088607594936709,0.0)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bUzOIHBCEeSbg_BqWNBy6A" id="(0.0,0.7456140350877193)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_ssiHQHBIEeSbg_BqWNBy6A" type="4002" source="_JBY8UG8-EeSumdlFUM6GVw" target="_fvId4HBiEeSbg_BqWNBy6A"> - <children xmi:type="notation:DecorationNode" xmi:id="_ssiHQ3BIEeSbg_BqWNBy6A" type="6007"> + <edges xmi:type="notation:Connector" xmi:id="_ssiHQHBIEeSbg_BqWNBy6A" type="Generalization_Edge" source="_JBY8UG8-EeSumdlFUM6GVw" target="_fvId4HBiEeSbg_BqWNBy6A"> + <children xmi:type="notation:DecorationNode" xmi:id="_ssiHQ3BIEeSbg_BqWNBy6A" type="Generalization_StereotypeLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_ssiHRHBIEeSbg_BqWNBy6A" y="40"/> </children> <styles xmi:type="notation:FontStyle" xmi:id="_ssiHQXBIEeSbg_BqWNBy6A"/> @@ -209,8 +251,8 @@ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ssttcHBIEeSbg_BqWNBy6A" id="(0.689873417721519,0.08)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lc55AHBiEeSbg_BqWNBy6A" id="(0.285,1.0)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_tWPyoHBIEeSbg_BqWNBy6A" type="4002" source="_XO9ycHBIEeSbg_BqWNBy6A" target="_fvId4HBiEeSbg_BqWNBy6A"> - <children xmi:type="notation:DecorationNode" xmi:id="_tWQZsHBIEeSbg_BqWNBy6A" type="6007"> + <edges xmi:type="notation:Connector" xmi:id="_tWPyoHBIEeSbg_BqWNBy6A" type="Generalization_Edge" source="_XO9ycHBIEeSbg_BqWNBy6A" target="_fvId4HBiEeSbg_BqWNBy6A"> + <children xmi:type="notation:DecorationNode" xmi:id="_tWQZsHBIEeSbg_BqWNBy6A" type="Generalization_StereotypeLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_tWQZsXBIEeSbg_BqWNBy6A" y="40"/> </children> <styles xmi:type="notation:FontStyle" xmi:id="_tWPyoXBIEeSbg_BqWNBy6A"/> @@ -219,8 +261,8 @@ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tWUrIHBIEeSbg_BqWNBy6A" id="(0.3220338983050847,0.0)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_noF-MHBiEeSbg_BqWNBy6A" id="(0.63,1.0)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_pDKXIHDoEeSd2uG9uLSAYg" type="8500" source="_owbBUHDoEeSd2uG9uLSAYg" target="_JBY8UG8-EeSumdlFUM6GVw"> - <children xmi:type="notation:DecorationNode" xmi:id="_pDKXI3DoEeSd2uG9uLSAYg" type="8501"> + <edges xmi:type="notation:Connector" xmi:id="_pDKXIHDoEeSd2uG9uLSAYg" type="Constraint_ContextEdge" source="_owbBUHDoEeSd2uG9uLSAYg" target="_JBY8UG8-EeSumdlFUM6GVw"> + <children xmi:type="notation:DecorationNode" xmi:id="_pDKXI3DoEeSd2uG9uLSAYg" type="Constraint_KeywordLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_pDKXJHDoEeSd2uG9uLSAYg" y="15"/> </children> <styles xmi:type="notation:FontStyle" xmi:id="_pDKXIXDoEeSd2uG9uLSAYg"/> @@ -229,6 +271,41 @@ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pDUvMHDoEeSd2uG9uLSAYg" id="(0.0,0.0)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pdKykHDoEeSd2uG9uLSAYg" id="(0.5759493670886076,1.0)"/> </edges> + <edges xmi:type="notation:Connector" xmi:id="_kpENYIytEeeCnq5i7PgOZA" type="StereotypeCommentLink" source="_lJJGoG89EeSumdlFUM6GVw" target="_kpDmUIytEeeCnq5i7PgOZA"> + <styles xmi:type="notation:FontStyle" xmi:id="_kpE0cIytEeeCnq5i7PgOZA"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_kpE0dIytEeeCnq5i7PgOZA" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:PrimitiveType" href="filters.uml#_lJH4gG89EeSumdlFUM6GVw"/> + </styles> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kpE0cYytEeeCnq5i7PgOZA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kpE0coytEeeCnq5i7PgOZA"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kpE0c4ytEeeCnq5i7PgOZA"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_zL1oYIyvEeesNNBCp0L8sw" type="Association_Edge" source="_xqqJgIyvEeesNNBCp0L8sw" target="_fvId4HBiEeSbg_BqWNBy6A"> + <children xmi:type="notation:DecorationNode" xmi:id="_zL2PcIyvEeesNNBCp0L8sw" type="Association_StereotypeLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_zL2PcYyvEeesNNBCp0L8sw" y="-20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_zL2PcoyvEeesNNBCp0L8sw" type="Association_NameLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_zL2Pc4yvEeesNNBCp0L8sw" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_zL2PdIyvEeesNNBCp0L8sw" type="Association_TargetRoleLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_zL2PdYyvEeesNNBCp0L8sw" y="-20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_zL2PdoyvEeesNNBCp0L8sw" type="Association_SourceRoleLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_zL2Pd4yvEeesNNBCp0L8sw" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_zL2PeIyvEeesNNBCp0L8sw" type="Association_SourceMultiplicityLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_zL22gIyvEeesNNBCp0L8sw" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_zL22gYyvEeesNNBCp0L8sw" type="Association_TargetMultiplicityLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_zL22goyvEeesNNBCp0L8sw" y="-20"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_zL1oYYyvEeesNNBCp0L8sw"/> + <element xmi:type="uml:Association" href="filters.uml#_zLOkYIyvEeesNNBCp0L8sw"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zL1oYoyvEeesNNBCp0L8sw"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zMnEcIyvEeesNNBCp0L8sw" id="(0.0,0.54)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zMnEcYyvEeesNNBCp0L8sw" id="(1.0,0.46153846153846156)"/> + </edges> </notation:Diagram> <css:ModelStyleSheets xmi:id="_Xbyl0G89EeSumdlFUM6GVw"/> </xmi:XMI> diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/model/filters.uml b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/model/filters.uml index c3430071b55..986960b2c35 100644 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/model/filters.uml +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/model/filters.uml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA"> <uml:Model xmi:id="_u1APUG86EeSumdlFUM6GVw" name="filters" URI="http://www.eclipse.org/Papyrus/2014/common/filters" viewpoint=""> - <packageImport xmi:id="_u1APUW86EeSumdlFUM6GVw"> + <packageImport xmi:type="uml:PackageImport" xmi:id="_u1APUW86EeSumdlFUM6GVw"> <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/> </packageImport> <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_lJH4gG89EeSumdlFUM6GVw" name="Object"/> <packagedElement xmi:type="uml:Class" xmi:id="_JBXuMG8-EeSumdlFUM6GVw" name="CompoundFilter"> - <ownedRule xmi:id="_owJUgHDoEeSd2uG9uLSAYg" name="acyclic"> + <ownedRule xmi:type="uml:Constraint" xmi:id="_owJUgHDoEeSd2uG9uLSAYg" name="acyclic"> <specification xmi:type="uml:OpaqueExpression" xmi:id="_8aKBAHDoEeSd2uG9uLSAYg"> <language>Natural language</language> <language>OCL</language> @@ -14,57 +14,69 @@ <body>self->closure(filter)->excludes(self)</body> </specification> </ownedRule> - <generalization xmi:id="_ssgSEHBIEeSbg_BqWNBy6A" general="_ftlkkHBIEeSbg_BqWNBy6A"/> - <ownedAttribute xmi:id="_bS9bEHBCEeSbg_BqWNBy6A" name="filter" type="_ftlkkHBIEeSbg_BqWNBy6A" aggregation="shared" association="_bTEv0HBCEeSbg_BqWNBy6A"> + <generalization xmi:type="uml:Generalization" xmi:id="_ssgSEHBIEeSbg_BqWNBy6A" general="_ftlkkHBIEeSbg_BqWNBy6A"/> + <ownedAttribute xmi:type="uml:Property" xmi:id="_bS9bEHBCEeSbg_BqWNBy6A" name="filter" type="_ftlkkHBIEeSbg_BqWNBy6A" aggregation="shared" association="_bTEv0HBCEeSbg_BqWNBy6A"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bS-CIHBCEeSbg_BqWNBy6A" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bS-CIXBCEeSbg_BqWNBy6A" value="*"/> </ownedAttribute> - <ownedAttribute xmi:id="_aNmJoG8-EeSumdlFUM6GVw" name="ownedFilter" type="_ftlkkHBIEeSbg_BqWNBy6A" aggregation="composite" subsettedProperty="_bS9bEHBCEeSbg_BqWNBy6A" association="_aNqbEG8-EeSumdlFUM6GVw"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_aNmJoG8-EeSumdlFUM6GVw" name="ownedFilter" type="_ftlkkHBIEeSbg_BqWNBy6A" aggregation="composite" subsettedProperty="_bS9bEHBCEeSbg_BqWNBy6A" association="_aNqbEG8-EeSumdlFUM6GVw"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_aNmJoW8-EeSumdlFUM6GVw"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_aNmJom8-EeSumdlFUM6GVw" value="*"/> </ownedAttribute> - <ownedAttribute xmi:id="_q8wOkG8-EeSumdlFUM6GVw" name="operator" type="_Lp2MUG8-EeSumdlFUM6GVw"/> + <ownedAttribute xmi:type="uml:Property" xmi:id="_q8wOkG8-EeSumdlFUM6GVw" name="operator" type="_Lp2MUG8-EeSumdlFUM6GVw"/> </packagedElement> <packagedElement xmi:type="uml:Enumeration" xmi:id="_Lp2MUG8-EeSumdlFUM6GVw" name="OperatorKind"> - <ownedLiteral xmi:id="_N1rKsG8-EeSumdlFUM6GVw" name="and"/> - <ownedLiteral xmi:id="_O1SNkG8-EeSumdlFUM6GVw" name="or"/> - <ownedLiteral xmi:id="_PozVMG8-EeSumdlFUM6GVw" name="xor"/> - <ownedLiteral xmi:id="_X5NsMG8-EeSumdlFUM6GVw" name="not"/> + <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_N1rKsG8-EeSumdlFUM6GVw" name="and"/> + <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_O1SNkG8-EeSumdlFUM6GVw" name="or"/> + <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_PozVMG8-EeSumdlFUM6GVw" name="xor"/> + <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_X5NsMG8-EeSumdlFUM6GVw" name="not"/> </packagedElement> <packagedElement xmi:type="uml:Association" xmi:id="_aNqbEG8-EeSumdlFUM6GVw" memberEnd="_aNqbEW8-EeSumdlFUM6GVw _aNmJoG8-EeSumdlFUM6GVw"> - <ownedEnd xmi:id="_aNqbEW8-EeSumdlFUM6GVw" name="owningComposite" type="_JBXuMG8-EeSumdlFUM6GVw" association="_aNqbEG8-EeSumdlFUM6GVw"> + <ownedEnd xmi:type="uml:Property" xmi:id="_aNqbEW8-EeSumdlFUM6GVw" name="owningComposite" type="_JBXuMG8-EeSumdlFUM6GVw" association="_aNqbEG8-EeSumdlFUM6GVw"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_aNqbEm8-EeSumdlFUM6GVw"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_aNqbE28-EeSumdlFUM6GVw" value="1"/> </ownedEnd> </packagedElement> <packagedElement xmi:type="uml:Association" xmi:id="_bTEv0HBCEeSbg_BqWNBy6A" memberEnd="_bTEv0XBCEeSbg_BqWNBy6A _bS9bEHBCEeSbg_BqWNBy6A"> - <ownedEnd xmi:id="_bTEv0XBCEeSbg_BqWNBy6A" name="composite" type="_JBXuMG8-EeSumdlFUM6GVw" association="_bTEv0HBCEeSbg_BqWNBy6A"> + <ownedEnd xmi:type="uml:Property" xmi:id="_bTEv0XBCEeSbg_BqWNBy6A" name="composite" type="_JBXuMG8-EeSumdlFUM6GVw" association="_bTEv0HBCEeSbg_BqWNBy6A"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bTEv0nBCEeSbg_BqWNBy6A"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bTEv03BCEeSbg_BqWNBy6A" value="*"/> </ownedEnd> </packagedElement> <packagedElement xmi:type="uml:Class" xmi:id="_XOtTwHBIEeSbg_BqWNBy6A" name="Equals"> - <generalization xmi:id="_tWOkgHBIEeSbg_BqWNBy6A" general="_ftlkkHBIEeSbg_BqWNBy6A"/> - <ownedAttribute xmi:id="_zAsM8HBIEeSbg_BqWNBy6A" name="object" type="_lJH4gG89EeSumdlFUM6GVw"/> + <generalization xmi:type="uml:Generalization" xmi:id="_tWOkgHBIEeSbg_BqWNBy6A" general="_ftlkkHBIEeSbg_BqWNBy6A"/> + <ownedAttribute xmi:type="uml:Property" xmi:id="_zAsM8HBIEeSbg_BqWNBy6A" name="object" type="_lJH4gG89EeSumdlFUM6GVw"/> </packagedElement> <packagedElement xmi:type="uml:Interface" xmi:id="_ftlkkHBIEeSbg_BqWNBy6A" name="Filter"> - <ownedAttribute xmi:id="_jBYu8G9IEeSumdlFUM6GVw" name="name"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_jBYu8G9IEeSumdlFUM6GVw" name="name"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lw_IwG9IEeSumdlFUM6GVw"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lw_v0G9IEeSumdlFUM6GVw" value="1"/> </ownedAttribute> - <ownedOperation xmi:id="_61IZUG86EeSumdlFUM6GVw" name="matches" isQuery="true"> - <ownedParameter xmi:id="_0lRdcG89EeSumdlFUM6GVw" name="input" type="_lJH4gG89EeSumdlFUM6GVw" effect="read"/> - <ownedParameter xmi:id="_4n3JIG89EeSumdlFUM6GVw" direction="return"> + <ownedOperation xmi:type="uml:Operation" xmi:id="_61IZUG86EeSumdlFUM6GVw" name="matches" isQuery="true"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_0lRdcG89EeSumdlFUM6GVw" name="input" type="_lJH4gG89EeSumdlFUM6GVw" effect="read"/> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_4n3JIG89EeSumdlFUM6GVw" direction="return"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/> </ownedParameter> </ownedOperation> </packagedElement> - <profileApplication xmi:id="_b_yVcG89EeSumdlFUM6GVw"> - <eAnnotations xmi:id="_cAQPgG89EeSumdlFUM6GVw" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <packagedElement xmi:type="uml:Class" xmi:id="_xqfKYIyvEeesNNBCp0L8sw" name="FilteredElement"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_zLRnsYyvEeesNNBCp0L8sw" name="filter" type="_ftlkkHBIEeSbg_BqWNBy6A" aggregation="composite" association="_zLOkYIyvEeesNNBCp0L8sw"> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_zLSOwIyvEeesNNBCp0L8sw"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zLS10IyvEeesNNBCp0L8sw" value="1"/> + </ownedAttribute> + </packagedElement> + <packagedElement xmi:type="uml:Association" xmi:id="_zLOkYIyvEeesNNBCp0L8sw" memberEnd="_zLRnsYyvEeesNNBCp0L8sw _zLUD8IyvEeesNNBCp0L8sw"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zLRAoIyvEeesNNBCp0L8sw" source="org.eclipse.papyrus"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zLRnsIyvEeesNNBCp0L8sw" key="nature" value="UML_Nature"/> + </eAnnotations> + <ownedEnd xmi:type="uml:Property" xmi:id="_zLUD8IyvEeesNNBCp0L8sw" name="filteredelement" type="_xqfKYIyvEeesNNBCp0L8sw" association="_zLOkYIyvEeesNNBCp0L8sw"/> + </packagedElement> + <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_b_yVcG89EeSumdlFUM6GVw"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cAQPgG89EeSumdlFUM6GVw" source="http://www.eclipse.org/uml2/2.0.0/UML"> <references xmi:type="ecore:EPackage" href="pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA"/> </eAnnotations> - <appliedProfile href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/> + <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/> </profileApplication> </uml:Model> <Ecore:EDataType xmi:id="_mcNRAG89EeSumdlFUM6GVw" instanceClassName="java.lang.Object" base_PrimitiveType="_lJH4gG89EeSumdlFUM6GVw"/> diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/pom.xml b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/pom.xml index d07ec2a09f2..b1dd49b5f54 100644 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/pom.xml +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/pom.xml @@ -8,6 +8,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.filters</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/CompoundFilter.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/CompoundFilter.java index 0767ad09db8..0c6cf6fb271 100644 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/CompoundFilter.java +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/CompoundFilter.java @@ -24,19 +24,18 @@ import org.eclipse.emf.ecore.EClass; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.papyrus.infra.filters.CompoundFilter#getFilters <em>Filter</em>}</li> * <li>{@link org.eclipse.papyrus.infra.filters.CompoundFilter#getOwnedFilters <em>Owned Filter</em>}</li> * <li>{@link org.eclipse.papyrus.infra.filters.CompoundFilter#getOperator <em>Operator</em>}</li> * </ul> - * </p> * * @see org.eclipse.papyrus.infra.filters.FiltersPackage#getCompoundFilter() * @model * @generated */ -public interface CompoundFilter extends Filter -{ +public interface CompoundFilter extends Filter { /** * Returns the value of the '<em><b>Filter</b></em>' reference list. * The list contents are of type {@link org.eclipse.papyrus.infra.filters.Filter}. @@ -88,10 +87,10 @@ public interface CompoundFilter extends Filter * The list contents are of type {@link org.eclipse.papyrus.infra.filters.Filter}. * <p> * This feature subsets the following features: + * </p> * <ul> * <li>'{@link org.eclipse.papyrus.infra.filters.CompoundFilter#getFilters() <em>Filter</em>}'</li> * </ul> - * </p> * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Owned Filter</em>' containment reference list isn't clear, there really should be more of a description here... diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/Equals.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/Equals.java index 7c6dfedf126..0ec515a444d 100644 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/Equals.java +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/Equals.java @@ -19,17 +19,16 @@ package org.eclipse.papyrus.infra.filters; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.papyrus.infra.filters.Equals#getObject <em>Object</em>}</li> * </ul> - * </p> * * @see org.eclipse.papyrus.infra.filters.FiltersPackage#getEquals() * @model * @generated */ -public interface Equals extends Filter -{ +public interface Equals extends Filter { /** * Returns the value of the '<em><b>Object</b></em>' attribute. * <!-- begin-user-doc --> diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/Filter.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/Filter.java index 64fab478a24..a387bf086b0 100644 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/Filter.java +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/Filter.java @@ -20,17 +20,16 @@ import org.eclipse.emf.ecore.EObject; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.papyrus.infra.filters.Filter#getName <em>Name</em>}</li> * </ul> - * </p> * * @see org.eclipse.papyrus.infra.filters.FiltersPackage#getFilter() * @model interface="true" abstract="true" * @generated */ -public interface Filter extends EObject -{ +public interface Filter extends EObject { /** * Returns the value of the '<em><b>Name</b></em>' attribute. * <!-- begin-user-doc --> diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/FilteredElement.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/FilteredElement.java new file mode 100644 index 00000000000..499b606e87b --- /dev/null +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/FilteredElement.java @@ -0,0 +1,79 @@ +/** + * Copyright (c) 2014 Christian W. Damus and others. + * + * 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: + * Christian W. Damus - Initial API and implementation + */ +package org.eclipse.papyrus.infra.filters; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Filtered Element</b></em>'. + * <!-- end-user-doc --> + * + * <p> + * The following features are supported: + * </p> + * <ul> + * <li>{@link org.eclipse.papyrus.infra.filters.FilteredElement#getFilter <em>Filter</em>}</li> + * </ul> + * + * @see org.eclipse.papyrus.infra.filters.FiltersPackage#getFilteredElement() + * @model + * @generated + * @since 1.3 + */ +public interface FilteredElement extends EObject { + /** + * Returns the value of the '<em><b>Filter</b></em>' containment reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Filter</em>' containment reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * + * @return the value of the '<em>Filter</em>' containment reference. + * @see #setFilter(Filter) + * @see org.eclipse.papyrus.infra.filters.FiltersPackage#getFilteredElement_Filter() + * @model containment="true" ordered="false" + * @generated + */ + Filter getFilter(); + + /** + * Sets the value of the '{@link org.eclipse.papyrus.infra.filters.FilteredElement#getFilter <em>Filter</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @param value + * the new value of the '<em>Filter</em>' containment reference. + * @see #getFilter() + * @generated + */ + void setFilter(Filter value); + + /** + * Creates a new {@link org.eclipse.papyrus.infra.filters.Filter}, with the specified '<em><b>Name</b></em>', and sets the '<em><b>Filter</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @param name + * The '<em><b>Name</b></em>' for the new {@link org.eclipse.papyrus.infra.filters.Filter}, or <code>null</code>. + * @param eClass + * The Ecore class of the {@link org.eclipse.papyrus.infra.filters.Filter} to create. + * @return The new {@link org.eclipse.papyrus.infra.filters.Filter}. + * @see #getFilter() + * @generated + */ + Filter createFilter(String name, EClass eClass); + +} // FilteredElement diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/FiltersFactory.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/FiltersFactory.java index 5f312ce6942..2295b82051e 100644 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/FiltersFactory.java +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/FiltersFactory.java @@ -22,8 +22,7 @@ import org.eclipse.emf.ecore.EFactory; * @see org.eclipse.papyrus.infra.filters.FiltersPackage * @generated */ -public interface FiltersFactory extends EFactory -{ +public interface FiltersFactory extends EFactory { /** * The singleton instance of the factory. * <!-- begin-user-doc --> @@ -54,6 +53,17 @@ public interface FiltersFactory extends EFactory Equals createEquals(); /** + * Returns a new object of class '<em>Filtered Element</em>'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return a new object of class '<em>Filtered Element</em>'. + * @generated + * @since 1.3 + */ + FilteredElement createFilteredElement(); + + /** * Returns the package supported by this factory. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/FiltersPackage.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/FiltersPackage.java index 7d9fae9033c..21dd5eac181 100644 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/FiltersPackage.java +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/FiltersPackage.java @@ -36,8 +36,7 @@ import org.eclipse.emf.ecore.EReference; * @model kind="package" * @generated */ -public interface FiltersPackage extends EPackage -{ +public interface FiltersPackage extends EPackage { /** * The package name. * <!-- begin-user-doc --> @@ -278,6 +277,51 @@ public interface FiltersPackage extends EPackage int EQUALS_OPERATION_COUNT = FILTER_OPERATION_COUNT + 0; /** + * The meta object id for the '{@link org.eclipse.papyrus.infra.filters.impl.FilteredElementImpl <em>Filtered Element</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see org.eclipse.papyrus.infra.filters.impl.FilteredElementImpl + * @see org.eclipse.papyrus.infra.filters.impl.FiltersPackageImpl#getFilteredElement() + * @generated + * @since 1.3 + */ + int FILTERED_ELEMENT = 3; + + /** + * The feature id for the '<em><b>Filter</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + * @since 1.3 + */ + int FILTERED_ELEMENT__FILTER = 0; + + /** + * The number of structural features of the '<em>Filtered Element</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + * @since 1.3 + */ + int FILTERED_ELEMENT_FEATURE_COUNT = 1; + + /** + * The number of operations of the '<em>Filtered Element</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + * @since 1.3 + */ + int FILTERED_ELEMENT_OPERATION_COUNT = 0; + + /** * The meta object id for the '{@link org.eclipse.papyrus.infra.filters.OperatorKind <em>Operator Kind</em>}' enum. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -286,7 +330,7 @@ public interface FiltersPackage extends EPackage * @see org.eclipse.papyrus.infra.filters.impl.FiltersPackageImpl#getOperatorKind() * @generated */ - int OPERATOR_KIND = 3; + int OPERATOR_KIND = 4; /** * The meta object id for the '<em>Object</em>' data type. @@ -297,7 +341,7 @@ public interface FiltersPackage extends EPackage * @see org.eclipse.papyrus.infra.filters.impl.FiltersPackageImpl#getObject() * @generated */ - int OBJECT = 4; + int OBJECT = 5; /** @@ -416,6 +460,31 @@ public interface FiltersPackage extends EPackage EAttribute getEquals_Object(); /** + * Returns the meta object for class '{@link org.eclipse.papyrus.infra.filters.FilteredElement <em>Filtered Element</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for class '<em>Filtered Element</em>'. + * @see org.eclipse.papyrus.infra.filters.FilteredElement + * @generated + * @since 1.3 + */ + EClass getFilteredElement(); + + /** + * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.filters.FilteredElement#getFilter <em>Filter</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @return the meta object for the containment reference '<em>Filter</em>'. + * @see org.eclipse.papyrus.infra.filters.FilteredElement#getFilter() + * @see #getFilteredElement() + * @generated + * @since 1.3 + */ + EReference getFilteredElement_Filter(); + + /** * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.filters.OperatorKind <em>Operator Kind</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -462,8 +531,7 @@ public interface FiltersPackage extends EPackage * * @generated */ - interface Literals - { + interface Literals { /** * The meta object literal for the '{@link org.eclipse.papyrus.infra.filters.impl.CompoundFilterImpl <em>Compound Filter</em>}' class. * <!-- begin-user-doc --> @@ -561,6 +629,28 @@ public interface FiltersPackage extends EPackage EAttribute EQUALS__OBJECT = eINSTANCE.getEquals_Object(); /** + * The meta object literal for the '{@link org.eclipse.papyrus.infra.filters.impl.FilteredElementImpl <em>Filtered Element</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see org.eclipse.papyrus.infra.filters.impl.FilteredElementImpl + * @see org.eclipse.papyrus.infra.filters.impl.FiltersPackageImpl#getFilteredElement() + * @generated + * @since 1.3 + */ + EClass FILTERED_ELEMENT = eINSTANCE.getFilteredElement(); + + /** + * The meta object literal for the '<em><b>Filter</b></em>' containment reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @since 1.3 + */ + EReference FILTERED_ELEMENT__FILTER = eINSTANCE.getFilteredElement_Filter(); + + /** * The meta object literal for the '{@link org.eclipse.papyrus.infra.filters.OperatorKind <em>Operator Kind</em>}' enum. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/OperatorKind.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/OperatorKind.java index cdc27b0128e..cb81d417af7 100644 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/OperatorKind.java +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/OperatorKind.java @@ -27,8 +27,7 @@ import org.eclipse.emf.common.util.Enumerator; * @model * @generated */ -public enum OperatorKind implements Enumerator -{ +public enum OperatorKind implements Enumerator { /** * The '<em><b>And</b></em>' literal object. * <!-- begin-user-doc --> @@ -140,14 +139,12 @@ public enum OperatorKind implements Enumerator * * @generated */ - private static final OperatorKind[] VALUES_ARRAY = - new OperatorKind[] - { - AND, - OR, - XOR, - NOT, - }; + private static final OperatorKind[] VALUES_ARRAY = new OperatorKind[] { + AND, + OR, + XOR, + NOT, + }; /** * A public read-only list of all the '<em><b>Operator Kind</b></em>' enumerators. @@ -163,15 +160,15 @@ public enum OperatorKind implements Enumerator * <!-- begin-user-doc --> * <!-- end-user-doc --> * + * @param literal + * the literal. + * @return the matching enumerator or <code>null</code>. * @generated */ - public static OperatorKind get(String literal) - { - for (int i = 0; i < VALUES_ARRAY.length; ++i) - { + public static OperatorKind get(String literal) { + for (int i = 0; i < VALUES_ARRAY.length; ++i) { OperatorKind result = VALUES_ARRAY[i]; - if (result.toString().equals(literal)) - { + if (result.toString().equals(literal)) { return result; } } @@ -183,15 +180,15 @@ public enum OperatorKind implements Enumerator * <!-- begin-user-doc --> * <!-- end-user-doc --> * + * @param name + * the name. + * @return the matching enumerator or <code>null</code>. * @generated */ - public static OperatorKind getByName(String name) - { - for (int i = 0; i < VALUES_ARRAY.length; ++i) - { + public static OperatorKind getByName(String name) { + for (int i = 0; i < VALUES_ARRAY.length; ++i) { OperatorKind result = VALUES_ARRAY[i]; - if (result.getName().equals(name)) - { + if (result.getName().equals(name)) { return result; } } @@ -203,12 +200,13 @@ public enum OperatorKind implements Enumerator * <!-- begin-user-doc --> * <!-- end-user-doc --> * + * @param value + * the integer value. + * @return the matching enumerator or <code>null</code>. * @generated */ - public static OperatorKind get(int value) - { - switch (value) - { + public static OperatorKind get(int value) { + switch (value) { case AND_VALUE: return AND; case OR_VALUE: @@ -252,8 +250,7 @@ public enum OperatorKind implements Enumerator * * @generated */ - private OperatorKind(int value, String name, String literal) - { + private OperatorKind(int value, String name, String literal) { this.value = value; this.name = name; this.literal = literal; @@ -266,8 +263,7 @@ public enum OperatorKind implements Enumerator * @generated */ @Override - public int getValue() - { + public int getValue() { return value; } @@ -278,8 +274,7 @@ public enum OperatorKind implements Enumerator * @generated */ @Override - public String getName() - { + public String getName() { return name; } @@ -290,8 +285,7 @@ public enum OperatorKind implements Enumerator * @generated */ @Override - public String getLiteral() - { + public String getLiteral() { return literal; } @@ -303,8 +297,7 @@ public enum OperatorKind implements Enumerator * @generated */ @Override - public String toString() - { + public String toString() { return literal; } diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/impl/CompoundFilterImpl.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/impl/CompoundFilterImpl.java index 0503fc2361a..82d43829971 100644 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/impl/CompoundFilterImpl.java +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/impl/CompoundFilterImpl.java @@ -39,18 +39,17 @@ import org.eclipse.uml2.common.util.SubsetSupersetEObjectResolvingEList; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.papyrus.infra.filters.impl.CompoundFilterImpl#getName <em>Name</em>}</li> * <li>{@link org.eclipse.papyrus.infra.filters.impl.CompoundFilterImpl#getFilters <em>Filter</em>}</li> * <li>{@link org.eclipse.papyrus.infra.filters.impl.CompoundFilterImpl#getOwnedFilters <em>Owned Filter</em>}</li> * <li>{@link org.eclipse.papyrus.infra.filters.impl.CompoundFilterImpl#getOperator <em>Operator</em>}</li> * </ul> - * </p> * * @generated */ -public class CompoundFilterImpl extends MinimalEObjectImpl.Container implements CompoundFilter -{ +public class CompoundFilterImpl extends MinimalEObjectImpl.Container implements CompoundFilter { /** * A set of bit flags representing the values of boolean attributes and whether unsettable features have been set. * <!-- begin-user-doc --> @@ -163,8 +162,7 @@ public class CompoundFilterImpl extends MinimalEObjectImpl.Container implements * * @generated */ - protected CompoundFilterImpl() - { + protected CompoundFilterImpl() { super(); } @@ -175,8 +173,7 @@ public class CompoundFilterImpl extends MinimalEObjectImpl.Container implements * @generated */ @Override - protected EClass eStaticClass() - { + protected EClass eStaticClass() { return FiltersPackage.Literals.COMPOUND_FILTER; } @@ -187,8 +184,7 @@ public class CompoundFilterImpl extends MinimalEObjectImpl.Container implements * @generated */ @Override - public String getName() - { + public String getName() { return name; } @@ -199,8 +195,7 @@ public class CompoundFilterImpl extends MinimalEObjectImpl.Container implements * @generated */ @Override - public void setName(String newName) - { + public void setName(String newName) { newName = newName == null ? NAME_EDEFAULT : newName; String oldName = name; name = newName; @@ -216,11 +211,9 @@ public class CompoundFilterImpl extends MinimalEObjectImpl.Container implements * @generated */ @Override - public EList<Filter> getFilters() - { - if (filters == null) - { - filters = new SubsetSupersetEObjectResolvingEList<Filter>(Filter.class, this, FiltersPackage.COMPOUND_FILTER__FILTER, null, FILTER_ESUBSETS); + public EList<Filter> getFilters() { + if (filters == null) { + filters = new SubsetSupersetEObjectResolvingEList<>(Filter.class, this, FiltersPackage.COMPOUND_FILTER__FILTER, null, FILTER_ESUBSETS); } return filters; } @@ -243,8 +236,7 @@ public class CompoundFilterImpl extends MinimalEObjectImpl.Container implements * @generated */ @Override - public Filter getFilter(String name) - { + public Filter getFilter(String name) { return getFilter(name, false, null); } @@ -255,10 +247,8 @@ public class CompoundFilterImpl extends MinimalEObjectImpl.Container implements * @generated */ @Override - public Filter getFilter(String name, boolean ignoreCase, EClass eClass) - { - filterLoop: for (Filter filter : getFilters()) - { + public Filter getFilter(String name, boolean ignoreCase, EClass eClass) { + filterLoop: for (Filter filter : getFilters()) { if (eClass != null && !eClass.isInstance(filter)) { continue filterLoop; } @@ -277,11 +267,9 @@ public class CompoundFilterImpl extends MinimalEObjectImpl.Container implements * @generated */ @Override - public EList<Filter> getOwnedFilters() - { - if (ownedFilters == null) - { - ownedFilters = new SubsetSupersetEObjectContainmentEList<Filter>(Filter.class, this, FiltersPackage.COMPOUND_FILTER__OWNED_FILTER, OWNED_FILTER_ESUPERSETS, null); + public EList<Filter> getOwnedFilters() { + if (ownedFilters == null) { + ownedFilters = new SubsetSupersetEObjectContainmentEList<>(Filter.class, this, FiltersPackage.COMPOUND_FILTER__OWNED_FILTER, OWNED_FILTER_ESUPERSETS, null); } return ownedFilters; } @@ -304,8 +292,7 @@ public class CompoundFilterImpl extends MinimalEObjectImpl.Container implements * @generated */ @Override - public Filter createOwnedFilter(String name, EClass eClass) - { + public Filter createOwnedFilter(String name, EClass eClass) { Filter newOwnedFilter = (Filter) create(eClass); getOwnedFilters().add(newOwnedFilter); if (name != null) { @@ -321,8 +308,7 @@ public class CompoundFilterImpl extends MinimalEObjectImpl.Container implements * @generated */ @Override - public Filter getOwnedFilter(String name) - { + public Filter getOwnedFilter(String name) { return getOwnedFilter(name, false, null, false); } @@ -333,10 +319,8 @@ public class CompoundFilterImpl extends MinimalEObjectImpl.Container implements * @generated */ @Override - public Filter getOwnedFilter(String name, boolean ignoreCase, EClass eClass, boolean createOnDemand) - { - ownedFilterLoop: for (Filter ownedFilter : getOwnedFilters()) - { + public Filter getOwnedFilter(String name, boolean ignoreCase, EClass eClass, boolean createOnDemand) { + ownedFilterLoop: for (Filter ownedFilter : getOwnedFilters()) { if (eClass != null && !eClass.isInstance(ownedFilter)) { continue ownedFilterLoop; } @@ -355,8 +339,7 @@ public class CompoundFilterImpl extends MinimalEObjectImpl.Container implements * @generated */ @Override - public OperatorKind getOperator() - { + public OperatorKind getOperator() { return OPERATOR_EFLAG_VALUES[(_flags & OPERATOR_EFLAG) >>> OPERATOR_EFLAG_OFFSET]; } @@ -367,8 +350,7 @@ public class CompoundFilterImpl extends MinimalEObjectImpl.Container implements * @generated */ @Override - public void setOperator(OperatorKind newOperator) - { + public void setOperator(OperatorKind newOperator) { OperatorKind oldOperator = OPERATOR_EFLAG_VALUES[(_flags & OPERATOR_EFLAG) >>> OPERATOR_EFLAG_OFFSET]; if (newOperator == null) { newOperator = OPERATOR_EDEFAULT; @@ -386,8 +368,7 @@ public class CompoundFilterImpl extends MinimalEObjectImpl.Container implements * @generated */ @Override - public boolean matches(Object input) - { + public boolean matches(Object input) { return CompoundFilterOperations.matches(this, input); } @@ -398,8 +379,7 @@ public class CompoundFilterImpl extends MinimalEObjectImpl.Container implements * @generated */ @Override - public boolean validateAcyclic(DiagnosticChain diagnostics, Map<Object, Object> context) - { + public boolean validateAcyclic(DiagnosticChain diagnostics, Map<Object, Object> context) { return CompoundFilterOperations.validateAcyclic(this, diagnostics, context); } @@ -410,10 +390,8 @@ public class CompoundFilterImpl extends MinimalEObjectImpl.Container implements * @generated */ @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) - { - switch (featureID) - { + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { case FiltersPackage.COMPOUND_FILTER__OWNED_FILTER: return ((InternalEList<?>) getOwnedFilters()).basicRemove(otherEnd, msgs); } @@ -427,10 +405,8 @@ public class CompoundFilterImpl extends MinimalEObjectImpl.Container implements * @generated */ @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) - { - switch (featureID) - { + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { case FiltersPackage.COMPOUND_FILTER__NAME: return getName(); case FiltersPackage.COMPOUND_FILTER__FILTER: @@ -451,10 +427,8 @@ public class CompoundFilterImpl extends MinimalEObjectImpl.Container implements */ @SuppressWarnings("unchecked") @Override - public void eSet(int featureID, Object newValue) - { - switch (featureID) - { + public void eSet(int featureID, Object newValue) { + switch (featureID) { case FiltersPackage.COMPOUND_FILTER__NAME: setName((String) newValue); return; @@ -480,10 +454,8 @@ public class CompoundFilterImpl extends MinimalEObjectImpl.Container implements * @generated */ @Override - public void eUnset(int featureID) - { - switch (featureID) - { + public void eUnset(int featureID) { + switch (featureID) { case FiltersPackage.COMPOUND_FILTER__NAME: setName(NAME_EDEFAULT); return; @@ -507,10 +479,8 @@ public class CompoundFilterImpl extends MinimalEObjectImpl.Container implements * @generated */ @Override - public boolean eIsSet(int featureID) - { - switch (featureID) - { + public boolean eIsSet(int featureID) { + switch (featureID) { case FiltersPackage.COMPOUND_FILTER__NAME: return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); case FiltersPackage.COMPOUND_FILTER__FILTER: @@ -531,10 +501,8 @@ public class CompoundFilterImpl extends MinimalEObjectImpl.Container implements */ @Override @SuppressWarnings("unchecked") - public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException - { - switch (operationID) - { + public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException { + switch (operationID) { case FiltersPackage.COMPOUND_FILTER___MATCHES__OBJECT: return matches(arguments.get(0)); case FiltersPackage.COMPOUND_FILTER___VALIDATE_ACYCLIC__DIAGNOSTICCHAIN_MAP: @@ -550,8 +518,7 @@ public class CompoundFilterImpl extends MinimalEObjectImpl.Container implements * @generated */ @Override - public String toString() - { + public String toString() { if (eIsProxy()) { return super.toString(); } @@ -575,8 +542,7 @@ public class CompoundFilterImpl extends MinimalEObjectImpl.Container implements * @return The new instance. * @generated */ - protected EObject create(EClass eClass) - { + protected EObject create(EClass eClass) { return EcoreUtil.create(eClass); } diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/impl/EqualsImpl.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/impl/EqualsImpl.java index de1a89ce889..c56f62c1010 100644 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/impl/EqualsImpl.java +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/impl/EqualsImpl.java @@ -32,16 +32,15 @@ import org.eclipse.papyrus.infra.filters.internal.operations.EqualsOperations; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.papyrus.infra.filters.impl.EqualsImpl#getName <em>Name</em>}</li> * <li>{@link org.eclipse.papyrus.infra.filters.impl.EqualsImpl#getObject <em>Object</em>}</li> * </ul> - * </p> * * @generated */ -public class EqualsImpl extends MinimalEObjectImpl.Container implements Equals -{ +public class EqualsImpl extends MinimalEObjectImpl.Container implements Equals { /** * A set of bit flags representing the values of boolean attributes and whether unsettable features have been set. * <!-- begin-user-doc --> @@ -102,8 +101,7 @@ public class EqualsImpl extends MinimalEObjectImpl.Container implements Equals * * @generated */ - protected EqualsImpl() - { + protected EqualsImpl() { super(); } @@ -114,8 +112,7 @@ public class EqualsImpl extends MinimalEObjectImpl.Container implements Equals * @generated */ @Override - protected EClass eStaticClass() - { + protected EClass eStaticClass() { return FiltersPackage.Literals.EQUALS; } @@ -126,8 +123,7 @@ public class EqualsImpl extends MinimalEObjectImpl.Container implements Equals * @generated */ @Override - public String getName() - { + public String getName() { return name; } @@ -138,8 +134,7 @@ public class EqualsImpl extends MinimalEObjectImpl.Container implements Equals * @generated */ @Override - public void setName(String newName) - { + public void setName(String newName) { newName = newName == null ? NAME_EDEFAULT : newName; String oldName = name; name = newName; @@ -155,8 +150,7 @@ public class EqualsImpl extends MinimalEObjectImpl.Container implements Equals * @generated */ @Override - public Object getObject() - { + public Object getObject() { return object; } @@ -167,8 +161,7 @@ public class EqualsImpl extends MinimalEObjectImpl.Container implements Equals * @generated */ @Override - public void setObject(Object newObject) - { + public void setObject(Object newObject) { Object oldObject = object; object = newObject; if (eNotificationRequired()) { @@ -183,8 +176,7 @@ public class EqualsImpl extends MinimalEObjectImpl.Container implements Equals * @generated */ @Override - public boolean matches(Object input) - { + public boolean matches(Object input) { return EqualsOperations.matches(this, input); } @@ -195,10 +187,8 @@ public class EqualsImpl extends MinimalEObjectImpl.Container implements Equals * @generated */ @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) - { - switch (featureID) - { + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { case FiltersPackage.EQUALS__NAME: return getName(); case FiltersPackage.EQUALS__OBJECT: @@ -214,10 +204,8 @@ public class EqualsImpl extends MinimalEObjectImpl.Container implements Equals * @generated */ @Override - public void eSet(int featureID, Object newValue) - { - switch (featureID) - { + public void eSet(int featureID, Object newValue) { + switch (featureID) { case FiltersPackage.EQUALS__NAME: setName((String) newValue); return; @@ -235,10 +223,8 @@ public class EqualsImpl extends MinimalEObjectImpl.Container implements Equals * @generated */ @Override - public void eUnset(int featureID) - { - switch (featureID) - { + public void eUnset(int featureID) { + switch (featureID) { case FiltersPackage.EQUALS__NAME: setName(NAME_EDEFAULT); return; @@ -256,10 +242,8 @@ public class EqualsImpl extends MinimalEObjectImpl.Container implements Equals * @generated */ @Override - public boolean eIsSet(int featureID) - { - switch (featureID) - { + public boolean eIsSet(int featureID) { + switch (featureID) { case FiltersPackage.EQUALS__NAME: return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); case FiltersPackage.EQUALS__OBJECT: @@ -275,10 +259,8 @@ public class EqualsImpl extends MinimalEObjectImpl.Container implements Equals * @generated */ @Override - public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException - { - switch (operationID) - { + public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException { + switch (operationID) { case FiltersPackage.EQUALS___MATCHES__OBJECT: return matches(arguments.get(0)); } @@ -292,8 +274,7 @@ public class EqualsImpl extends MinimalEObjectImpl.Container implements Equals * @generated */ @Override - public String toString() - { + public String toString() { if (eIsProxy()) { return super.toString(); } @@ -317,8 +298,7 @@ public class EqualsImpl extends MinimalEObjectImpl.Container implements Equals * @return The new instance. * @generated */ - protected EObject create(EClass eClass) - { + protected EObject create(EClass eClass) { return EcoreUtil.create(eClass); } diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/impl/FilteredElementImpl.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/impl/FilteredElementImpl.java new file mode 100644 index 00000000000..8dd94ffd839 --- /dev/null +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/impl/FilteredElementImpl.java @@ -0,0 +1,250 @@ +/** + * Copyright (c) 2014 Christian W. Damus and others. + * + * 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: + * Christian W. Damus - Initial API and implementation + */ +package org.eclipse.papyrus.infra.filters.impl; + +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + +import org.eclipse.emf.ecore.util.EcoreUtil; + +import org.eclipse.papyrus.infra.filters.Filter; +import org.eclipse.papyrus.infra.filters.FilteredElement; +import org.eclipse.papyrus.infra.filters.FiltersPackage; + +/** + * <!-- begin-user-doc --> + * An implementation of the model object '<em><b>Filtered Element</b></em>'. + * <!-- end-user-doc --> + * <p> + * The following features are implemented: + * </p> + * <ul> + * <li>{@link org.eclipse.papyrus.infra.filters.impl.FilteredElementImpl#getFilter <em>Filter</em>}</li> + * </ul> + * + * @generated + * @since 1.3 + */ +public class FilteredElementImpl extends MinimalEObjectImpl.Container implements FilteredElement { + /** + * A set of bit flags representing the values of boolean attributes and whether unsettable features have been set. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + * @ordered + */ + protected int _flags = 0; + + /** + * The cached value of the '{@link #getFilter() <em>Filter</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @see #getFilter() + * @generated + * @ordered + */ + protected Filter filter; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + protected FilteredElementImpl() { + super(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return FiltersPackage.Literals.FILTERED_ELEMENT; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + public Filter getFilter() { + return filter; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public NotificationChain basicSetFilter(Filter newFilter, NotificationChain msgs) { + Filter oldFilter = filter; + filter = newFilter; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FiltersPackage.FILTERED_ELEMENT__FILTER, oldFilter, newFilter); + if (msgs == null) { + msgs = notification; + } else { + msgs.add(notification); + } + } + return msgs; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + public void setFilter(Filter newFilter) { + if (newFilter != filter) { + NotificationChain msgs = null; + if (filter != null) { + msgs = ((InternalEObject) filter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FiltersPackage.FILTERED_ELEMENT__FILTER, null, msgs); + } + if (newFilter != null) { + msgs = ((InternalEObject) newFilter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FiltersPackage.FILTERED_ELEMENT__FILTER, null, msgs); + } + msgs = basicSetFilter(newFilter, msgs); + if (msgs != null) { + msgs.dispatch(); + } + } else if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.SET, FiltersPackage.FILTERED_ELEMENT__FILTER, newFilter, newFilter)); + } + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + public Filter createFilter(String name, EClass eClass) { + Filter newFilter = (Filter) create(eClass); + setFilter(newFilter); + if (name != null) { + newFilter.setName(name); + } + return newFilter; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case FiltersPackage.FILTERED_ELEMENT__FILTER: + return basicSetFilter(null, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case FiltersPackage.FILTERED_ELEMENT__FILTER: + return getFilter(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case FiltersPackage.FILTERED_ELEMENT__FILTER: + setFilter((Filter) newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case FiltersPackage.FILTERED_ELEMENT__FILTER: + setFilter((Filter) null); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case FiltersPackage.FILTERED_ELEMENT__FILTER: + return filter != null; + } + return super.eIsSet(featureID); + } + + /** + * Creates a new instance of the specified Ecore class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @param eClass + * The Ecore class of the instance to create. + * @return The new instance. + * @generated + */ + protected EObject create(EClass eClass) { + return EcoreUtil.create(eClass); + } + +} // FilteredElementImpl diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/impl/FiltersFactoryImpl.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/impl/FiltersFactoryImpl.java index 3a35ee42250..f9cc96d5eba 100644 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/impl/FiltersFactoryImpl.java +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/impl/FiltersFactoryImpl.java @@ -29,8 +29,7 @@ import org.eclipse.papyrus.infra.filters.*; * * @generated */ -public class FiltersFactoryImpl extends EFactoryImpl implements FiltersFactory -{ +public class FiltersFactoryImpl extends EFactoryImpl implements FiltersFactory { /** * Creates the default factory implementation. * <!-- begin-user-doc --> @@ -38,17 +37,13 @@ public class FiltersFactoryImpl extends EFactoryImpl implements FiltersFactory * * @generated */ - public static FiltersFactory init() - { - try - { + public static FiltersFactory init() { + try { FiltersFactory theFiltersFactory = (FiltersFactory) EPackage.Registry.INSTANCE.getEFactory(FiltersPackage.eNS_URI); - if (theFiltersFactory != null) - { + if (theFiltersFactory != null) { return theFiltersFactory; } - } catch (Exception exception) - { + } catch (Exception exception) { EcorePlugin.INSTANCE.log(exception); } return new FiltersFactoryImpl(); @@ -61,8 +56,7 @@ public class FiltersFactoryImpl extends EFactoryImpl implements FiltersFactory * * @generated */ - public FiltersFactoryImpl() - { + public FiltersFactoryImpl() { super(); } @@ -73,14 +67,14 @@ public class FiltersFactoryImpl extends EFactoryImpl implements FiltersFactory * @generated */ @Override - public EObject create(EClass eClass) - { - switch (eClass.getClassifierID()) - { + public EObject create(EClass eClass) { + switch (eClass.getClassifierID()) { case FiltersPackage.COMPOUND_FILTER: return createCompoundFilter(); case FiltersPackage.EQUALS: return createEquals(); + case FiltersPackage.FILTERED_ELEMENT: + return createFilteredElement(); default: throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$ } @@ -93,10 +87,8 @@ public class FiltersFactoryImpl extends EFactoryImpl implements FiltersFactory * @generated */ @Override - public Object createFromString(EDataType eDataType, String initialValue) - { - switch (eDataType.getClassifierID()) - { + public Object createFromString(EDataType eDataType, String initialValue) { + switch (eDataType.getClassifierID()) { case FiltersPackage.OPERATOR_KIND: return createOperatorKindFromString(eDataType, initialValue); case FiltersPackage.OBJECT: @@ -113,10 +105,8 @@ public class FiltersFactoryImpl extends EFactoryImpl implements FiltersFactory * @generated */ @Override - public String convertToString(EDataType eDataType, Object instanceValue) - { - switch (eDataType.getClassifierID()) - { + public String convertToString(EDataType eDataType, Object instanceValue) { + switch (eDataType.getClassifierID()) { case FiltersPackage.OPERATOR_KIND: return convertOperatorKindToString(eDataType, instanceValue); case FiltersPackage.OBJECT: @@ -133,8 +123,7 @@ public class FiltersFactoryImpl extends EFactoryImpl implements FiltersFactory * @generated */ @Override - public CompoundFilter createCompoundFilter() - { + public CompoundFilter createCompoundFilter() { CompoundFilterImpl compoundFilter = new CompoundFilterImpl(); return compoundFilter; } @@ -146,8 +135,7 @@ public class FiltersFactoryImpl extends EFactoryImpl implements FiltersFactory * @generated */ @Override - public Equals createEquals() - { + public Equals createEquals() { EqualsImpl equals = new EqualsImpl(); return equals; } @@ -158,8 +146,19 @@ public class FiltersFactoryImpl extends EFactoryImpl implements FiltersFactory * * @generated */ - public OperatorKind createOperatorKindFromString(EDataType eDataType, String initialValue) - { + @Override + public FilteredElement createFilteredElement() { + FilteredElementImpl filteredElement = new FilteredElementImpl(); + return filteredElement; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public OperatorKind createOperatorKindFromString(EDataType eDataType, String initialValue) { OperatorKind result = OperatorKind.get(initialValue); if (result == null) { @@ -174,8 +173,7 @@ public class FiltersFactoryImpl extends EFactoryImpl implements FiltersFactory * * @generated */ - public String convertOperatorKindToString(EDataType eDataType, Object instanceValue) - { + public String convertOperatorKindToString(EDataType eDataType, Object instanceValue) { return instanceValue == null ? null : instanceValue.toString(); } @@ -185,8 +183,7 @@ public class FiltersFactoryImpl extends EFactoryImpl implements FiltersFactory * * @generated */ - public Object createObjectFromString(EDataType eDataType, String initialValue) - { + public Object createObjectFromString(EDataType eDataType, String initialValue) { return super.createFromString(eDataType, initialValue); } @@ -196,8 +193,7 @@ public class FiltersFactoryImpl extends EFactoryImpl implements FiltersFactory * * @generated */ - public String convertObjectToString(EDataType eDataType, Object instanceValue) - { + public String convertObjectToString(EDataType eDataType, Object instanceValue) { return super.convertToString(eDataType, instanceValue); } @@ -208,8 +204,7 @@ public class FiltersFactoryImpl extends EFactoryImpl implements FiltersFactory * @generated */ @Override - public FiltersPackage getFiltersPackage() - { + public FiltersPackage getFiltersPackage() { return (FiltersPackage) getEPackage(); } @@ -221,8 +216,7 @@ public class FiltersFactoryImpl extends EFactoryImpl implements FiltersFactory * @generated */ @Deprecated - public static FiltersPackage getPackage() - { + public static FiltersPackage getPackage() { return FiltersPackage.eINSTANCE; } diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/impl/FiltersPackageImpl.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/impl/FiltersPackageImpl.java index 3ce25b4c4a7..f24b9dbe967 100644 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/impl/FiltersPackageImpl.java +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/impl/FiltersPackageImpl.java @@ -25,6 +25,7 @@ import org.eclipse.emf.ecore.impl.EPackageImpl; import org.eclipse.papyrus.infra.filters.CompoundFilter; import org.eclipse.papyrus.infra.filters.Equals; import org.eclipse.papyrus.infra.filters.Filter; +import org.eclipse.papyrus.infra.filters.FilteredElement; import org.eclipse.papyrus.infra.filters.FiltersFactory; import org.eclipse.papyrus.infra.filters.FiltersPackage; import org.eclipse.papyrus.infra.filters.OperatorKind; @@ -38,8 +39,7 @@ import org.eclipse.uml2.types.TypesPackage; * * @generated */ -public class FiltersPackageImpl extends EPackageImpl implements FiltersPackage -{ +public class FiltersPackageImpl extends EPackageImpl implements FiltersPackage { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -70,6 +70,14 @@ public class FiltersPackageImpl extends EPackageImpl implements FiltersPackage * * @generated */ + private EClass filteredElementEClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ private EEnum operatorKindEEnum = null; /** @@ -81,18 +89,22 @@ public class FiltersPackageImpl extends EPackageImpl implements FiltersPackage private EDataType objectEDataType = null; /** - * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package + * Creates an instance of the model <b>Package</b>, registered with + * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package * package URI value. * <p> - * 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. <!-- begin-user-doc --> <!-- end-user-doc --> + * 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. + * <!-- begin-user-doc --> <!-- end-user-doc --> * * @see org.eclipse.emf.ecore.EPackage.Registry * @see org.eclipse.papyrus.infra.filters.FiltersPackage#eNS_URI * @see #init() * @generated */ - private FiltersPackageImpl() - { + private FiltersPackageImpl() { super(eNS_URI, FiltersFactory.eINSTANCE); } @@ -108,15 +120,16 @@ public class FiltersPackageImpl extends EPackageImpl implements FiltersPackage * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends. * * <p> - * This method is used to initialize {@link FiltersPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc --> + * This method is used to initialize {@link FiltersPackage#eINSTANCE} when that field is accessed. + * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. + * <!-- begin-user-doc --> <!-- end-user-doc --> * * @see #eNS_URI * @see #createPackageContents() * @see #initializePackageContents() * @generated */ - public static FiltersPackage init() - { + public static FiltersPackage init() { if (isInited) { return (FiltersPackage) EPackage.Registry.INSTANCE.getEPackage(FiltersPackage.eNS_URI); } @@ -136,16 +149,13 @@ public class FiltersPackageImpl extends EPackageImpl implements FiltersPackage theFiltersPackage.initializePackageContents(); // Register package validator - EValidator.Registry.INSTANCE.put - (theFiltersPackage, - new EValidator.Descriptor() - { - @Override - public EValidator getEValidator() - { - return FiltersValidator.INSTANCE; - } - }); + EValidator.Registry.INSTANCE.put(theFiltersPackage, + new EValidator.Descriptor() { + @Override + public EValidator getEValidator() { + return FiltersValidator.INSTANCE; + } + }); // Mark meta-data to indicate it can't be changed theFiltersPackage.freeze(); @@ -163,8 +173,7 @@ public class FiltersPackageImpl extends EPackageImpl implements FiltersPackage * @generated */ @Override - public EClass getCompoundFilter() - { + public EClass getCompoundFilter() { return compoundFilterEClass; } @@ -175,8 +184,7 @@ public class FiltersPackageImpl extends EPackageImpl implements FiltersPackage * @generated */ @Override - public EReference getCompoundFilter_Filter() - { + public EReference getCompoundFilter_Filter() { return (EReference) compoundFilterEClass.getEStructuralFeatures().get(0); } @@ -187,8 +195,7 @@ public class FiltersPackageImpl extends EPackageImpl implements FiltersPackage * @generated */ @Override - public EReference getCompoundFilter_OwnedFilter() - { + public EReference getCompoundFilter_OwnedFilter() { return (EReference) compoundFilterEClass.getEStructuralFeatures().get(1); } @@ -199,8 +206,7 @@ public class FiltersPackageImpl extends EPackageImpl implements FiltersPackage * @generated */ @Override - public EAttribute getCompoundFilter_Operator() - { + public EAttribute getCompoundFilter_Operator() { return (EAttribute) compoundFilterEClass.getEStructuralFeatures().get(2); } @@ -211,8 +217,7 @@ public class FiltersPackageImpl extends EPackageImpl implements FiltersPackage * @generated */ @Override - public EOperation getCompoundFilter__ValidateAcyclic__DiagnosticChain_Map() - { + public EOperation getCompoundFilter__ValidateAcyclic__DiagnosticChain_Map() { return compoundFilterEClass.getEOperations().get(0); } @@ -223,8 +228,7 @@ public class FiltersPackageImpl extends EPackageImpl implements FiltersPackage * @generated */ @Override - public EClass getFilter() - { + public EClass getFilter() { return filterEClass; } @@ -235,8 +239,7 @@ public class FiltersPackageImpl extends EPackageImpl implements FiltersPackage * @generated */ @Override - public EAttribute getFilter_Name() - { + public EAttribute getFilter_Name() { return (EAttribute) filterEClass.getEStructuralFeatures().get(0); } @@ -247,8 +250,7 @@ public class FiltersPackageImpl extends EPackageImpl implements FiltersPackage * @generated */ @Override - public EOperation getFilter__Matches__Object() - { + public EOperation getFilter__Matches__Object() { return filterEClass.getEOperations().get(0); } @@ -259,8 +261,7 @@ public class FiltersPackageImpl extends EPackageImpl implements FiltersPackage * @generated */ @Override - public EClass getEquals() - { + public EClass getEquals() { return equalsEClass; } @@ -271,8 +272,7 @@ public class FiltersPackageImpl extends EPackageImpl implements FiltersPackage * @generated */ @Override - public EAttribute getEquals_Object() - { + public EAttribute getEquals_Object() { return (EAttribute) equalsEClass.getEStructuralFeatures().get(0); } @@ -283,8 +283,29 @@ public class FiltersPackageImpl extends EPackageImpl implements FiltersPackage * @generated */ @Override - public EEnum getOperatorKind() - { + public EClass getFilteredElement() { + return filteredElementEClass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + public EReference getFilteredElement_Filter() { + return (EReference) filteredElementEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + public EEnum getOperatorKind() { return operatorKindEEnum; } @@ -295,8 +316,7 @@ public class FiltersPackageImpl extends EPackageImpl implements FiltersPackage * @generated */ @Override - public EDataType getObject() - { + public EDataType getObject() { return objectEDataType; } @@ -307,8 +327,7 @@ public class FiltersPackageImpl extends EPackageImpl implements FiltersPackage * @generated */ @Override - public FiltersFactory getFiltersFactory() - { + public FiltersFactory getFiltersFactory() { return (FiltersFactory) getEFactoryInstance(); } @@ -328,8 +347,7 @@ public class FiltersPackageImpl extends EPackageImpl implements FiltersPackage * * @generated */ - public void createPackageContents() - { + public void createPackageContents() { if (isCreated) { return; } @@ -349,6 +367,9 @@ public class FiltersPackageImpl extends EPackageImpl implements FiltersPackage equalsEClass = createEClass(EQUALS); createEAttribute(equalsEClass, EQUALS__OBJECT); + filteredElementEClass = createEClass(FILTERED_ELEMENT); + createEReference(filteredElementEClass, FILTERED_ELEMENT__FILTER); + // Create enums operatorKindEEnum = createEEnum(OPERATOR_KIND); @@ -372,8 +393,7 @@ public class FiltersPackageImpl extends EPackageImpl implements FiltersPackage * * @generated */ - public void initializePackageContents() - { + public void initializePackageContents() { if (isInitialized) { return; } @@ -398,8 +418,8 @@ public class FiltersPackageImpl extends EPackageImpl implements FiltersPackage // Initialize classes, features, and operations; add parameters initEClass(compoundFilterEClass, CompoundFilter.class, "CompoundFilter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ initEReference(getCompoundFilter_Filter(), this.getFilter(), null, "filter", null, 1, -1, CompoundFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ - initEReference(getCompoundFilter_OwnedFilter(), this.getFilter(), null, - "ownedFilter", null, 0, -1, CompoundFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ + initEReference(getCompoundFilter_OwnedFilter(), this.getFilter(), null, "ownedFilter", null, 0, -1, CompoundFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, //$NON-NLS-1$ + !IS_ORDERED); initEAttribute(getCompoundFilter_Operator(), this.getOperatorKind(), "operator", null, 1, 1, CompoundFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ EOperation op = initEOperation(getCompoundFilter__ValidateAcyclic__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "validateAcyclic", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$ @@ -420,6 +440,9 @@ public class FiltersPackageImpl extends EPackageImpl implements FiltersPackage initEClass(equalsEClass, Equals.class, "Equals", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ initEAttribute(getEquals_Object(), this.getObject(), "object", null, 1, 1, Equals.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ + initEClass(filteredElementEClass, FilteredElement.class, "FilteredElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + initEReference(getFilteredElement_Filter(), this.getFilter(), null, "filter", null, 0, 1, FilteredElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ + // Initialize enums and add enum literals initEEnum(operatorKindEEnum, OperatorKind.class, "OperatorKind"); //$NON-NLS-1$ addEEnumLiteral(operatorKindEEnum, OperatorKind.AND); @@ -445,17 +468,14 @@ public class FiltersPackageImpl extends EPackageImpl implements FiltersPackage * * @generated */ - protected void createSubsetsAnnotations() - { + protected void createSubsetsAnnotations() { String source = "subsets"; //$NON-NLS-1$ addAnnotation(getCompoundFilter_OwnedFilter(), source, - new String[] - { + new String[] { }, - new URI[] - { - URI.createURI(eNS_URI).appendFragment("//CompoundFilter/filter") //$NON-NLS-1$ + new URI[] { + URI.createURI(eNS_URI).appendFragment("//CompoundFilter/filter") //$NON-NLS-1$ }); } diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/internal/operations/CompoundFilterOperations.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/internal/operations/CompoundFilterOperations.java index f9eb88a4c43..3a716dade72 100644 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/internal/operations/CompoundFilterOperations.java +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/internal/operations/CompoundFilterOperations.java @@ -32,16 +32,15 @@ import org.eclipse.papyrus.infra.filters.util.FiltersValidator; * * <p> * The following operations are supported: + * </p> * <ul> * <li>{@link org.eclipse.papyrus.infra.filters.Filter#matches(java.lang.Object) <em>Matches</em>}</li> - * <li>{@link org.eclipse.papyrus.infra.filters.CompositeFilter#validateAcyclic(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Acyclic</em>}</li> + * <li>{@link org.eclipse.papyrus.infra.filters.CompoundFilter#validateAcyclic(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Acyclic</em>}</li> * </ul> - * </p> * * @generated */ -public class CompoundFilterOperations -{ +public class CompoundFilterOperations { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -58,8 +57,7 @@ public class CompoundFilterOperations * * @generated NOT */ - public static boolean matches(CompoundFilter compoundFilter, Object input) - { + public static boolean matches(CompoundFilter compoundFilter, Object input) { boolean result; switch (compoundFilter.getOperator()) { @@ -123,8 +121,7 @@ public class CompoundFilterOperations * <!-- end-model-doc --> * @generated NOT */ - public static boolean validateAcyclic(final CompoundFilter compoundFilter, DiagnosticChain diagnostics, Map<Object, Object> context) - { + public static boolean validateAcyclic(final CompoundFilter compoundFilter, DiagnosticChain diagnostics, Map<Object, Object> context) { boolean result = true; Iterator<Filter> allFilters = new AbstractTreeIterator<Filter>(compoundFilter, false) { @@ -144,13 +141,11 @@ public class CompoundFilterOperations } if (!result && (diagnostics != null)) { - diagnostics.add - (new BasicDiagnostic - (Diagnostic.ERROR, - FiltersValidator.DIAGNOSTIC_SOURCE, - FiltersValidator.COMPOUND_FILTER__ACYCLIC, - FiltersPlugin.INSTANCE.getString("_UI_acyclic_diagnostic", new Object[] { EObjectValidator.getObjectLabel(compoundFilter, context) }), //$NON-NLS-1$ - new Object[] { compoundFilter })); + diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR, + FiltersValidator.DIAGNOSTIC_SOURCE, + FiltersValidator.COMPOUND_FILTER__ACYCLIC, + FiltersPlugin.INSTANCE.getString("_UI_acyclic_diagnostic", new Object[] { EObjectValidator.getObjectLabel(compoundFilter, context) }), //$NON-NLS-1$ + new Object[] { compoundFilter })); } return result; diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/internal/operations/EqualsOperations.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/internal/operations/EqualsOperations.java index fc5b9da3da2..4fbd9db6189 100644 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/internal/operations/EqualsOperations.java +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/internal/operations/EqualsOperations.java @@ -22,19 +22,18 @@ import org.eclipse.papyrus.infra.filters.Equals; * * <p> * The following operations are supported: + * </p> * <ul> * <li>{@link org.eclipse.papyrus.infra.filters.Filter#matches(java.lang.Object) <em>Matches</em>}</li> * </ul> - * </p> * * @generated */ -public class EqualsOperations -{ +public class EqualsOperations { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated */ protected EqualsOperations() { @@ -44,11 +43,10 @@ public class EqualsOperations /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * + * * @generated NOT */ - public static boolean matches(Equals equals, Object input) - { + public static boolean matches(Equals equals, Object input) { return Objects.equals(equals.getObject(), input); } diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/util/FiltersAdapterFactory.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/util/FiltersAdapterFactory.java index c385141f9b6..98d440dc709 100644 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/util/FiltersAdapterFactory.java +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/util/FiltersAdapterFactory.java @@ -29,8 +29,7 @@ import org.eclipse.papyrus.infra.filters.*; * @see org.eclipse.papyrus.infra.filters.FiltersPackage * @generated */ -public class FiltersAdapterFactory extends AdapterFactoryImpl -{ +public class FiltersAdapterFactory extends AdapterFactoryImpl { /** * The cached model package. * <!-- begin-user-doc --> @@ -47,10 +46,8 @@ public class FiltersAdapterFactory extends AdapterFactoryImpl * * @generated */ - public FiltersAdapterFactory() - { - if (modelPackage == null) - { + public FiltersAdapterFactory() { + if (modelPackage == null) { modelPackage = FiltersPackage.eINSTANCE; } } @@ -65,14 +62,11 @@ public class FiltersAdapterFactory extends AdapterFactoryImpl * @generated */ @Override - public boolean isFactoryForType(Object object) - { - if (object == modelPackage) - { + public boolean isFactoryForType(Object object) { + if (object == modelPackage) { return true; } - if (object instanceof EObject) - { + if (object instanceof EObject) { return ((EObject) object).eClass().getEPackage() == modelPackage; } return false; @@ -85,33 +79,32 @@ public class FiltersAdapterFactory extends AdapterFactoryImpl * * @generated */ - protected FiltersSwitch<Adapter> modelSwitch = - new FiltersSwitch<Adapter>() - { - @Override - public Adapter caseCompoundFilter(CompoundFilter object) - { - return createCompoundFilterAdapter(); - } - - @Override - public Adapter caseFilter(Filter object) - { - return createFilterAdapter(); - } - - @Override - public Adapter caseEquals(Equals object) - { - return createEqualsAdapter(); - } - - @Override - public Adapter defaultCase(EObject object) - { - return createEObjectAdapter(); - } - }; + protected FiltersSwitch<Adapter> modelSwitch = new FiltersSwitch<Adapter>() { + @Override + public Adapter caseCompoundFilter(CompoundFilter object) { + return createCompoundFilterAdapter(); + } + + @Override + public Adapter caseFilter(Filter object) { + return createFilterAdapter(); + } + + @Override + public Adapter caseEquals(Equals object) { + return createEqualsAdapter(); + } + + @Override + public Adapter caseFilteredElement(FilteredElement object) { + return createFilteredElementAdapter(); + } + + @Override + public Adapter defaultCase(EObject object) { + return createEObjectAdapter(); + } + }; /** * Creates an adapter for the <code>target</code>. @@ -124,8 +117,7 @@ public class FiltersAdapterFactory extends AdapterFactoryImpl * @generated */ @Override - public Adapter createAdapter(Notifier target) - { + public Adapter createAdapter(Notifier target) { return modelSwitch.doSwitch((EObject) target); } @@ -141,8 +133,7 @@ public class FiltersAdapterFactory extends AdapterFactoryImpl * @see org.eclipse.papyrus.infra.filters.CompoundFilter * @generated */ - public Adapter createCompoundFilterAdapter() - { + public Adapter createCompoundFilterAdapter() { return null; } @@ -157,8 +148,7 @@ public class FiltersAdapterFactory extends AdapterFactoryImpl * @see org.eclipse.papyrus.infra.filters.Filter * @generated */ - public Adapter createFilterAdapter() - { + public Adapter createFilterAdapter() { return null; } @@ -173,8 +163,23 @@ public class FiltersAdapterFactory extends AdapterFactoryImpl * @see org.eclipse.papyrus.infra.filters.Equals * @generated */ - public Adapter createEqualsAdapter() - { + public Adapter createEqualsAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.filters.FilteredElement <em>Filtered Element</em>}'. + * <!-- begin-user-doc --> + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * <!-- end-user-doc --> + * + * @return the new adapter. + * @see org.eclipse.papyrus.infra.filters.FilteredElement + * @generated + * @since 1.3 + */ + public Adapter createFilteredElementAdapter() { return null; } @@ -187,8 +192,7 @@ public class FiltersAdapterFactory extends AdapterFactoryImpl * @return the new adapter. * @generated */ - public Adapter createEObjectAdapter() - { + public Adapter createEObjectAdapter() { return null; } diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/util/FiltersSwitch.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/util/FiltersSwitch.java index 87585bbb9f1..cee13299608 100644 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/util/FiltersSwitch.java +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/util/FiltersSwitch.java @@ -31,8 +31,7 @@ import org.eclipse.papyrus.infra.filters.*; * @see org.eclipse.papyrus.infra.filters.FiltersPackage * @generated */ -public class FiltersSwitch<T> extends Switch<T> -{ +public class FiltersSwitch<T> extends Switch<T> { /** * The cached model package * <!-- begin-user-doc --> @@ -49,10 +48,8 @@ public class FiltersSwitch<T> extends Switch<T> * * @generated */ - public FiltersSwitch() - { - if (modelPackage == null) - { + public FiltersSwitch() { + if (modelPackage == null) { modelPackage = FiltersPackage.eINSTANCE; } } @@ -62,13 +59,13 @@ public class FiltersSwitch<T> extends Switch<T> * <!-- begin-user-doc --> * <!-- end-user-doc --> * - * @parameter ePackage the package in question. + * @param ePackage + * the package in question. * @return whether this is a switch for the given package. * @generated */ @Override - protected boolean isSwitchFor(EPackage ePackage) - { + protected boolean isSwitchFor(EPackage ePackage) { return ePackage == modelPackage; } @@ -81,10 +78,8 @@ public class FiltersSwitch<T> extends Switch<T> * @generated */ @Override - protected T doSwitch(int classifierID, EObject theEObject) - { - switch (classifierID) - { + protected T doSwitch(int classifierID, EObject theEObject) { + switch (classifierID) { case FiltersPackage.COMPOUND_FILTER: { CompoundFilter compoundFilter = (CompoundFilter) theEObject; T result = caseCompoundFilter(compoundFilter); @@ -115,6 +110,14 @@ public class FiltersSwitch<T> extends Switch<T> } return result; } + case FiltersPackage.FILTERED_ELEMENT: { + FilteredElement filteredElement = (FilteredElement) theEObject; + T result = caseFilteredElement(filteredElement); + if (result == null) { + result = defaultCase(theEObject); + } + return result; + } default: return defaultCase(theEObject); } @@ -133,8 +136,7 @@ public class FiltersSwitch<T> extends Switch<T> * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseCompoundFilter(CompoundFilter object) - { + public T caseCompoundFilter(CompoundFilter object) { return null; } @@ -151,8 +153,7 @@ public class FiltersSwitch<T> extends Switch<T> * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseFilter(Filter object) - { + public T caseFilter(Filter object) { return null; } @@ -169,8 +170,25 @@ public class FiltersSwitch<T> extends Switch<T> * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseEquals(Equals object) - { + public T caseEquals(Equals object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of '<em>Filtered Element</em>'. + * <!-- begin-user-doc --> + * This implementation returns null; + * returning a non-null result will terminate the switch. + * <!-- end-user-doc --> + * + * @param object + * the target of the switch. + * @return the result of interpreting the object as an instance of '<em>Filtered Element</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + * @since 1.3 + */ + public T caseFilteredElement(FilteredElement object) { return null; } @@ -188,8 +206,7 @@ public class FiltersSwitch<T> extends Switch<T> * @generated */ @Override - public T defaultCase(EObject object) - { + public T defaultCase(EObject object) { return null; } diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/util/FiltersValidator.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/util/FiltersValidator.java index 9b28bde6595..0fdafb97d0b 100644 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/util/FiltersValidator.java +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/util/FiltersValidator.java @@ -17,6 +17,7 @@ import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.ResourceLocator; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.util.EObjectValidator; +import org.eclipse.papyrus.infra.filters.*; import org.eclipse.papyrus.infra.filters.CompoundFilter; import org.eclipse.papyrus.infra.filters.Equals; import org.eclipse.papyrus.infra.filters.Filter; @@ -32,8 +33,7 @@ import org.eclipse.papyrus.infra.filters.internal.FiltersPlugin; * @see org.eclipse.papyrus.infra.filters.FiltersPackage * @generated */ -public class FiltersValidator extends EObjectValidator -{ +public class FiltersValidator extends EObjectValidator { /** * The cached model package * <!-- begin-user-doc --> @@ -88,8 +88,7 @@ public class FiltersValidator extends EObjectValidator * * @generated */ - public FiltersValidator() - { + public FiltersValidator() { super(); } @@ -101,8 +100,7 @@ public class FiltersValidator extends EObjectValidator * @generated */ @Override - protected EPackage getEPackage() - { + protected EPackage getEPackage() { return FiltersPackage.eINSTANCE; } @@ -114,16 +112,16 @@ public class FiltersValidator extends EObjectValidator * @generated */ @Override - protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context) - { - switch (classifierID) - { + protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context) { + switch (classifierID) { case FiltersPackage.COMPOUND_FILTER: return validateCompoundFilter((CompoundFilter) value, diagnostics, context); case FiltersPackage.FILTER: return validateFilter((Filter) value, diagnostics, context); case FiltersPackage.EQUALS: return validateEquals((Equals) value, diagnostics, context); + case FiltersPackage.FILTERED_ELEMENT: + return validateFilteredElement((FilteredElement) value, diagnostics, context); case FiltersPackage.OPERATOR_KIND: return validateOperatorKind((OperatorKind) value, diagnostics, context); case FiltersPackage.OBJECT: @@ -139,8 +137,7 @@ public class FiltersValidator extends EObjectValidator * * @generated */ - public boolean validateCompoundFilter(CompoundFilter compoundFilter, DiagnosticChain diagnostics, Map<Object, Object> context) - { + public boolean validateCompoundFilter(CompoundFilter compoundFilter, DiagnosticChain diagnostics, Map<Object, Object> context) { if (!validate_NoCircularContainment(compoundFilter, diagnostics, context)) { return false; } @@ -179,8 +176,7 @@ public class FiltersValidator extends EObjectValidator * * @generated */ - public boolean validateCompoundFilter_validateAcyclic(CompoundFilter compoundFilter, DiagnosticChain diagnostics, Map<Object, Object> context) - { + public boolean validateCompoundFilter_validateAcyclic(CompoundFilter compoundFilter, DiagnosticChain diagnostics, Map<Object, Object> context) { return compoundFilter.validateAcyclic(diagnostics, context); } @@ -190,8 +186,7 @@ public class FiltersValidator extends EObjectValidator * * @generated */ - public boolean validateFilter(Filter filter, DiagnosticChain diagnostics, Map<Object, Object> context) - { + public boolean validateFilter(Filter filter, DiagnosticChain diagnostics, Map<Object, Object> context) { return validate_EveryDefaultConstraint(filter, diagnostics, context); } @@ -201,8 +196,7 @@ public class FiltersValidator extends EObjectValidator * * @generated */ - public boolean validateEquals(Equals equals, DiagnosticChain diagnostics, Map<Object, Object> context) - { + public boolean validateEquals(Equals equals, DiagnosticChain diagnostics, Map<Object, Object> context) { return validate_EveryDefaultConstraint(equals, diagnostics, context); } @@ -211,9 +205,19 @@ public class FiltersValidator extends EObjectValidator * <!-- end-user-doc --> * * @generated + * @since 1.3 */ - public boolean validateOperatorKind(OperatorKind operatorKind, DiagnosticChain diagnostics, Map<Object, Object> context) - { + public boolean validateFilteredElement(FilteredElement filteredElement, DiagnosticChain diagnostics, Map<Object, Object> context) { + return validate_EveryDefaultConstraint(filteredElement, diagnostics, context); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + public boolean validateOperatorKind(OperatorKind operatorKind, DiagnosticChain diagnostics, Map<Object, Object> context) { return true; } @@ -223,8 +227,7 @@ public class FiltersValidator extends EObjectValidator * * @generated */ - public boolean validateObject(Object object, DiagnosticChain diagnostics, Map<Object, Object> context) - { + public boolean validateObject(Object object, DiagnosticChain diagnostics, Map<Object, Object> context) { return true; } @@ -236,8 +239,7 @@ public class FiltersValidator extends EObjectValidator * @generated NOT */ @Override - public ResourceLocator getResourceLocator() - { + public ResourceLocator getResourceLocator() { return FiltersPlugin.INSTANCE; } diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/provider/AssistantEditPlugin.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/provider/AssistantEditPlugin.java index 43053de6066..aabf9681944 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/provider/AssistantEditPlugin.java +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/provider/AssistantEditPlugin.java @@ -54,8 +54,7 @@ public final class AssistantEditPlugin extends EMFPlugin { * @generated */ public AssistantEditPlugin() { - super(new ResourceLocator[] - { + super(new ResourceLocator[] { EcoreEditPlugin.INSTANCE, FiltersEditPlugin.INSTANCE, }); diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/provider/AssistantItemProvider.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/provider/AssistantItemProvider.java index 7ca3f77887b..93ccf93467b 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/provider/AssistantItemProvider.java +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/provider/AssistantItemProvider.java @@ -64,8 +64,7 @@ public class AssistantItemProvider extends ItemProviderAdapter implements IEditi */ @Override public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) - { + if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); addElementTypeIDPropertyDescriptor(object); @@ -83,19 +82,17 @@ public class AssistantItemProvider extends ItemProviderAdapter implements IEditi * @generated */ protected void addElementTypeIDPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Assistant_elementTypeID_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_Assistant_elementTypeID_feature", "_UI_Assistant_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - AssistantPackage.Literals.ASSISTANT__ELEMENT_TYPE_ID, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Assistant_elementTypeID_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_Assistant_elementTypeID_feature", "_UI_Assistant_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + AssistantPackage.Literals.ASSISTANT__ELEMENT_TYPE_ID, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); } /** @@ -106,20 +103,19 @@ public class AssistantItemProvider extends ItemProviderAdapter implements IEditi * @generated */ protected void addElementTypePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Assistant_elementType_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_Assistant_elementType_feature", "_UI_Assistant_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - AssistantPackage.Literals.ASSISTANT__ELEMENT_TYPE, - false, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - new String[] { "org.eclipse.ui.views.properties.expert" //$NON-NLS-1$ - })); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Assistant_elementType_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_Assistant_elementType_feature", "_UI_Assistant_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + AssistantPackage.Literals.ASSISTANT__ELEMENT_TYPE, + false, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + new String[] { + "org.eclipse.ui.views.properties.expert" //$NON-NLS-1$ + })); } /** @@ -129,21 +125,18 @@ public class AssistantItemProvider extends ItemProviderAdapter implements IEditi * * @generated */ - protected void addProviderPropertyDescriptor(Object object) - { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Assistant_provider_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_Assistant_provider_feature", "_UI_Assistant_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - AssistantPackage.Literals.ASSISTANT__PROVIDER, - false, - false, - true, - null, - null, - null)); + protected void addProviderPropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Assistant_provider_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_Assistant_provider_feature", "_UI_Assistant_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + AssistantPackage.Literals.ASSISTANT__PROVIDER, + false, + false, + true, + null, + null, + null)); } /** @@ -153,8 +146,7 @@ public class AssistantItemProvider extends ItemProviderAdapter implements IEditi * @generated */ @Override - protected boolean shouldComposeCreationImage() - { + protected boolean shouldComposeCreationImage() { return true; } @@ -168,8 +160,7 @@ public class AssistantItemProvider extends ItemProviderAdapter implements IEditi @Override public String getText(Object object) { String label = ((Assistant) object).getElementTypeID(); - return label == null || label.length() == 0 ? - getString("_UI_Assistant_type") : //$NON-NLS-1$ + return label == null || label.length() == 0 ? getString("_UI_Assistant_type") : //$NON-NLS-1$ getString("_UI_Assistant_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ } @@ -186,8 +177,7 @@ public class AssistantItemProvider extends ItemProviderAdapter implements IEditi public void notifyChanged(Notification notification) { updateChildren(notification); - switch (notification.getFeatureID(Assistant.class)) - { + switch (notification.getFeatureID(Assistant.class)) { case AssistantPackage.ASSISTANT__ELEMENT_TYPE_ID: case AssistantPackage.ASSISTANT__ELEMENT_TYPE: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/provider/AssistantItemProviderAdapterFactory.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/provider/AssistantItemProviderAdapterFactory.java index 1fbb703547d..1a851279e1e 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/provider/AssistantItemProviderAdapterFactory.java +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/provider/AssistantItemProviderAdapterFactory.java @@ -42,6 +42,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.papyrus.infra.filters.CompoundFilter; +import org.eclipse.papyrus.infra.filters.FilteredElement; import org.eclipse.papyrus.infra.filters.FiltersPackage; import org.eclipse.papyrus.infra.filters.util.FiltersSwitch; @@ -97,7 +98,7 @@ public class AssistantItemProviderAdapterFactory extends AssistantAdapterFactory * * @generated */ - protected Collection<Object> supportedTypes = new ArrayList<Object>(); + protected Collection<Object> supportedTypes = new ArrayList<>(); /** * This constructs an instance. @@ -131,10 +132,8 @@ public class AssistantItemProviderAdapterFactory extends AssistantAdapterFactory * @generated */ @Override - public Adapter createAssistedElementTypeFilterAdapter() - { - if (assistedElementTypeFilterItemProvider == null) - { + public Adapter createAssistedElementTypeFilterAdapter() { + if (assistedElementTypeFilterItemProvider == null) { assistedElementTypeFilterItemProvider = new AssistedElementTypeFilterItemProvider(this); } @@ -159,8 +158,7 @@ public class AssistantItemProviderAdapterFactory extends AssistantAdapterFactory */ @Override public Adapter createConnectionAssistantAdapter() { - if (connectionAssistantItemProvider == null) - { + if (connectionAssistantItemProvider == null) { connectionAssistantItemProvider = new ConnectionAssistantItemProvider(this); } @@ -185,8 +183,7 @@ public class AssistantItemProviderAdapterFactory extends AssistantAdapterFactory */ @Override public Adapter createPopupAssistantAdapter() { - if (popupAssistantItemProvider == null) - { + if (popupAssistantItemProvider == null) { popupAssistantItemProvider = new PopupAssistantItemProvider(this); } @@ -211,8 +208,7 @@ public class AssistantItemProviderAdapterFactory extends AssistantAdapterFactory */ @Override public Adapter createElementTypeFilterAdapter() { - if (elementTypeFilterItemProvider == null) - { + if (elementTypeFilterItemProvider == null) { elementTypeFilterItemProvider = new ElementTypeFilterItemProvider(this); } @@ -237,8 +233,7 @@ public class AssistantItemProviderAdapterFactory extends AssistantAdapterFactory */ @Override public Adapter createModelingAssistantProviderAdapter() { - if (modelingAssistantProviderItemProvider == null) - { + if (modelingAssistantProviderItemProvider == null) { modelingAssistantProviderItemProvider = new ModelingAssistantProviderItemProvider(this); } @@ -300,11 +295,9 @@ public class AssistantItemProviderAdapterFactory extends AssistantAdapterFactory */ @Override public Object adapt(Object object, Object type) { - if (isFactoryForType(type)) - { + if (isFactoryForType(type)) { Object adapter = super.adapt(object, type); - if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) - { + if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) { return adapter; } } @@ -318,8 +311,7 @@ public class AssistantItemProviderAdapterFactory extends AssistantAdapterFactory * * @generated */ - public List<IChildCreationExtender> getChildCreationExtenders() - { + public List<IChildCreationExtender> getChildCreationExtenders() { return childCreationExtenderManager.getChildCreationExtenders(); } @@ -330,8 +322,7 @@ public class AssistantItemProviderAdapterFactory extends AssistantAdapterFactory * @generated */ @Override - public Collection<?> getNewChildDescriptors(Object object, EditingDomain editingDomain) - { + public Collection<?> getNewChildDescriptors(Object object, EditingDomain editingDomain) { return childCreationExtenderManager.getNewChildDescriptors(object, editingDomain); } @@ -342,8 +333,7 @@ public class AssistantItemProviderAdapterFactory extends AssistantAdapterFactory * @generated */ @Override - public ResourceLocator getResourceLocator() - { + public ResourceLocator getResourceLocator() { return childCreationExtenderManager; } @@ -382,8 +372,7 @@ public class AssistantItemProviderAdapterFactory extends AssistantAdapterFactory public void fireNotifyChanged(Notification notification) { changeNotifier.fireNotifyChanged(notification); - if (parentAdapterFactory != null) - { + if (parentAdapterFactory != null) { parentAdapterFactory.fireNotifyChanged(notification); } } @@ -469,17 +458,29 @@ public class AssistantItemProviderAdapterFactory extends AssistantAdapterFactory * @generated */ @Override - public Object caseCompoundFilter(CompoundFilter object) - { - newChildDescriptors.add - (createChildParameter - (FiltersPackage.Literals.COMPOUND_FILTER__OWNED_FILTER, - AssistantFactory.eINSTANCE.createAssistedElementTypeFilter())); - - newChildDescriptors.add - (createChildParameter - (FiltersPackage.Literals.COMPOUND_FILTER__OWNED_FILTER, - AssistantFactory.eINSTANCE.createElementTypeFilter())); + public Object caseCompoundFilter(CompoundFilter object) { + newChildDescriptors.add(createChildParameter(FiltersPackage.Literals.COMPOUND_FILTER__OWNED_FILTER, + AssistantFactory.eINSTANCE.createAssistedElementTypeFilter())); + + newChildDescriptors.add(createChildParameter(FiltersPackage.Literals.COMPOUND_FILTER__OWNED_FILTER, + AssistantFactory.eINSTANCE.createElementTypeFilter())); + + return null; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + public Object caseFilteredElement(FilteredElement object) { + newChildDescriptors.add(createChildParameter(FiltersPackage.Literals.FILTERED_ELEMENT__FILTER, + AssistantFactory.eINSTANCE.createAssistedElementTypeFilter())); + + newChildDescriptors.add(createChildParameter(FiltersPackage.Literals.FILTERED_ELEMENT__FILTER, + AssistantFactory.eINSTANCE.createElementTypeFilter())); return null; } @@ -504,7 +505,7 @@ public class AssistantItemProviderAdapterFactory extends AssistantAdapterFactory */ @Override public Collection<Object> getNewChildDescriptors(Object object, EditingDomain editingDomain) { - ArrayList<Object> result = new ArrayList<Object>(); + ArrayList<Object> result = new ArrayList<>(); new CreationSwitch(result, editingDomain).doSwitch((EObject) object); return result; } diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/provider/AssistedElementTypeFilterItemProvider.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/provider/AssistedElementTypeFilterItemProvider.java index 87e70cbd0ae..629acda0c76 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/provider/AssistedElementTypeFilterItemProvider.java +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/provider/AssistedElementTypeFilterItemProvider.java @@ -51,8 +51,7 @@ public class AssistedElementTypeFilterItemProvider IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, - IItemPropertySource -{ + IItemPropertySource { /** * This constructs an instance from a factory and a notifier. * <!-- begin-user-doc --> @@ -60,8 +59,7 @@ public class AssistedElementTypeFilterItemProvider * * @generated */ - public AssistedElementTypeFilterItemProvider(AdapterFactory adapterFactory) - { + public AssistedElementTypeFilterItemProvider(AdapterFactory adapterFactory) { super(adapterFactory); } @@ -73,10 +71,8 @@ public class AssistedElementTypeFilterItemProvider * @generated */ @Override - public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) - { - if (itemPropertyDescriptors == null) - { + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { + if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); addNamePropertyDescriptor(object); @@ -92,21 +88,18 @@ public class AssistedElementTypeFilterItemProvider * * @generated */ - protected void addNamePropertyDescriptor(Object object) - { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Filter_name_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_Filter_name_feature", "_UI_Filter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - FiltersPackage.Literals.FILTER__NAME, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); + protected void addNamePropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Filter_name_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_Filter_name_feature", "_UI_Filter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + FiltersPackage.Literals.FILTER__NAME, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); } /** @@ -116,21 +109,18 @@ public class AssistedElementTypeFilterItemProvider * * @generated */ - protected void addProviderPropertyDescriptor(Object object) - { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_AssistedElementTypeFilter_provider_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_AssistedElementTypeFilter_provider_feature", "_UI_AssistedElementTypeFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - AssistantPackage.Literals.ASSISTED_ELEMENT_TYPE_FILTER__PROVIDER, - false, - false, - false, - null, - null, - null)); + protected void addProviderPropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_AssistedElementTypeFilter_provider_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_AssistedElementTypeFilter_provider_feature", "_UI_AssistedElementTypeFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + AssistantPackage.Literals.ASSISTED_ELEMENT_TYPE_FILTER__PROVIDER, + false, + false, + false, + null, + null, + null)); } /** @@ -141,8 +131,7 @@ public class AssistedElementTypeFilterItemProvider * @generated */ @Override - public Object getImage(Object object) - { + public Object getImage(Object object) { return overlayImage(object, getResourceLocator().getImage("full/obj16/AssistedElementTypeFilter")); //$NON-NLS-1$ } @@ -153,8 +142,7 @@ public class AssistedElementTypeFilterItemProvider * @generated */ @Override - protected boolean shouldComposeCreationImage() - { + protected boolean shouldComposeCreationImage() { return true; } @@ -166,11 +154,9 @@ public class AssistedElementTypeFilterItemProvider * @generated */ @Override - public String getText(Object object) - { + public String getText(Object object) { String label = ((AssistedElementTypeFilter) object).getName(); - return label == null || label.length() == 0 ? - getString("_UI_AssistedElementTypeFilter_type") : //$NON-NLS-1$ + return label == null || label.length() == 0 ? getString("_UI_AssistedElementTypeFilter_type") : //$NON-NLS-1$ getString("_UI_AssistedElementTypeFilter_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ } @@ -184,12 +170,10 @@ public class AssistedElementTypeFilterItemProvider * @generated */ @Override - public void notifyChanged(Notification notification) - { + public void notifyChanged(Notification notification) { updateChildren(notification); - switch (notification.getFeatureID(AssistedElementTypeFilter.class)) - { + switch (notification.getFeatureID(AssistedElementTypeFilter.class)) { case AssistantPackage.ASSISTED_ELEMENT_TYPE_FILTER__NAME: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); return; @@ -206,8 +190,7 @@ public class AssistedElementTypeFilterItemProvider * @generated */ @Override - protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) - { + protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); } @@ -219,8 +202,7 @@ public class AssistedElementTypeFilterItemProvider * @generated */ @Override - public ResourceLocator getResourceLocator() - { + public ResourceLocator getResourceLocator() { return ((IChildCreationExtender) adapterFactory).getResourceLocator(); } diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/provider/ConnectionAssistantItemProvider.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/provider/ConnectionAssistantItemProvider.java index 0b644d6e103..6fdbea2a8af 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/provider/ConnectionAssistantItemProvider.java +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/provider/ConnectionAssistantItemProvider.java @@ -62,8 +62,7 @@ public class ConnectionAssistantItemProvider extends AssistantItemProvider { */ @Override public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) - { + if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); addSourceFilterPropertyDescriptor(object); @@ -80,32 +79,30 @@ public class ConnectionAssistantItemProvider extends AssistantItemProvider { * @generated NOT */ protected void addSourceFilterPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (new ItemPropertyDescriptor - (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ConnectionAssistant_sourceFilter_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ConnectionAssistant_sourceFilter_feature", "_UI_ConnectionAssistant_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - AssistantPackage.Literals.CONNECTION_ASSISTANT__SOURCE_FILTER, - true, - false, - true, - null, - null, - null) { - @Override - public Collection<?> getChoiceOfValues(Object object) { - Set<Object> result = new HashSet<>(); - ConnectionAssistant self = (ConnectionAssistant) object; - - if (self.getProvider() != null) { - result.addAll(self.getProvider().getOwnedFilters()); - } - result.remove(self.getSourceFilter()); - - return result; - } - }); + itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_ConnectionAssistant_sourceFilter_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_ConnectionAssistant_sourceFilter_feature", "_UI_ConnectionAssistant_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + AssistantPackage.Literals.CONNECTION_ASSISTANT__SOURCE_FILTER, + true, + false, + true, + null, + null, + null) { + @Override + public Collection<?> getChoiceOfValues(Object object) { + Set<Object> result = new HashSet<>(); + ConnectionAssistant self = (ConnectionAssistant) object; + + if (self.getProvider() != null) { + result.addAll(self.getProvider().getOwnedFilters()); + } + result.remove(self.getSourceFilter()); + + return result; + } + }); } /** @@ -116,36 +113,35 @@ public class ConnectionAssistantItemProvider extends AssistantItemProvider { * @generated NOT */ protected void addTargetFilterPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (new ItemPropertyDescriptor - (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ConnectionAssistant_targetFilter_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ConnectionAssistant_targetFilter_feature", "_UI_ConnectionAssistant_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - AssistantPackage.Literals.CONNECTION_ASSISTANT__TARGET_FILTER, - true, - false, - true, - null, - null, - null) { - @Override - public Collection<?> getChoiceOfValues(Object object) { - Set<Object> result = new HashSet<>(); - ConnectionAssistant self = (ConnectionAssistant) object; - - if (self.getProvider() != null) { - result.addAll(self.getProvider().getOwnedFilters()); - } - result.remove(self.getTargetFilter()); - - return result; - } - }); + itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_ConnectionAssistant_targetFilter_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_ConnectionAssistant_targetFilter_feature", "_UI_ConnectionAssistant_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + AssistantPackage.Literals.CONNECTION_ASSISTANT__TARGET_FILTER, + true, + false, + true, + null, + null, + null) { + @Override + public Collection<?> getChoiceOfValues(Object object) { + Set<Object> result = new HashSet<>(); + ConnectionAssistant self = (ConnectionAssistant) object; + + if (self.getProvider() != null) { + result.addAll(self.getProvider().getOwnedFilters()); + } + result.remove(self.getTargetFilter()); + + return result; + } + }); } /** - * 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 + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -154,8 +150,7 @@ public class ConnectionAssistantItemProvider extends AssistantItemProvider { */ @Override public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) { - if (childrenFeatures == null) - { + if (childrenFeatures == null) { super.getChildrenFeatures(object); childrenFeatures.add(AssistantPackage.Literals.CONNECTION_ASSISTANT__OWNED_SOURCE_FILTER); childrenFeatures.add(AssistantPackage.Literals.CONNECTION_ASSISTANT__OWNED_TARGET_FILTER); @@ -196,8 +191,7 @@ public class ConnectionAssistantItemProvider extends AssistantItemProvider { * @generated */ @Override - protected boolean shouldComposeCreationImage() - { + protected boolean shouldComposeCreationImage() { return true; } @@ -211,8 +205,7 @@ public class ConnectionAssistantItemProvider extends AssistantItemProvider { @Override public String getText(Object object) { String label = ((ConnectionAssistant) object).getElementTypeID(); - return label == null || label.length() == 0 ? - getString("_UI_ConnectionAssistant_type") : //$NON-NLS-1$ + return label == null || label.length() == 0 ? getString("_UI_ConnectionAssistant_type") : //$NON-NLS-1$ getString("_UI_ConnectionAssistant_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ } @@ -229,8 +222,7 @@ public class ConnectionAssistantItemProvider extends AssistantItemProvider { public void notifyChanged(Notification notification) { updateChildren(notification); - switch (notification.getFeatureID(ConnectionAssistant.class)) - { + switch (notification.getFeatureID(ConnectionAssistant.class)) { case AssistantPackage.CONNECTION_ASSISTANT__OWNED_SOURCE_FILTER: case AssistantPackage.CONNECTION_ASSISTANT__OWNED_TARGET_FILTER: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); @@ -251,45 +243,29 @@ public class ConnectionAssistantItemProvider extends AssistantItemProvider { protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add - (createChildParameter - (AssistantPackage.Literals.CONNECTION_ASSISTANT__OWNED_SOURCE_FILTER, - AssistantFactory.eINSTANCE.createAssistedElementTypeFilter())); - - newChildDescriptors.add - (createChildParameter - (AssistantPackage.Literals.CONNECTION_ASSISTANT__OWNED_SOURCE_FILTER, - AssistantFactory.eINSTANCE.createElementTypeFilter())); - - newChildDescriptors.add - (createChildParameter - (AssistantPackage.Literals.CONNECTION_ASSISTANT__OWNED_SOURCE_FILTER, - FiltersFactory.eINSTANCE.createCompoundFilter())); - - newChildDescriptors.add - (createChildParameter - (AssistantPackage.Literals.CONNECTION_ASSISTANT__OWNED_SOURCE_FILTER, - FiltersFactory.eINSTANCE.createEquals())); - - newChildDescriptors.add - (createChildParameter - (AssistantPackage.Literals.CONNECTION_ASSISTANT__OWNED_TARGET_FILTER, - AssistantFactory.eINSTANCE.createAssistedElementTypeFilter())); - - newChildDescriptors.add - (createChildParameter - (AssistantPackage.Literals.CONNECTION_ASSISTANT__OWNED_TARGET_FILTER, - AssistantFactory.eINSTANCE.createElementTypeFilter())); - - newChildDescriptors.add - (createChildParameter - (AssistantPackage.Literals.CONNECTION_ASSISTANT__OWNED_TARGET_FILTER, - FiltersFactory.eINSTANCE.createCompoundFilter())); - - newChildDescriptors.add - (createChildParameter - (AssistantPackage.Literals.CONNECTION_ASSISTANT__OWNED_TARGET_FILTER, - FiltersFactory.eINSTANCE.createEquals())); + newChildDescriptors.add(createChildParameter(AssistantPackage.Literals.CONNECTION_ASSISTANT__OWNED_SOURCE_FILTER, + AssistantFactory.eINSTANCE.createAssistedElementTypeFilter())); + + newChildDescriptors.add(createChildParameter(AssistantPackage.Literals.CONNECTION_ASSISTANT__OWNED_SOURCE_FILTER, + AssistantFactory.eINSTANCE.createElementTypeFilter())); + + newChildDescriptors.add(createChildParameter(AssistantPackage.Literals.CONNECTION_ASSISTANT__OWNED_SOURCE_FILTER, + FiltersFactory.eINSTANCE.createCompoundFilter())); + + newChildDescriptors.add(createChildParameter(AssistantPackage.Literals.CONNECTION_ASSISTANT__OWNED_SOURCE_FILTER, + FiltersFactory.eINSTANCE.createEquals())); + + newChildDescriptors.add(createChildParameter(AssistantPackage.Literals.CONNECTION_ASSISTANT__OWNED_TARGET_FILTER, + AssistantFactory.eINSTANCE.createAssistedElementTypeFilter())); + + newChildDescriptors.add(createChildParameter(AssistantPackage.Literals.CONNECTION_ASSISTANT__OWNED_TARGET_FILTER, + AssistantFactory.eINSTANCE.createElementTypeFilter())); + + newChildDescriptors.add(createChildParameter(AssistantPackage.Literals.CONNECTION_ASSISTANT__OWNED_TARGET_FILTER, + FiltersFactory.eINSTANCE.createCompoundFilter())); + + newChildDescriptors.add(createChildParameter(AssistantPackage.Literals.CONNECTION_ASSISTANT__OWNED_TARGET_FILTER, + FiltersFactory.eINSTANCE.createEquals())); } /** @@ -304,12 +280,10 @@ public class ConnectionAssistantItemProvider extends AssistantItemProvider { Object childFeature = feature; Object childObject = child; - boolean qualify = - childFeature == AssistantPackage.Literals.CONNECTION_ASSISTANT__OWNED_SOURCE_FILTER || - childFeature == AssistantPackage.Literals.CONNECTION_ASSISTANT__OWNED_TARGET_FILTER; + boolean qualify = childFeature == AssistantPackage.Literals.CONNECTION_ASSISTANT__OWNED_SOURCE_FILTER || + childFeature == AssistantPackage.Literals.CONNECTION_ASSISTANT__OWNED_TARGET_FILTER; - if (qualify) - { + if (qualify) { return getString("_UI_CreateChild_text2", //$NON-NLS-1$ new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); } diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/provider/ElementTypeFilterItemProvider.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/provider/ElementTypeFilterItemProvider.java index 53661e7e09a..2ebcaa9d395 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/provider/ElementTypeFilterItemProvider.java +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/provider/ElementTypeFilterItemProvider.java @@ -61,8 +61,7 @@ public class ElementTypeFilterItemProvider extends ItemProviderAdapter implement */ @Override public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) - { + if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); addNamePropertyDescriptor(object); @@ -80,21 +79,18 @@ public class ElementTypeFilterItemProvider extends ItemProviderAdapter implement * * @generated */ - protected void addNamePropertyDescriptor(Object object) - { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Filter_name_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_Filter_name_feature", "_UI_Filter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - FiltersPackage.Literals.FILTER__NAME, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); + protected void addNamePropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Filter_name_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_Filter_name_feature", "_UI_Filter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + FiltersPackage.Literals.FILTER__NAME, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); } /** @@ -105,19 +101,17 @@ public class ElementTypeFilterItemProvider extends ItemProviderAdapter implement * @generated */ protected void addElementTypeIDPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ElementTypeFilter_elementTypeID_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ElementTypeFilter_elementTypeID_feature", "_UI_ElementTypeFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - AssistantPackage.Literals.ELEMENT_TYPE_FILTER__ELEMENT_TYPE_ID, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_ElementTypeFilter_elementTypeID_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_ElementTypeFilter_elementTypeID_feature", "_UI_ElementTypeFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + AssistantPackage.Literals.ELEMENT_TYPE_FILTER__ELEMENT_TYPE_ID, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); } /** @@ -128,20 +122,19 @@ public class ElementTypeFilterItemProvider extends ItemProviderAdapter implement * @generated */ protected void addElementTypePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ElementTypeFilter_elementType_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ElementTypeFilter_elementType_feature", "_UI_ElementTypeFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - AssistantPackage.Literals.ELEMENT_TYPE_FILTER__ELEMENT_TYPE, - false, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - new String[] { "org.eclipse.ui.views.properties.expert" //$NON-NLS-1$ - })); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_ElementTypeFilter_elementType_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_ElementTypeFilter_elementType_feature", "_UI_ElementTypeFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + AssistantPackage.Literals.ELEMENT_TYPE_FILTER__ELEMENT_TYPE, + false, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + new String[] { + "org.eclipse.ui.views.properties.expert" //$NON-NLS-1$ + })); } /** @@ -151,21 +144,18 @@ public class ElementTypeFilterItemProvider extends ItemProviderAdapter implement * * @generated */ - protected void addProviderPropertyDescriptor(Object object) - { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ElementTypeFilter_provider_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ElementTypeFilter_provider_feature", "_UI_ElementTypeFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - AssistantPackage.Literals.ELEMENT_TYPE_FILTER__PROVIDER, - false, - false, - false, - null, - null, - null)); + protected void addProviderPropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_ElementTypeFilter_provider_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_ElementTypeFilter_provider_feature", "_UI_ElementTypeFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + AssistantPackage.Literals.ELEMENT_TYPE_FILTER__PROVIDER, + false, + false, + false, + null, + null, + null)); } /** @@ -187,8 +177,7 @@ public class ElementTypeFilterItemProvider extends ItemProviderAdapter implement * @generated */ @Override - protected boolean shouldComposeCreationImage() - { + protected boolean shouldComposeCreationImage() { return true; } @@ -202,8 +191,7 @@ public class ElementTypeFilterItemProvider extends ItemProviderAdapter implement @Override public String getText(Object object) { String label = ((ElementTypeFilter) object).getName(); - return label == null || label.length() == 0 ? - getString("_UI_ElementTypeFilter_type") : //$NON-NLS-1$ + return label == null || label.length() == 0 ? getString("_UI_ElementTypeFilter_type") : //$NON-NLS-1$ getString("_UI_ElementTypeFilter_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ } @@ -220,8 +208,7 @@ public class ElementTypeFilterItemProvider extends ItemProviderAdapter implement public void notifyChanged(Notification notification) { updateChildren(notification); - switch (notification.getFeatureID(ElementTypeFilter.class)) - { + switch (notification.getFeatureID(ElementTypeFilter.class)) { case AssistantPackage.ELEMENT_TYPE_FILTER__NAME: case AssistantPackage.ELEMENT_TYPE_FILTER__ELEMENT_TYPE_ID: case AssistantPackage.ELEMENT_TYPE_FILTER__ELEMENT_TYPE: diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/provider/ModelingAssistantProviderItemProvider.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/provider/ModelingAssistantProviderItemProvider.java index b39ad8e6d30..acc35b7de7d 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/provider/ModelingAssistantProviderItemProvider.java +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/provider/ModelingAssistantProviderItemProvider.java @@ -75,8 +75,7 @@ public class ModelingAssistantProviderItemProvider extends ItemProviderAdapter i */ @Override public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) - { + if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); addNamePropertyDescriptor(object); @@ -100,21 +99,18 @@ public class ModelingAssistantProviderItemProvider extends ItemProviderAdapter i * * @generated */ - protected void addNamePropertyDescriptor(Object object) - { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ModelingAssistantProvider_name_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ModelingAssistantProvider_name_feature", "_UI_ModelingAssistantProvider_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__NAME, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); + protected void addNamePropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_ModelingAssistantProvider_name_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_ModelingAssistantProvider_name_feature", "_UI_ModelingAssistantProvider_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__NAME, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); } /** @@ -124,21 +120,18 @@ public class ModelingAssistantProviderItemProvider extends ItemProviderAdapter i * * @generated */ - protected void addAssistantPropertyDescriptor(Object object) - { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ModelingAssistantProvider_assistant_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ModelingAssistantProvider_assistant_feature", "_UI_ModelingAssistantProvider_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__ASSISTANT, - false, - false, - false, - null, - null, - null)); + protected void addAssistantPropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_ModelingAssistantProvider_assistant_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_ModelingAssistantProvider_assistant_feature", "_UI_ModelingAssistantProvider_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__ASSISTANT, + false, + false, + false, + null, + null, + null)); } /** @@ -149,20 +142,19 @@ public class ModelingAssistantProviderItemProvider extends ItemProviderAdapter i * @generated */ protected void addElementTypePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ModelingAssistantProvider_elementType_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ModelingAssistantProvider_elementType_feature", "_UI_ModelingAssistantProvider_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__ELEMENT_TYPE, - false, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - new String[] { "org.eclipse.ui.views.properties.expert" //$NON-NLS-1$ - })); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_ModelingAssistantProvider_elementType_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_ModelingAssistantProvider_elementType_feature", "_UI_ModelingAssistantProvider_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__ELEMENT_TYPE, + false, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + new String[] { + "org.eclipse.ui.views.properties.expert" //$NON-NLS-1$ + })); } /** @@ -173,19 +165,17 @@ public class ModelingAssistantProviderItemProvider extends ItemProviderAdapter i * @generated */ protected void addElementTypeIDPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ModelingAssistantProvider_elementTypeID_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ModelingAssistantProvider_elementTypeID_feature", "_UI_ModelingAssistantProvider_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__ELEMENT_TYPE_ID, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_ModelingAssistantProvider_elementTypeID_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_ModelingAssistantProvider_elementTypeID_feature", "_UI_ModelingAssistantProvider_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__ELEMENT_TYPE_ID, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); } /** @@ -195,46 +185,43 @@ public class ModelingAssistantProviderItemProvider extends ItemProviderAdapter i * * @generated NOT */ - protected void addClientContextPropertyDescriptor(Object object) - { - itemPropertyDescriptors.add - (new ItemPropertyDescriptor - (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ModelingAssistantProvider_clientContext_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ModelingAssistantProvider_clientContext_feature", "_UI_ModelingAssistantProvider_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__CLIENT_CONTEXT, - true, - false, - true, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - new String[] { "org.eclipse.ui.views.properties.expert" //$NON-NLS-1$ - }) { - - @Override - public Collection<?> getChoiceOfValues(Object object) { - return ClientContextManager.getInstance().getClientContexts(); + protected void addClientContextPropertyDescriptor(Object object) { + itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_ModelingAssistantProvider_clientContext_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_ModelingAssistantProvider_clientContext_feature", "_UI_ModelingAssistantProvider_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__CLIENT_CONTEXT, + true, + false, + true, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + new String[] { "org.eclipse.ui.views.properties.expert" //$NON-NLS-1$ + }) { + + @Override + public Collection<?> getChoiceOfValues(Object object) { + return ClientContextManager.getInstance().getClientContexts(); + } + + @Override + public void setPropertyValue(Object object, Object value) { + final EStructuralFeature feature = AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__CLIENT_CONTEXT_ID; + EObject modelingAssistantProvider = (EObject) object; + IClientContext context = (IClientContext) value; + + String newID = (context == null) ? null : context.getId(); + String currentID = (String) modelingAssistantProvider.eGet(feature); + if (!Objects.equals(newID, currentID)) { + EditingDomain editingDomain = getEditingDomain(modelingAssistantProvider); + if (editingDomain == null) { + modelingAssistantProvider.eSet(feature, newID); + } else { + editingDomain.getCommandStack().execute(SetCommand.create(editingDomain, object, feature, newID)); } - - @Override - public void setPropertyValue(Object object, Object value) { - final EStructuralFeature feature = AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__CLIENT_CONTEXT_ID; - EObject modelingAssistantProvider = (EObject) object; - IClientContext context = (IClientContext) value; - - String newID = (context == null) ? null : context.getId(); - String currentID = (String) modelingAssistantProvider.eGet(feature); - if (!Objects.equals(newID, currentID)) { - EditingDomain editingDomain = getEditingDomain(modelingAssistantProvider); - if (editingDomain == null) { - modelingAssistantProvider.eSet(feature, newID); - } else { - editingDomain.getCommandStack().execute(SetCommand.create(editingDomain, object, feature, newID)); - } - } - } - }); + } + } + }); } /** @@ -244,21 +231,18 @@ public class ModelingAssistantProviderItemProvider extends ItemProviderAdapter i * * @generated */ - protected void addClientContextIDPropertyDescriptor(Object object) - { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ModelingAssistantProvider_clientContextID_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ModelingAssistantProvider_clientContextID_feature", "_UI_ModelingAssistantProvider_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__CLIENT_CONTEXT_ID, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); + protected void addClientContextIDPropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_ModelingAssistantProvider_clientContextID_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_ModelingAssistantProvider_clientContextID_feature", "_UI_ModelingAssistantProvider_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__CLIENT_CONTEXT_ID, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); } /** @@ -268,22 +252,20 @@ public class ModelingAssistantProviderItemProvider extends ItemProviderAdapter i * * @generated */ - protected void addExcludedElementTypePropertyDescriptor(Object object) - { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ModelingAssistantProvider_excludedElementType_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ModelingAssistantProvider_excludedElementType_feature", "_UI_ModelingAssistantProvider_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__EXCLUDED_ELEMENT_TYPE, - false, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - new String[] { "org.eclipse.ui.views.properties.expert" //$NON-NLS-1$ - })); + protected void addExcludedElementTypePropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_ModelingAssistantProvider_excludedElementType_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_ModelingAssistantProvider_excludedElementType_feature", "_UI_ModelingAssistantProvider_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__EXCLUDED_ELEMENT_TYPE, + false, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + new String[] { + "org.eclipse.ui.views.properties.expert" //$NON-NLS-1$ + })); } /** @@ -293,21 +275,18 @@ public class ModelingAssistantProviderItemProvider extends ItemProviderAdapter i * * @generated */ - protected void addExcludedElementTypeIDPropertyDescriptor(Object object) - { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ModelingAssistantProvider_excludedElementTypeID_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ModelingAssistantProvider_excludedElementTypeID_feature", "_UI_ModelingAssistantProvider_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__EXCLUDED_ELEMENT_TYPE_ID, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); + protected void addExcludedElementTypeIDPropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_ModelingAssistantProvider_excludedElementTypeID_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_ModelingAssistantProvider_excludedElementTypeID_feature", "_UI_ModelingAssistantProvider_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__EXCLUDED_ELEMENT_TYPE_ID, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); } /** @@ -317,22 +296,20 @@ public class ModelingAssistantProviderItemProvider extends ItemProviderAdapter i * * @generated */ - protected void addRelationshipTypePropertyDescriptor(Object object) - { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ModelingAssistantProvider_relationshipType_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ModelingAssistantProvider_relationshipType_feature", "_UI_ModelingAssistantProvider_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__RELATIONSHIP_TYPE, - false, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - new String[] { "org.eclipse.ui.views.properties.expert" //$NON-NLS-1$ - })); + protected void addRelationshipTypePropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_ModelingAssistantProvider_relationshipType_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_ModelingAssistantProvider_relationshipType_feature", "_UI_ModelingAssistantProvider_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__RELATIONSHIP_TYPE, + false, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + new String[] { + "org.eclipse.ui.views.properties.expert" //$NON-NLS-1$ + })); } /** @@ -342,25 +319,23 @@ public class ModelingAssistantProviderItemProvider extends ItemProviderAdapter i * * @generated */ - protected void addRelationshipTypeIDPropertyDescriptor(Object object) - { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ModelingAssistantProvider_relationshipTypeID_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ModelingAssistantProvider_relationshipTypeID_feature", "_UI_ModelingAssistantProvider_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__RELATIONSHIP_TYPE_ID, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); + protected void addRelationshipTypeIDPropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_ModelingAssistantProvider_relationshipTypeID_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_ModelingAssistantProvider_relationshipTypeID_feature", "_UI_ModelingAssistantProvider_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__RELATIONSHIP_TYPE_ID, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + 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 + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -369,8 +344,7 @@ public class ModelingAssistantProviderItemProvider extends ItemProviderAdapter i */ @Override public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) { - if (childrenFeatures == null) - { + if (childrenFeatures == null) { super.getChildrenFeatures(object); childrenFeatures.add(AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__OWNED_FILTER); childrenFeatures.add(AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__POPUP_ASSISTANT); @@ -412,8 +386,7 @@ public class ModelingAssistantProviderItemProvider extends ItemProviderAdapter i * @generated */ @Override - protected boolean shouldComposeCreationImage() - { + protected boolean shouldComposeCreationImage() { return true; } @@ -427,8 +400,7 @@ public class ModelingAssistantProviderItemProvider extends ItemProviderAdapter i @Override public String getText(Object object) { String label = ((ModelingAssistantProvider) object).getName(); - return label == null || label.length() == 0 ? - getString("_UI_ModelingAssistantProvider_type") : //$NON-NLS-1$ + return label == null || label.length() == 0 ? getString("_UI_ModelingAssistantProvider_type") : //$NON-NLS-1$ getString("_UI_ModelingAssistantProvider_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ } @@ -445,8 +417,7 @@ public class ModelingAssistantProviderItemProvider extends ItemProviderAdapter i public void notifyChanged(Notification notification) { updateChildren(notification); - switch (notification.getFeatureID(ModelingAssistantProvider.class)) - { + switch (notification.getFeatureID(ModelingAssistantProvider.class)) { case AssistantPackage.MODELING_ASSISTANT_PROVIDER__NAME: case AssistantPackage.MODELING_ASSISTANT_PROVIDER__ASSISTANT: case AssistantPackage.MODELING_ASSISTANT_PROVIDER__ELEMENT_TYPE: @@ -480,35 +451,23 @@ public class ModelingAssistantProviderItemProvider extends ItemProviderAdapter i protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add - (createChildParameter - (AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__OWNED_FILTER, - AssistantFactory.eINSTANCE.createAssistedElementTypeFilter())); - - newChildDescriptors.add - (createChildParameter - (AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__OWNED_FILTER, - AssistantFactory.eINSTANCE.createElementTypeFilter())); - - newChildDescriptors.add - (createChildParameter - (AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__OWNED_FILTER, - FiltersFactory.eINSTANCE.createCompoundFilter())); - - newChildDescriptors.add - (createChildParameter - (AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__OWNED_FILTER, - FiltersFactory.eINSTANCE.createEquals())); - - newChildDescriptors.add - (createChildParameter - (AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__POPUP_ASSISTANT, - AssistantFactory.eINSTANCE.createPopupAssistant())); - - newChildDescriptors.add - (createChildParameter - (AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__CONNECTION_ASSISTANT, - AssistantFactory.eINSTANCE.createConnectionAssistant())); + newChildDescriptors.add(createChildParameter(AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__OWNED_FILTER, + AssistantFactory.eINSTANCE.createAssistedElementTypeFilter())); + + newChildDescriptors.add(createChildParameter(AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__OWNED_FILTER, + AssistantFactory.eINSTANCE.createElementTypeFilter())); + + newChildDescriptors.add(createChildParameter(AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__OWNED_FILTER, + FiltersFactory.eINSTANCE.createCompoundFilter())); + + newChildDescriptors.add(createChildParameter(AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__OWNED_FILTER, + FiltersFactory.eINSTANCE.createEquals())); + + newChildDescriptors.add(createChildParameter(AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__POPUP_ASSISTANT, + AssistantFactory.eINSTANCE.createPopupAssistant())); + + newChildDescriptors.add(createChildParameter(AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__CONNECTION_ASSISTANT, + AssistantFactory.eINSTANCE.createConnectionAssistant())); } /** diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/provider/PopupAssistantItemProvider.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/provider/PopupAssistantItemProvider.java index ddad278a9c6..ae46ecf566a 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/provider/PopupAssistantItemProvider.java +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/provider/PopupAssistantItemProvider.java @@ -62,8 +62,7 @@ public class PopupAssistantItemProvider extends AssistantItemProvider { */ @Override public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) - { + if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); addFilterPropertyDescriptor(object); @@ -79,36 +78,35 @@ public class PopupAssistantItemProvider extends AssistantItemProvider { * @generated NOT */ protected void addFilterPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (new ItemPropertyDescriptor - (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_PopupAssistant_filter_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_PopupAssistant_filter_feature", "_UI_PopupAssistant_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - AssistantPackage.Literals.POPUP_ASSISTANT__FILTER, - true, - false, - true, - null, - null, - null) { - @Override - public Collection<?> getChoiceOfValues(Object object) { - Set<Object> result = new HashSet<>(); - PopupAssistant self = (PopupAssistant) object; - - if (self.getProvider() != null) { - result.addAll(self.getProvider().getOwnedFilters()); - } - result.remove(self.getFilter()); - - return result; - } - }); + itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_PopupAssistant_filter_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_PopupAssistant_filter_feature", "_UI_PopupAssistant_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + AssistantPackage.Literals.POPUP_ASSISTANT__FILTER, + true, + false, + true, + null, + null, + null) { + @Override + public Collection<?> getChoiceOfValues(Object object) { + Set<Object> result = new HashSet<>(); + PopupAssistant self = (PopupAssistant) object; + + if (self.getProvider() != null) { + result.addAll(self.getProvider().getOwnedFilters()); + } + result.remove(self.getFilter()); + + return result; + } + }); } /** - * 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 + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -117,8 +115,7 @@ public class PopupAssistantItemProvider extends AssistantItemProvider { */ @Override public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) { - if (childrenFeatures == null) - { + if (childrenFeatures == null) { super.getChildrenFeatures(object); childrenFeatures.add(AssistantPackage.Literals.POPUP_ASSISTANT__OWNED_FILTER); } @@ -158,8 +155,7 @@ public class PopupAssistantItemProvider extends AssistantItemProvider { * @generated */ @Override - protected boolean shouldComposeCreationImage() - { + protected boolean shouldComposeCreationImage() { return true; } @@ -173,8 +169,7 @@ public class PopupAssistantItemProvider extends AssistantItemProvider { @Override public String getText(Object object) { String label = ((PopupAssistant) object).getElementTypeID(); - return label == null || label.length() == 0 ? - getString("_UI_PopupAssistant_type") : //$NON-NLS-1$ + return label == null || label.length() == 0 ? getString("_UI_PopupAssistant_type") : //$NON-NLS-1$ getString("_UI_PopupAssistant_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ } @@ -191,8 +186,7 @@ public class PopupAssistantItemProvider extends AssistantItemProvider { public void notifyChanged(Notification notification) { updateChildren(notification); - switch (notification.getFeatureID(PopupAssistant.class)) - { + switch (notification.getFeatureID(PopupAssistant.class)) { case AssistantPackage.POPUP_ASSISTANT__OWNED_FILTER: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); return; @@ -212,25 +206,17 @@ public class PopupAssistantItemProvider extends AssistantItemProvider { protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add - (createChildParameter - (AssistantPackage.Literals.POPUP_ASSISTANT__OWNED_FILTER, - AssistantFactory.eINSTANCE.createAssistedElementTypeFilter())); - - newChildDescriptors.add - (createChildParameter - (AssistantPackage.Literals.POPUP_ASSISTANT__OWNED_FILTER, - AssistantFactory.eINSTANCE.createElementTypeFilter())); - - newChildDescriptors.add - (createChildParameter - (AssistantPackage.Literals.POPUP_ASSISTANT__OWNED_FILTER, - FiltersFactory.eINSTANCE.createCompoundFilter())); - - newChildDescriptors.add - (createChildParameter - (AssistantPackage.Literals.POPUP_ASSISTANT__OWNED_FILTER, - FiltersFactory.eINSTANCE.createEquals())); + newChildDescriptors.add(createChildParameter(AssistantPackage.Literals.POPUP_ASSISTANT__OWNED_FILTER, + AssistantFactory.eINSTANCE.createAssistedElementTypeFilter())); + + newChildDescriptors.add(createChildParameter(AssistantPackage.Literals.POPUP_ASSISTANT__OWNED_FILTER, + AssistantFactory.eINSTANCE.createElementTypeFilter())); + + newChildDescriptors.add(createChildParameter(AssistantPackage.Literals.POPUP_ASSISTANT__OWNED_FILTER, + FiltersFactory.eINSTANCE.createCompoundFilter())); + + newChildDescriptors.add(createChildParameter(AssistantPackage.Literals.POPUP_ASSISTANT__OWNED_FILTER, + FiltersFactory.eINSTANCE.createEquals())); } /** diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/Assistant.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/Assistant.java index b5b880768ac..ce7edc7bde3 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/Assistant.java +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/Assistant.java @@ -33,8 +33,7 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType; * @model abstract="true" * @generated */ -public interface Assistant extends EObject -{ +public interface Assistant extends EObject { /** * Returns the value of the '<em><b>Element Type ID</b></em>' attribute. * <!-- begin-user-doc --> diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/AssistantFactory.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/AssistantFactory.java index 67e8142a459..a9576b7fe4d 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/AssistantFactory.java +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/AssistantFactory.java @@ -22,8 +22,7 @@ import org.eclipse.emf.ecore.EFactory; * @see org.eclipse.papyrus.infra.gmfdiag.assistant.AssistantPackage * @generated */ -public interface AssistantFactory extends EFactory -{ +public interface AssistantFactory extends EFactory { /** * The singleton instance of the factory. * <!-- begin-user-doc --> diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/AssistantPackage.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/AssistantPackage.java index 9a069db6049..374ec143e7c 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/AssistantPackage.java +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/AssistantPackage.java @@ -37,8 +37,7 @@ import org.eclipse.papyrus.infra.filters.FiltersPackage; * @model kind="package" * @generated */ -public interface AssistantPackage extends EPackage -{ +public interface AssistantPackage extends EPackage { /** * The package name. * <!-- begin-user-doc --> @@ -1842,8 +1841,8 @@ public interface AssistantPackage extends EPackage EOperation getIModelingAssistantProvider__GetRelTypesOnTarget__IAdaptable(); /** - * Returns the meta object for the '{@link org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantProvider#getRelTypesOnSourceAndTarget(org.eclipse.core.runtime.IAdaptable, org.eclipse.core.runtime.IAdaptable) - * <em>Get Rel Types On Source And Target</em>}' operation. + * Returns the meta object for the '{@link org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantProvider#getRelTypesOnSourceAndTarget(org.eclipse.core.runtime.IAdaptable, org.eclipse.core.runtime.IAdaptable) <em>Get Rel Types On + * Source And Target</em>}' operation. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @@ -1876,8 +1875,8 @@ public interface AssistantPackage extends EPackage EOperation getIModelingAssistantProvider__GetRelTypesForSREOnSource__IAdaptable(); /** - * Returns the meta object for the '{@link org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantProvider#getTypesForSource(org.eclipse.core.runtime.IAdaptable, org.eclipse.gmf.runtime.emf.type.core.IElementType) - * <em>Get Types For Source</em>}' operation. + * Returns the meta object for the '{@link org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantProvider#getTypesForSource(org.eclipse.core.runtime.IAdaptable, org.eclipse.gmf.runtime.emf.type.core.IElementType) <em>Get Types For + * Source</em>}' operation. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @@ -1888,8 +1887,8 @@ public interface AssistantPackage extends EPackage EOperation getIModelingAssistantProvider__GetTypesForSource__IAdaptable_IElementType(); /** - * Returns the meta object for the '{@link org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantProvider#getTypesForTarget(org.eclipse.core.runtime.IAdaptable, org.eclipse.gmf.runtime.emf.type.core.IElementType) - * <em>Get Types For Target</em>}' operation. + * Returns the meta object for the '{@link org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantProvider#getTypesForTarget(org.eclipse.core.runtime.IAdaptable, org.eclipse.gmf.runtime.emf.type.core.IElementType) <em>Get Types For + * Target</em>}' operation. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @@ -2018,8 +2017,7 @@ public interface AssistantPackage extends EPackage * * @generated */ - interface Literals - { + interface Literals { /** * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.assistant.impl.AssistedElementTypeFilterImpl <em>Assisted Element Type Filter</em>}' class. * <!-- begin-user-doc --> diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/AssistedElementTypeFilter.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/AssistedElementTypeFilter.java index d831904bc1e..1ee67522531 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/AssistedElementTypeFilter.java +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/AssistedElementTypeFilter.java @@ -33,8 +33,7 @@ import org.eclipse.papyrus.infra.filters.Filter; * @model * @generated */ -public interface AssistedElementTypeFilter extends Filter -{ +public interface AssistedElementTypeFilter extends Filter { /** * Returns the value of the '<em><b>Provider</b></em>' reference. * <!-- begin-user-doc --> diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/ConnectionAssistant.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/ConnectionAssistant.java index 302e28f59f1..4fa9fea5f1a 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/ConnectionAssistant.java +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/ConnectionAssistant.java @@ -35,8 +35,7 @@ import org.eclipse.papyrus.infra.filters.Filter; * @model * @generated */ -public interface ConnectionAssistant extends Assistant -{ +public interface ConnectionAssistant extends Assistant { /** * Returns the value of the '<em><b>Owning Provider</b></em>' container reference. * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.gmfdiag.assistant.ModelingAssistantProvider#getConnectionAssistants <em>Connection Assistant</em>}'. diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/ElementTypeFilter.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/ElementTypeFilter.java index 3d40ef17a3a..f3078f6174e 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/ElementTypeFilter.java +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/ElementTypeFilter.java @@ -33,8 +33,7 @@ import org.eclipse.papyrus.infra.filters.Filter; * @model * @generated */ -public interface ElementTypeFilter extends Filter -{ +public interface ElementTypeFilter extends Filter { /** * Returns the value of the '<em><b>Element Type ID</b></em>' attribute. * <!-- begin-user-doc --> diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/ModelingAssistantProvider.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/ModelingAssistantProvider.java index 835297c573e..78db8783c07 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/ModelingAssistantProvider.java +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/ModelingAssistantProvider.java @@ -55,8 +55,7 @@ import org.eclipse.papyrus.infra.filters.Filter; * @model superTypes="org.eclipse.papyrus.infra.gmfdiag.assistant.IModelingAssistantProvider" * @generated */ -public interface ModelingAssistantProvider extends EObject, IModelingAssistantProvider -{ +public interface ModelingAssistantProvider extends EObject, IModelingAssistantProvider { /** * Returns the value of the '<em><b>Name</b></em>' attribute. * <!-- begin-user-doc --> diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/PopupAssistant.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/PopupAssistant.java index 869653de62d..b63d5effac6 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/PopupAssistant.java +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/PopupAssistant.java @@ -33,8 +33,7 @@ import org.eclipse.papyrus.infra.filters.Filter; * @model * @generated */ -public interface PopupAssistant extends Assistant -{ +public interface PopupAssistant extends Assistant { /** * Returns the value of the '<em><b>Filter</b></em>' reference. * <!-- begin-user-doc --> diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/impl/AssistantFactoryImpl.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/impl/AssistantFactoryImpl.java index 2c6b41e0dc9..9edc547849a 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/impl/AssistantFactoryImpl.java +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/impl/AssistantFactoryImpl.java @@ -37,8 +37,7 @@ import org.eclipse.papyrus.infra.gmfdiag.assistant.*; * * @generated */ -public class AssistantFactoryImpl extends EFactoryImpl implements AssistantFactory -{ +public class AssistantFactoryImpl extends EFactoryImpl implements AssistantFactory { /** * Creates the default factory implementation. * <!-- begin-user-doc --> @@ -46,17 +45,13 @@ public class AssistantFactoryImpl extends EFactoryImpl implements AssistantFacto * * @generated */ - public static AssistantFactory init() - { - try - { + public static AssistantFactory init() { + try { AssistantFactory theAssistantFactory = (AssistantFactory) EPackage.Registry.INSTANCE.getEFactory(AssistantPackage.eNS_URI); - if (theAssistantFactory != null) - { + if (theAssistantFactory != null) { return theAssistantFactory; } - } catch (Exception exception) - { + } catch (Exception exception) { EcorePlugin.INSTANCE.log(exception); } return new AssistantFactoryImpl(); @@ -69,8 +64,7 @@ public class AssistantFactoryImpl extends EFactoryImpl implements AssistantFacto * * @generated */ - public AssistantFactoryImpl() - { + public AssistantFactoryImpl() { super(); } @@ -81,10 +75,8 @@ public class AssistantFactoryImpl extends EFactoryImpl implements AssistantFacto * @generated */ @Override - public EObject create(EClass eClass) - { - switch (eClass.getClassifierID()) - { + public EObject create(EClass eClass) { + switch (eClass.getClassifierID()) { case AssistantPackage.ASSISTED_ELEMENT_TYPE_FILTER: return createAssistedElementTypeFilter(); case AssistantPackage.MODELING_ASSISTANT_PROVIDER: @@ -107,10 +99,8 @@ public class AssistantFactoryImpl extends EFactoryImpl implements AssistantFacto * @generated */ @Override - public Object createFromString(EDataType eDataType, String initialValue) - { - switch (eDataType.getClassifierID()) - { + public Object createFromString(EDataType eDataType, String initialValue) { + switch (eDataType.getClassifierID()) { case AssistantPackage.ELEMENT_TYPE: return createElementTypeFromString(eDataType, initialValue); case AssistantPackage.CLIENT_CONTEXT: @@ -133,10 +123,8 @@ public class AssistantFactoryImpl extends EFactoryImpl implements AssistantFacto * @generated */ @Override - public String convertToString(EDataType eDataType, Object instanceValue) - { - switch (eDataType.getClassifierID()) - { + public String convertToString(EDataType eDataType, Object instanceValue) { + switch (eDataType.getClassifierID()) { case AssistantPackage.ELEMENT_TYPE: return convertElementTypeToString(eDataType, instanceValue); case AssistantPackage.CLIENT_CONTEXT: @@ -159,8 +147,7 @@ public class AssistantFactoryImpl extends EFactoryImpl implements AssistantFacto * @generated */ @Override - public AssistedElementTypeFilter createAssistedElementTypeFilter() - { + public AssistedElementTypeFilter createAssistedElementTypeFilter() { AssistedElementTypeFilterImpl assistedElementTypeFilter = new AssistedElementTypeFilterImpl(); return assistedElementTypeFilter; } @@ -172,8 +159,7 @@ public class AssistantFactoryImpl extends EFactoryImpl implements AssistantFacto * @generated */ @Override - public ModelingAssistantProvider createModelingAssistantProvider() - { + public ModelingAssistantProvider createModelingAssistantProvider() { ModelingAssistantProviderImpl modelingAssistantProvider = new ModelingAssistantProviderImpl(); return modelingAssistantProvider; } @@ -185,8 +171,7 @@ public class AssistantFactoryImpl extends EFactoryImpl implements AssistantFacto * @generated */ @Override - public ConnectionAssistant createConnectionAssistant() - { + public ConnectionAssistant createConnectionAssistant() { ConnectionAssistantImpl connectionAssistant = new ConnectionAssistantImpl(); return connectionAssistant; } @@ -198,8 +183,7 @@ public class AssistantFactoryImpl extends EFactoryImpl implements AssistantFacto * @generated */ @Override - public PopupAssistant createPopupAssistant() - { + public PopupAssistant createPopupAssistant() { PopupAssistantImpl popupAssistant = new PopupAssistantImpl(); return popupAssistant; } @@ -211,8 +195,7 @@ public class AssistantFactoryImpl extends EFactoryImpl implements AssistantFacto * @generated */ @Override - public ElementTypeFilter createElementTypeFilter() - { + public ElementTypeFilter createElementTypeFilter() { ElementTypeFilterImpl elementTypeFilter = new ElementTypeFilterImpl(); return elementTypeFilter; } @@ -223,8 +206,7 @@ public class AssistantFactoryImpl extends EFactoryImpl implements AssistantFacto * * @generated */ - public IElementType createElementTypeFromString(EDataType eDataType, String initialValue) - { + public IElementType createElementTypeFromString(EDataType eDataType, String initialValue) { return (IElementType) super.createFromString(eDataType, initialValue); } @@ -234,8 +216,7 @@ public class AssistantFactoryImpl extends EFactoryImpl implements AssistantFacto * * @generated */ - public String convertElementTypeToString(EDataType eDataType, Object instanceValue) - { + public String convertElementTypeToString(EDataType eDataType, Object instanceValue) { return super.convertToString(eDataType, instanceValue); } @@ -245,8 +226,7 @@ public class AssistantFactoryImpl extends EFactoryImpl implements AssistantFacto * * @generated */ - public IClientContext createClientContextFromString(EDataType eDataType, String initialValue) - { + public IClientContext createClientContextFromString(EDataType eDataType, String initialValue) { return (IClientContext) super.createFromString(eDataType, initialValue); } @@ -256,8 +236,7 @@ public class AssistantFactoryImpl extends EFactoryImpl implements AssistantFacto * * @generated */ - public String convertClientContextToString(EDataType eDataType, Object instanceValue) - { + public String convertClientContextToString(EDataType eDataType, Object instanceValue) { return super.convertToString(eDataType, instanceValue); } @@ -267,8 +246,7 @@ public class AssistantFactoryImpl extends EFactoryImpl implements AssistantFacto * * @generated */ - public IOperation createIOperationFromString(EDataType eDataType, String initialValue) - { + public IOperation createIOperationFromString(EDataType eDataType, String initialValue) { return (IOperation) super.createFromString(eDataType, initialValue); } @@ -278,8 +256,7 @@ public class AssistantFactoryImpl extends EFactoryImpl implements AssistantFacto * * @generated */ - public String convertIOperationToString(EDataType eDataType, Object instanceValue) - { + public String convertIOperationToString(EDataType eDataType, Object instanceValue) { return super.convertToString(eDataType, instanceValue); } @@ -289,8 +266,7 @@ public class AssistantFactoryImpl extends EFactoryImpl implements AssistantFacto * * @generated */ - public IProviderChangeListener createIProviderChangeListenerFromString(EDataType eDataType, String initialValue) - { + public IProviderChangeListener createIProviderChangeListenerFromString(EDataType eDataType, String initialValue) { return (IProviderChangeListener) super.createFromString(eDataType, initialValue); } @@ -300,8 +276,7 @@ public class AssistantFactoryImpl extends EFactoryImpl implements AssistantFacto * * @generated */ - public String convertIProviderChangeListenerToString(EDataType eDataType, Object instanceValue) - { + public String convertIProviderChangeListenerToString(EDataType eDataType, Object instanceValue) { return super.convertToString(eDataType, instanceValue); } @@ -311,8 +286,7 @@ public class AssistantFactoryImpl extends EFactoryImpl implements AssistantFacto * * @generated */ - public IAdaptable createIAdaptableFromString(EDataType eDataType, String initialValue) - { + public IAdaptable createIAdaptableFromString(EDataType eDataType, String initialValue) { return (IAdaptable) super.createFromString(eDataType, initialValue); } @@ -322,8 +296,7 @@ public class AssistantFactoryImpl extends EFactoryImpl implements AssistantFacto * * @generated */ - public String convertIAdaptableToString(EDataType eDataType, Object instanceValue) - { + public String convertIAdaptableToString(EDataType eDataType, Object instanceValue) { return super.convertToString(eDataType, instanceValue); } @@ -334,8 +307,7 @@ public class AssistantFactoryImpl extends EFactoryImpl implements AssistantFacto * @generated */ @Override - public AssistantPackage getAssistantPackage() - { + public AssistantPackage getAssistantPackage() { return (AssistantPackage) getEPackage(); } @@ -347,8 +319,7 @@ public class AssistantFactoryImpl extends EFactoryImpl implements AssistantFacto * @generated */ @Deprecated - public static AssistantPackage getPackage() - { + public static AssistantPackage getPackage() { return AssistantPackage.eINSTANCE; } diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/impl/AssistantImpl.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/impl/AssistantImpl.java index 35eea1c6c3c..1b98cd38f41 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/impl/AssistantImpl.java +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/impl/AssistantImpl.java @@ -47,8 +47,7 @@ import org.eclipse.uml2.common.util.CacheAdapter; * * @generated */ -public abstract class AssistantImpl extends MinimalEObjectImpl.Container implements Assistant -{ +public abstract class AssistantImpl extends MinimalEObjectImpl.Container implements Assistant { /** * The default value of the '{@link #getElementTypeID() <em>Element Type ID</em>}' attribute. * <!-- begin-user-doc --> @@ -88,8 +87,7 @@ public abstract class AssistantImpl extends MinimalEObjectImpl.Container impleme * * @generated */ - protected AssistantImpl() - { + protected AssistantImpl() { super(); } @@ -100,8 +98,7 @@ public abstract class AssistantImpl extends MinimalEObjectImpl.Container impleme * @generated */ @Override - protected EClass eStaticClass() - { + protected EClass eStaticClass() { return AssistantPackage.Literals.ASSISTANT; } @@ -112,8 +109,7 @@ public abstract class AssistantImpl extends MinimalEObjectImpl.Container impleme * @generated */ @Override - public String getElementTypeID() - { + public String getElementTypeID() { return elementTypeID; } @@ -124,8 +120,7 @@ public abstract class AssistantImpl extends MinimalEObjectImpl.Container impleme * @generated */ @Override - public void setElementTypeID(String newElementTypeID) - { + public void setElementTypeID(String newElementTypeID) { newElementTypeID = newElementTypeID == null ? ELEMENT_TYPE_ID_EDEFAULT : newElementTypeID; String oldElementTypeID = elementTypeID; elementTypeID = newElementTypeID; @@ -141,14 +136,11 @@ public abstract class AssistantImpl extends MinimalEObjectImpl.Container impleme * @generated */ @Override - public IElementType getElementType() - { + public IElementType getElementType() { CacheAdapter cache = getCacheAdapter(); - if (cache != null) - { + if (cache != null) { IElementType result = (IElementType) cache.get(eResource(), this, AssistantPackage.Literals.ASSISTANT__ELEMENT_TYPE); - if (result == null) - { + if (result == null) { cache.put(eResource(), this, AssistantPackage.Literals.ASSISTANT__ELEMENT_TYPE, result = AssistantOperations.getElementType(this)); } return result; @@ -163,8 +155,7 @@ public abstract class AssistantImpl extends MinimalEObjectImpl.Container impleme * @generated */ @Override - public ModelingAssistantProvider getProvider() - { + public ModelingAssistantProvider getProvider() { ModelingAssistantProvider provider = basicGetProvider(); return provider != null && provider.eIsProxy() ? (ModelingAssistantProvider) eResolveProxy((InternalEObject) provider) : provider; } @@ -175,8 +166,7 @@ public abstract class AssistantImpl extends MinimalEObjectImpl.Container impleme * * @generated */ - public ModelingAssistantProvider basicGetProvider() - { + public ModelingAssistantProvider basicGetProvider() { return null; } @@ -187,10 +177,8 @@ public abstract class AssistantImpl extends MinimalEObjectImpl.Container impleme * @generated */ @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) - { - switch (featureID) - { + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { case AssistantPackage.ASSISTANT__PROVIDER: if (resolve) { return getProvider(); @@ -211,10 +199,8 @@ public abstract class AssistantImpl extends MinimalEObjectImpl.Container impleme * @generated */ @Override - public void eSet(int featureID, Object newValue) - { - switch (featureID) - { + public void eSet(int featureID, Object newValue) { + switch (featureID) { case AssistantPackage.ASSISTANT__ELEMENT_TYPE_ID: setElementTypeID((String) newValue); return; @@ -229,10 +215,8 @@ public abstract class AssistantImpl extends MinimalEObjectImpl.Container impleme * @generated */ @Override - public void eUnset(int featureID) - { - switch (featureID) - { + public void eUnset(int featureID) { + switch (featureID) { case AssistantPackage.ASSISTANT__ELEMENT_TYPE_ID: setElementTypeID(ELEMENT_TYPE_ID_EDEFAULT); return; @@ -247,10 +231,8 @@ public abstract class AssistantImpl extends MinimalEObjectImpl.Container impleme * @generated */ @Override - public boolean eIsSet(int featureID) - { - switch (featureID) - { + public boolean eIsSet(int featureID) { + switch (featureID) { case AssistantPackage.ASSISTANT__PROVIDER: return isSetProvider(); case AssistantPackage.ASSISTANT__ELEMENT_TYPE_ID: @@ -268,8 +250,7 @@ public abstract class AssistantImpl extends MinimalEObjectImpl.Container impleme * @generated */ @Override - public String toString() - { + public String toString() { if (eIsProxy()) { return super.toString(); } @@ -291,8 +272,7 @@ public abstract class AssistantImpl extends MinimalEObjectImpl.Container impleme * @return The new instance. * @generated */ - protected EObject create(EClass eClass) - { + protected EObject create(EClass eClass) { return EcoreUtil.create(eClass); } @@ -304,8 +284,7 @@ public abstract class AssistantImpl extends MinimalEObjectImpl.Container impleme * @return The cache adapter for this '<em><b>Assistant</b></em>'. * @generated */ - protected CacheAdapter getCacheAdapter() - { + protected CacheAdapter getCacheAdapter() { return CacheAdapter.getCacheAdapter(this); } @@ -315,8 +294,7 @@ public abstract class AssistantImpl extends MinimalEObjectImpl.Container impleme * * @generated */ - public boolean isSetProvider() - { + public boolean isSetProvider() { return false; } diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/impl/AssistantPackageImpl.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/impl/AssistantPackageImpl.java index f38a5b5d153..989c3d7de85 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/impl/AssistantPackageImpl.java +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/impl/AssistantPackageImpl.java @@ -54,8 +54,7 @@ import org.eclipse.uml2.types.TypesPackage; * * @generated */ -public class AssistantPackageImpl extends EPackageImpl implements AssistantPackage -{ +public class AssistantPackageImpl extends EPackageImpl implements AssistantPackage { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -161,18 +160,22 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka private EDataType iAdaptableEDataType = null; /** - * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package + * Creates an instance of the model <b>Package</b>, registered with + * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package * package URI value. * <p> - * 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. <!-- begin-user-doc --> <!-- end-user-doc --> + * 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. + * <!-- begin-user-doc --> <!-- end-user-doc --> * * @see org.eclipse.emf.ecore.EPackage.Registry * @see org.eclipse.papyrus.infra.gmfdiag.assistant.AssistantPackage#eNS_URI * @see #init() * @generated */ - private AssistantPackageImpl() - { + private AssistantPackageImpl() { super(eNS_URI, AssistantFactory.eINSTANCE); } @@ -188,15 +191,16 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends. * * <p> - * This method is used to initialize {@link AssistantPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc --> + * This method is used to initialize {@link AssistantPackage#eINSTANCE} when that field is accessed. + * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. + * <!-- begin-user-doc --> <!-- end-user-doc --> * * @see #eNS_URI * @see #createPackageContents() * @see #initializePackageContents() * @generated */ - public static AssistantPackage init() - { + public static AssistantPackage init() { if (isInited) { return (AssistantPackage) EPackage.Registry.INSTANCE.getEPackage(AssistantPackage.eNS_URI); } @@ -209,6 +213,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka // Initialize simple dependencies EcorePackage.eINSTANCE.eClass(); FiltersPackage.eINSTANCE.eClass(); + TypesPackage.eINSTANCE.eClass(); // Create package meta-data objects theAssistantPackage.createPackageContents(); @@ -232,8 +237,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EClass getAssistedElementTypeFilter() - { + public EClass getAssistedElementTypeFilter() { return assistedElementTypeFilterEClass; } @@ -244,8 +248,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EReference getAssistedElementTypeFilter_Provider() - { + public EReference getAssistedElementTypeFilter_Provider() { return (EReference) assistedElementTypeFilterEClass.getEStructuralFeatures().get(0); } @@ -256,8 +259,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EOperation getAssistedElementTypeFilter__GetProvider() - { + public EOperation getAssistedElementTypeFilter__GetProvider() { return assistedElementTypeFilterEClass.getEOperations().get(0); } @@ -268,8 +270,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EClass getModelingAssistantProvider() - { + public EClass getModelingAssistantProvider() { return modelingAssistantProviderEClass; } @@ -280,8 +281,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EAttribute getModelingAssistantProvider_Name() - { + public EAttribute getModelingAssistantProvider_Name() { return (EAttribute) modelingAssistantProviderEClass.getEStructuralFeatures().get(0); } @@ -292,8 +292,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EReference getModelingAssistantProvider_Assistant() - { + public EReference getModelingAssistantProvider_Assistant() { return (EReference) modelingAssistantProviderEClass.getEStructuralFeatures().get(1); } @@ -304,8 +303,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EReference getModelingAssistantProvider_OwnedFilter() - { + public EReference getModelingAssistantProvider_OwnedFilter() { return (EReference) modelingAssistantProviderEClass.getEStructuralFeatures().get(2); } @@ -316,8 +314,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EReference getModelingAssistantProvider_PopupAssistant() - { + public EReference getModelingAssistantProvider_PopupAssistant() { return (EReference) modelingAssistantProviderEClass.getEStructuralFeatures().get(3); } @@ -328,8 +325,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EReference getModelingAssistantProvider_ConnectionAssistant() - { + public EReference getModelingAssistantProvider_ConnectionAssistant() { return (EReference) modelingAssistantProviderEClass.getEStructuralFeatures().get(4); } @@ -340,8 +336,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EAttribute getModelingAssistantProvider_ElementType() - { + public EAttribute getModelingAssistantProvider_ElementType() { return (EAttribute) modelingAssistantProviderEClass.getEStructuralFeatures().get(5); } @@ -352,8 +347,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EAttribute getModelingAssistantProvider_ElementTypeID() - { + public EAttribute getModelingAssistantProvider_ElementTypeID() { return (EAttribute) modelingAssistantProviderEClass.getEStructuralFeatures().get(6); } @@ -364,8 +358,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EAttribute getModelingAssistantProvider_ClientContext() - { + public EAttribute getModelingAssistantProvider_ClientContext() { return (EAttribute) modelingAssistantProviderEClass.getEStructuralFeatures().get(7); } @@ -376,8 +369,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EAttribute getModelingAssistantProvider_ClientContextID() - { + public EAttribute getModelingAssistantProvider_ClientContextID() { return (EAttribute) modelingAssistantProviderEClass.getEStructuralFeatures().get(8); } @@ -388,8 +380,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EAttribute getModelingAssistantProvider_ExcludedElementType() - { + public EAttribute getModelingAssistantProvider_ExcludedElementType() { return (EAttribute) modelingAssistantProviderEClass.getEStructuralFeatures().get(9); } @@ -400,8 +391,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EAttribute getModelingAssistantProvider_ExcludedElementTypeID() - { + public EAttribute getModelingAssistantProvider_ExcludedElementTypeID() { return (EAttribute) modelingAssistantProviderEClass.getEStructuralFeatures().get(10); } @@ -412,8 +402,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EAttribute getModelingAssistantProvider_RelationshipType() - { + public EAttribute getModelingAssistantProvider_RelationshipType() { return (EAttribute) modelingAssistantProviderEClass.getEStructuralFeatures().get(11); } @@ -424,8 +413,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EAttribute getModelingAssistantProvider_RelationshipTypeID() - { + public EAttribute getModelingAssistantProvider_RelationshipTypeID() { return (EAttribute) modelingAssistantProviderEClass.getEStructuralFeatures().get(12); } @@ -436,8 +424,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EOperation getModelingAssistantProvider__GetElementTypes() - { + public EOperation getModelingAssistantProvider__GetElementTypes() { return modelingAssistantProviderEClass.getEOperations().get(0); } @@ -448,8 +435,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EOperation getModelingAssistantProvider__GetClientContext() - { + public EOperation getModelingAssistantProvider__GetClientContext() { return modelingAssistantProviderEClass.getEOperations().get(1); } @@ -460,8 +446,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EOperation getModelingAssistantProvider__GetElementType__String() - { + public EOperation getModelingAssistantProvider__GetElementType__String() { return modelingAssistantProviderEClass.getEOperations().get(2); } @@ -472,8 +457,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EOperation getModelingAssistantProvider__GetExcludedElementTypes() - { + public EOperation getModelingAssistantProvider__GetExcludedElementTypes() { return modelingAssistantProviderEClass.getEOperations().get(3); } @@ -484,8 +468,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EOperation getModelingAssistantProvider__GetRelationshipTypes() - { + public EOperation getModelingAssistantProvider__GetRelationshipTypes() { return modelingAssistantProviderEClass.getEOperations().get(4); } @@ -496,8 +479,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EOperation getModelingAssistantProvider__IsRelationshipType__IElementType() - { + public EOperation getModelingAssistantProvider__IsRelationshipType__IElementType() { return modelingAssistantProviderEClass.getEOperations().get(5); } @@ -508,8 +490,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EClass getAssistant() - { + public EClass getAssistant() { return assistantEClass; } @@ -520,8 +501,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EAttribute getAssistant_ElementTypeID() - { + public EAttribute getAssistant_ElementTypeID() { return (EAttribute) assistantEClass.getEStructuralFeatures().get(0); } @@ -532,8 +512,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EAttribute getAssistant_ElementType() - { + public EAttribute getAssistant_ElementType() { return (EAttribute) assistantEClass.getEStructuralFeatures().get(1); } @@ -544,8 +523,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EReference getAssistant_Provider() - { + public EReference getAssistant_Provider() { return (EReference) assistantEClass.getEStructuralFeatures().get(2); } @@ -556,8 +534,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EOperation getAssistant__GetElementType() - { + public EOperation getAssistant__GetElementType() { return assistantEClass.getEOperations().get(0); } @@ -568,8 +545,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EClass getConnectionAssistant() - { + public EClass getConnectionAssistant() { return connectionAssistantEClass; } @@ -580,8 +556,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EReference getConnectionAssistant_OwningProvider() - { + public EReference getConnectionAssistant_OwningProvider() { return (EReference) connectionAssistantEClass.getEStructuralFeatures().get(4); } @@ -592,8 +567,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EReference getConnectionAssistant_SourceFilter() - { + public EReference getConnectionAssistant_SourceFilter() { return (EReference) connectionAssistantEClass.getEStructuralFeatures().get(0); } @@ -604,8 +578,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EReference getConnectionAssistant_OwnedSourceFilter() - { + public EReference getConnectionAssistant_OwnedSourceFilter() { return (EReference) connectionAssistantEClass.getEStructuralFeatures().get(1); } @@ -616,8 +589,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EReference getConnectionAssistant_TargetFilter() - { + public EReference getConnectionAssistant_TargetFilter() { return (EReference) connectionAssistantEClass.getEStructuralFeatures().get(2); } @@ -628,8 +600,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EReference getConnectionAssistant_OwnedTargetFilter() - { + public EReference getConnectionAssistant_OwnedTargetFilter() { return (EReference) connectionAssistantEClass.getEStructuralFeatures().get(3); } @@ -640,8 +611,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EClass getPopupAssistant() - { + public EClass getPopupAssistant() { return popupAssistantEClass; } @@ -652,8 +622,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EReference getPopupAssistant_Filter() - { + public EReference getPopupAssistant_Filter() { return (EReference) popupAssistantEClass.getEStructuralFeatures().get(0); } @@ -664,8 +633,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EReference getPopupAssistant_OwnedFilter() - { + public EReference getPopupAssistant_OwnedFilter() { return (EReference) popupAssistantEClass.getEStructuralFeatures().get(1); } @@ -676,8 +644,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EReference getPopupAssistant_OwningProvider() - { + public EReference getPopupAssistant_OwningProvider() { return (EReference) popupAssistantEClass.getEStructuralFeatures().get(2); } @@ -688,8 +655,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EClass getElementTypeFilter() - { + public EClass getElementTypeFilter() { return elementTypeFilterEClass; } @@ -700,8 +666,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EAttribute getElementTypeFilter_ElementTypeID() - { + public EAttribute getElementTypeFilter_ElementTypeID() { return (EAttribute) elementTypeFilterEClass.getEStructuralFeatures().get(0); } @@ -712,8 +677,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EAttribute getElementTypeFilter_ElementType() - { + public EAttribute getElementTypeFilter_ElementType() { return (EAttribute) elementTypeFilterEClass.getEStructuralFeatures().get(1); } @@ -724,8 +688,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EReference getElementTypeFilter_Provider() - { + public EReference getElementTypeFilter_Provider() { return (EReference) elementTypeFilterEClass.getEStructuralFeatures().get(2); } @@ -736,8 +699,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EOperation getElementTypeFilter__GetElementType() - { + public EOperation getElementTypeFilter__GetElementType() { return elementTypeFilterEClass.getEOperations().get(0); } @@ -748,8 +710,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EOperation getElementTypeFilter__GetProvider() - { + public EOperation getElementTypeFilter__GetProvider() { return elementTypeFilterEClass.getEOperations().get(1); } @@ -760,8 +721,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EClass getIProvider() - { + public EClass getIProvider() { return iProviderEClass; } @@ -772,8 +732,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EAttribute getIProvider_Listener() - { + public EAttribute getIProvider_Listener() { return (EAttribute) iProviderEClass.getEStructuralFeatures().get(0); } @@ -784,8 +743,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EOperation getIProvider__Provides__IOperation() - { + public EOperation getIProvider__Provides__IOperation() { return iProviderEClass.getEOperations().get(0); } @@ -796,8 +754,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EOperation getIProvider__AddProviderChangeListener__IProviderChangeListener() - { + public EOperation getIProvider__AddProviderChangeListener__IProviderChangeListener() { return iProviderEClass.getEOperations().get(1); } @@ -808,8 +765,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EOperation getIProvider__RemoveProviderChangeListener__IProviderChangeListener() - { + public EOperation getIProvider__RemoveProviderChangeListener__IProviderChangeListener() { return iProviderEClass.getEOperations().get(2); } @@ -820,8 +776,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EClass getIModelingAssistantProvider() - { + public EClass getIModelingAssistantProvider() { return iModelingAssistantProviderEClass; } @@ -832,8 +787,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EOperation getIModelingAssistantProvider__GetTypes__String_IAdaptable() - { + public EOperation getIModelingAssistantProvider__GetTypes__String_IAdaptable() { return iModelingAssistantProviderEClass.getEOperations().get(0); } @@ -844,8 +798,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EOperation getIModelingAssistantProvider__GetRelTypesOnSource__IAdaptable() - { + public EOperation getIModelingAssistantProvider__GetRelTypesOnSource__IAdaptable() { return iModelingAssistantProviderEClass.getEOperations().get(1); } @@ -856,8 +809,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EOperation getIModelingAssistantProvider__GetRelTypesOnTarget__IAdaptable() - { + public EOperation getIModelingAssistantProvider__GetRelTypesOnTarget__IAdaptable() { return iModelingAssistantProviderEClass.getEOperations().get(2); } @@ -868,8 +820,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EOperation getIModelingAssistantProvider__GetRelTypesOnSourceAndTarget__IAdaptable_IAdaptable() - { + public EOperation getIModelingAssistantProvider__GetRelTypesOnSourceAndTarget__IAdaptable_IAdaptable() { return iModelingAssistantProviderEClass.getEOperations().get(3); } @@ -880,8 +831,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EOperation getIModelingAssistantProvider__GetRelTypesForSREOnTarget__IAdaptable() - { + public EOperation getIModelingAssistantProvider__GetRelTypesForSREOnTarget__IAdaptable() { return iModelingAssistantProviderEClass.getEOperations().get(4); } @@ -892,8 +842,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EOperation getIModelingAssistantProvider__GetRelTypesForSREOnSource__IAdaptable() - { + public EOperation getIModelingAssistantProvider__GetRelTypesForSREOnSource__IAdaptable() { return iModelingAssistantProviderEClass.getEOperations().get(5); } @@ -904,8 +853,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EOperation getIModelingAssistantProvider__GetTypesForSource__IAdaptable_IElementType() - { + public EOperation getIModelingAssistantProvider__GetTypesForSource__IAdaptable_IElementType() { return iModelingAssistantProviderEClass.getEOperations().get(6); } @@ -916,8 +864,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EOperation getIModelingAssistantProvider__GetTypesForTarget__IAdaptable_IElementType() - { + public EOperation getIModelingAssistantProvider__GetTypesForTarget__IAdaptable_IElementType() { return iModelingAssistantProviderEClass.getEOperations().get(7); } @@ -928,8 +875,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EOperation getIModelingAssistantProvider__SelectExistingElementForSource__IAdaptable_IElementType() - { + public EOperation getIModelingAssistantProvider__SelectExistingElementForSource__IAdaptable_IElementType() { return iModelingAssistantProviderEClass.getEOperations().get(8); } @@ -940,8 +886,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EOperation getIModelingAssistantProvider__SelectExistingElementForTarget__IAdaptable_IElementType() - { + public EOperation getIModelingAssistantProvider__SelectExistingElementForTarget__IAdaptable_IElementType() { return iModelingAssistantProviderEClass.getEOperations().get(9); } @@ -952,8 +897,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EOperation getIModelingAssistantProvider__GetTypesForPopupBar__IAdaptable() - { + public EOperation getIModelingAssistantProvider__GetTypesForPopupBar__IAdaptable() { return iModelingAssistantProviderEClass.getEOperations().get(10); } @@ -964,8 +908,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EDataType getElementType() - { + public EDataType getElementType() { return elementTypeEDataType; } @@ -976,8 +919,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EDataType getClientContext() - { + public EDataType getClientContext() { return clientContextEDataType; } @@ -988,8 +930,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EDataType getIOperation() - { + public EDataType getIOperation() { return iOperationEDataType; } @@ -1000,8 +941,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EDataType getIProviderChangeListener() - { + public EDataType getIProviderChangeListener() { return iProviderChangeListenerEDataType; } @@ -1012,8 +952,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public EDataType getIAdaptable() - { + public EDataType getIAdaptable() { return iAdaptableEDataType; } @@ -1024,8 +963,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * @generated */ @Override - public AssistantFactory getAssistantFactory() - { + public AssistantFactory getAssistantFactory() { return (AssistantFactory) getEFactoryInstance(); } @@ -1045,8 +983,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * * @generated */ - public void createPackageContents() - { + public void createPackageContents() { if (isCreated) { return; } @@ -1146,8 +1083,7 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * * @generated */ - public void initializePackageContents() - { + public void initializePackageContents() { if (isInitialized) { return; } @@ -1177,35 +1113,35 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka // Initialize classes, features, and operations; add parameters initEClass(assistedElementTypeFilterEClass, AssistedElementTypeFilter.class, "AssistedElementTypeFilter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEReference(getAssistedElementTypeFilter_Provider(), this.getModelingAssistantProvider(), null, - "provider", null, 1, 1, AssistedElementTypeFilter.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ + initEReference(getAssistedElementTypeFilter_Provider(), this.getModelingAssistantProvider(), null, "provider", null, 1, 1, AssistedElementTypeFilter.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, //$NON-NLS-1$ + IS_UNIQUE, IS_DERIVED, !IS_ORDERED); initEOperation(getAssistedElementTypeFilter__GetProvider(), this.getModelingAssistantProvider(), "getProvider", 1, 1, IS_UNIQUE, !IS_ORDERED); //$NON-NLS-1$ initEClass(modelingAssistantProviderEClass, ModelingAssistantProvider.class, "ModelingAssistantProvider", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ initEAttribute(getModelingAssistantProvider_Name(), theTypesPackage.getString(), "name", null, 0, 1, ModelingAssistantProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ - initEReference(getModelingAssistantProvider_Assistant(), this.getAssistant(), this.getAssistant_Provider(), - "assistant", null, 0, -1, ModelingAssistantProvider.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ - initEReference(getModelingAssistantProvider_OwnedFilter(), theFiltersPackage.getFilter(), null, - "ownedFilter", null, 0, -1, ModelingAssistantProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ - initEReference(getModelingAssistantProvider_PopupAssistant(), this.getPopupAssistant(), this.getPopupAssistant_OwningProvider(), - "popupAssistant", null, 0, -1, ModelingAssistantProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ - initEReference(getModelingAssistantProvider_ConnectionAssistant(), this.getConnectionAssistant(), this.getConnectionAssistant_OwningProvider(), - "connectionAssistant", null, 0, -1, ModelingAssistantProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ + initEReference(getModelingAssistantProvider_Assistant(), this.getAssistant(), this.getAssistant_Provider(), "assistant", null, 0, -1, ModelingAssistantProvider.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, //$NON-NLS-1$ + !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED); + initEReference(getModelingAssistantProvider_OwnedFilter(), theFiltersPackage.getFilter(), null, "ownedFilter", null, 0, -1, ModelingAssistantProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, //$NON-NLS-1$ + IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); + initEReference(getModelingAssistantProvider_PopupAssistant(), this.getPopupAssistant(), this.getPopupAssistant_OwningProvider(), "popupAssistant", null, 0, -1, ModelingAssistantProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, //$NON-NLS-1$ + !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); + initEReference(getModelingAssistantProvider_ConnectionAssistant(), this.getConnectionAssistant(), this.getConnectionAssistant_OwningProvider(), "connectionAssistant", null, 0, -1, ModelingAssistantProvider.class, !IS_TRANSIENT, !IS_VOLATILE, //$NON-NLS-1$ + IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); initEAttribute(getModelingAssistantProvider_ElementType(), this.getElementType(), "elementType", null, 0, -1, ModelingAssistantProvider.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getModelingAssistantProvider_ElementTypeID(), theTypesPackage.getString(), - "elementTypeID", null, 0, -1, ModelingAssistantProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ + initEAttribute(getModelingAssistantProvider_ElementTypeID(), theTypesPackage.getString(), "elementTypeID", null, 0, -1, ModelingAssistantProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, //$NON-NLS-1$ + !IS_ORDERED); initEAttribute(getModelingAssistantProvider_ClientContext(), this.getClientContext(), "clientContext", null, 1, 1, ModelingAssistantProvider.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getModelingAssistantProvider_ClientContextID(), theTypesPackage.getString(), - "clientContextID", null, 0, 1, ModelingAssistantProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getModelingAssistantProvider_ExcludedElementType(), this.getElementType(), - "excludedElementType", null, 0, -1, ModelingAssistantProvider.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getModelingAssistantProvider_ExcludedElementTypeID(), theTypesPackage.getString(), - "excludedElementTypeID", null, 0, -1, ModelingAssistantProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getModelingAssistantProvider_RelationshipType(), this.getElementType(), - "relationshipType", null, 0, -1, ModelingAssistantProvider.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getModelingAssistantProvider_RelationshipTypeID(), theTypesPackage.getString(), - "relationshipTypeID", null, 0, -1, ModelingAssistantProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ + initEAttribute(getModelingAssistantProvider_ClientContextID(), theTypesPackage.getString(), "clientContextID", null, 0, 1, ModelingAssistantProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, //$NON-NLS-1$ + !IS_ORDERED); + initEAttribute(getModelingAssistantProvider_ExcludedElementType(), this.getElementType(), "excludedElementType", null, 0, -1, ModelingAssistantProvider.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, //$NON-NLS-1$ + !IS_ORDERED); + initEAttribute(getModelingAssistantProvider_ExcludedElementTypeID(), theTypesPackage.getString(), "excludedElementTypeID", null, 0, -1, ModelingAssistantProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, //$NON-NLS-1$ + !IS_DERIVED, !IS_ORDERED); + initEAttribute(getModelingAssistantProvider_RelationshipType(), this.getElementType(), "relationshipType", null, 0, -1, ModelingAssistantProvider.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, //$NON-NLS-1$ + !IS_ORDERED); + initEAttribute(getModelingAssistantProvider_RelationshipTypeID(), theTypesPackage.getString(), "relationshipTypeID", null, 0, -1, ModelingAssistantProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, //$NON-NLS-1$ + !IS_DERIVED, !IS_ORDERED); initEOperation(getModelingAssistantProvider__GetElementTypes(), this.getElementType(), "getElementTypes", 0, -1, IS_UNIQUE, !IS_ORDERED); //$NON-NLS-1$ @@ -1224,30 +1160,30 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka initEClass(assistantEClass, Assistant.class, "Assistant", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ initEAttribute(getAssistant_ElementTypeID(), theTypesPackage.getString(), "elementTypeID", null, 1, 1, Assistant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ initEAttribute(getAssistant_ElementType(), this.getElementType(), "elementType", null, 1, 1, Assistant.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ - initEReference(getAssistant_Provider(), this.getModelingAssistantProvider(), this.getModelingAssistantProvider_Assistant(), - "provider", null, 1, 1, Assistant.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ + initEReference(getAssistant_Provider(), this.getModelingAssistantProvider(), this.getModelingAssistantProvider_Assistant(), "provider", null, 1, 1, Assistant.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, //$NON-NLS-1$ + !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED); initEOperation(getAssistant__GetElementType(), this.getElementType(), "getElementType", 1, 1, IS_UNIQUE, !IS_ORDERED); //$NON-NLS-1$ initEClass(popupAssistantEClass, PopupAssistant.class, "PopupAssistant", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEReference(getPopupAssistant_Filter(), theFiltersPackage.getFilter(), null, - "filter", null, 0, 1, PopupAssistant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ - initEReference(getPopupAssistant_OwnedFilter(), theFiltersPackage.getFilter(), null, - "ownedFilter", null, 0, 1, PopupAssistant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ - initEReference(getPopupAssistant_OwningProvider(), this.getModelingAssistantProvider(), this.getModelingAssistantProvider_PopupAssistant(), - "owningProvider", null, 1, 1, PopupAssistant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ + initEReference(getPopupAssistant_Filter(), theFiltersPackage.getFilter(), null, "filter", null, 0, 1, PopupAssistant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, //$NON-NLS-1$ + !IS_ORDERED); + initEReference(getPopupAssistant_OwnedFilter(), theFiltersPackage.getFilter(), null, "ownedFilter", null, 0, 1, PopupAssistant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, //$NON-NLS-1$ + !IS_ORDERED); + initEReference(getPopupAssistant_OwningProvider(), this.getModelingAssistantProvider(), this.getModelingAssistantProvider_PopupAssistant(), "owningProvider", null, 1, 1, PopupAssistant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, //$NON-NLS-1$ + !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); initEClass(connectionAssistantEClass, ConnectionAssistant.class, "ConnectionAssistant", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEReference(getConnectionAssistant_SourceFilter(), theFiltersPackage.getFilter(), null, - "sourceFilter", null, 0, 1, ConnectionAssistant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ - initEReference(getConnectionAssistant_OwnedSourceFilter(), theFiltersPackage.getFilter(), null, - "ownedSourceFilter", null, 0, 1, ConnectionAssistant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ - initEReference(getConnectionAssistant_TargetFilter(), theFiltersPackage.getFilter(), null, - "targetFilter", null, 0, 1, ConnectionAssistant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ - initEReference(getConnectionAssistant_OwnedTargetFilter(), theFiltersPackage.getFilter(), null, - "ownedTargetFilter", null, 0, 1, ConnectionAssistant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ - initEReference(getConnectionAssistant_OwningProvider(), this.getModelingAssistantProvider(), this.getModelingAssistantProvider_ConnectionAssistant(), - "owningProvider", null, 1, 1, ConnectionAssistant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ + initEReference(getConnectionAssistant_SourceFilter(), theFiltersPackage.getFilter(), null, "sourceFilter", null, 0, 1, ConnectionAssistant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, //$NON-NLS-1$ + !IS_DERIVED, !IS_ORDERED); + initEReference(getConnectionAssistant_OwnedSourceFilter(), theFiltersPackage.getFilter(), null, "ownedSourceFilter", null, 0, 1, ConnectionAssistant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, //$NON-NLS-1$ + IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); + initEReference(getConnectionAssistant_TargetFilter(), theFiltersPackage.getFilter(), null, "targetFilter", null, 0, 1, ConnectionAssistant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, //$NON-NLS-1$ + !IS_DERIVED, !IS_ORDERED); + initEReference(getConnectionAssistant_OwnedTargetFilter(), theFiltersPackage.getFilter(), null, "ownedTargetFilter", null, 0, 1, ConnectionAssistant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, //$NON-NLS-1$ + IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); + initEReference(getConnectionAssistant_OwningProvider(), this.getModelingAssistantProvider(), this.getModelingAssistantProvider_ConnectionAssistant(), "owningProvider", null, 1, 1, ConnectionAssistant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, //$NON-NLS-1$ + !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); initEClass(iModelingAssistantProviderEClass, IModelingAssistantProvider.class, "IModelingAssistantProvider", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ @@ -1305,8 +1241,8 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka initEClass(elementTypeFilterEClass, ElementTypeFilter.class, "ElementTypeFilter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ initEAttribute(getElementTypeFilter_ElementTypeID(), theTypesPackage.getString(), "elementTypeID", null, 1, 1, ElementTypeFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ initEAttribute(getElementTypeFilter_ElementType(), this.getElementType(), "elementType", null, 1, 1, ElementTypeFilter.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ - initEReference(getElementTypeFilter_Provider(), this.getModelingAssistantProvider(), null, - "provider", null, 1, 1, ElementTypeFilter.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ + initEReference(getElementTypeFilter_Provider(), this.getModelingAssistantProvider(), null, "provider", null, 1, 1, ElementTypeFilter.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, //$NON-NLS-1$ + IS_DERIVED, !IS_ORDERED); initEOperation(getElementTypeFilter__GetElementType(), this.getElementType(), "getElementType", 1, 1, IS_UNIQUE, !IS_ORDERED); //$NON-NLS-1$ @@ -1336,89 +1272,70 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * * @generated */ - protected void createSubsetsAnnotations() - { + protected void createSubsetsAnnotations() { String source = "subsets"; //$NON-NLS-1$ addAnnotation(getModelingAssistantProvider_PopupAssistant(), source, - new String[] - { + new String[] { }, - new URI[] - { - URI.createURI(eNS_URI).appendFragment("//ModelingAssistantProvider/assistant") //$NON-NLS-1$ + new URI[] { + URI.createURI(eNS_URI).appendFragment("//ModelingAssistantProvider/assistant") //$NON-NLS-1$ }); addAnnotation(getModelingAssistantProvider_ConnectionAssistant(), source, - new String[] - { + new String[] { }, - new URI[] - { - URI.createURI(eNS_URI).appendFragment("//ModelingAssistantProvider/assistant") //$NON-NLS-1$ + new URI[] { + URI.createURI(eNS_URI).appendFragment("//ModelingAssistantProvider/assistant") //$NON-NLS-1$ }); addAnnotation(getModelingAssistantProvider_RelationshipType(), source, - new String[] - { + new String[] { }, - new URI[] - { - URI.createURI(eNS_URI).appendFragment("//ModelingAssistantProvider/elementType") //$NON-NLS-1$ + new URI[] { + URI.createURI(eNS_URI).appendFragment("//ModelingAssistantProvider/elementType") //$NON-NLS-1$ }); addAnnotation(getModelingAssistantProvider_RelationshipTypeID(), source, - new String[] - { + new String[] { }, - new URI[] - { - URI.createURI(eNS_URI).appendFragment("//ModelingAssistantProvider/elementTypeID") //$NON-NLS-1$ + new URI[] { + URI.createURI(eNS_URI).appendFragment("//ModelingAssistantProvider/elementTypeID") //$NON-NLS-1$ }); addAnnotation(getPopupAssistant_OwnedFilter(), source, - new String[] - { + new String[] { }, - new URI[] - { - URI.createURI(eNS_URI).appendFragment("//PopupAssistant/filter") //$NON-NLS-1$ + new URI[] { + URI.createURI(eNS_URI).appendFragment("//PopupAssistant/filter") //$NON-NLS-1$ }); addAnnotation(getPopupAssistant_OwningProvider(), source, - new String[] - { + new String[] { }, - new URI[] - { - URI.createURI(eNS_URI).appendFragment("//Assistant/provider") //$NON-NLS-1$ + new URI[] { + URI.createURI(eNS_URI).appendFragment("//Assistant/provider") //$NON-NLS-1$ }); addAnnotation(getConnectionAssistant_OwnedSourceFilter(), source, - new String[] - { + new String[] { }, - new URI[] - { - URI.createURI(eNS_URI).appendFragment("//ConnectionAssistant/sourceFilter") //$NON-NLS-1$ + new URI[] { + URI.createURI(eNS_URI).appendFragment("//ConnectionAssistant/sourceFilter") //$NON-NLS-1$ }); addAnnotation(getConnectionAssistant_OwnedTargetFilter(), source, - new String[] - { + new String[] { }, - new URI[] - { - URI.createURI(eNS_URI).appendFragment("//ConnectionAssistant/targetFilter") //$NON-NLS-1$ + new URI[] { + URI.createURI(eNS_URI).appendFragment("//ConnectionAssistant/targetFilter") //$NON-NLS-1$ }); addAnnotation(getConnectionAssistant_OwningProvider(), source, - new String[] - { + new String[] { }, - new URI[] - { - URI.createURI(eNS_URI).appendFragment("//Assistant/provider") //$NON-NLS-1$ + new URI[] { + URI.createURI(eNS_URI).appendFragment("//Assistant/provider") //$NON-NLS-1$ }); } @@ -1429,18 +1346,15 @@ public class AssistantPackageImpl extends EPackageImpl implements AssistantPacka * * @generated */ - protected void createUnionAnnotations() - { + protected void createUnionAnnotations() { String source = "union"; //$NON-NLS-1$ addAnnotation(getModelingAssistantProvider_Assistant(), source, - new String[] - { + new String[] { }); addAnnotation(getAssistant_Provider(), source, - new String[] - { + new String[] { }); } diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/impl/AssistedElementTypeFilterImpl.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/impl/AssistedElementTypeFilterImpl.java index 12121ccd49c..c38469335f3 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/impl/AssistedElementTypeFilterImpl.java +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/impl/AssistedElementTypeFilterImpl.java @@ -48,8 +48,7 @@ import org.eclipse.uml2.common.util.CacheAdapter; * * @generated */ -public class AssistedElementTypeFilterImpl extends MinimalEObjectImpl.Container implements AssistedElementTypeFilter -{ +public class AssistedElementTypeFilterImpl extends MinimalEObjectImpl.Container implements AssistedElementTypeFilter { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. * <!-- begin-user-doc --> @@ -78,8 +77,7 @@ public class AssistedElementTypeFilterImpl extends MinimalEObjectImpl.Container * * @generated */ - protected AssistedElementTypeFilterImpl() - { + protected AssistedElementTypeFilterImpl() { super(); } @@ -90,8 +88,7 @@ public class AssistedElementTypeFilterImpl extends MinimalEObjectImpl.Container * @generated */ @Override - protected EClass eStaticClass() - { + protected EClass eStaticClass() { return AssistantPackage.Literals.ASSISTED_ELEMENT_TYPE_FILTER; } @@ -102,8 +99,7 @@ public class AssistedElementTypeFilterImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public String getName() - { + public String getName() { return name; } @@ -114,8 +110,7 @@ public class AssistedElementTypeFilterImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public void setName(String newName) - { + public void setName(String newName) { newName = newName == null ? NAME_EDEFAULT : newName; String oldName = name; name = newName; @@ -131,8 +126,7 @@ public class AssistedElementTypeFilterImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public ModelingAssistantProvider getProvider() - { + public ModelingAssistantProvider getProvider() { ModelingAssistantProvider provider = basicGetProvider(); return provider != null && provider.eIsProxy() ? (ModelingAssistantProvider) eResolveProxy((InternalEObject) provider) : provider; } @@ -143,8 +137,7 @@ public class AssistedElementTypeFilterImpl extends MinimalEObjectImpl.Container * * @generated */ - public ModelingAssistantProvider basicGetProvider() - { + public ModelingAssistantProvider basicGetProvider() { return AssistedElementTypeFilterOperations.getProvider(this); } @@ -155,8 +148,7 @@ public class AssistedElementTypeFilterImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public boolean matches(Object input) - { + public boolean matches(Object input) { return AssistedElementTypeFilterOperations.matches(this, input); } @@ -167,10 +159,8 @@ public class AssistedElementTypeFilterImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) - { - switch (featureID) - { + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { case AssistantPackage.ASSISTED_ELEMENT_TYPE_FILTER__NAME: return getName(); case AssistantPackage.ASSISTED_ELEMENT_TYPE_FILTER__PROVIDER: @@ -189,10 +179,8 @@ public class AssistedElementTypeFilterImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public void eSet(int featureID, Object newValue) - { - switch (featureID) - { + public void eSet(int featureID, Object newValue) { + switch (featureID) { case AssistantPackage.ASSISTED_ELEMENT_TYPE_FILTER__NAME: setName((String) newValue); return; @@ -207,10 +195,8 @@ public class AssistedElementTypeFilterImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public void eUnset(int featureID) - { - switch (featureID) - { + public void eUnset(int featureID) { + switch (featureID) { case AssistantPackage.ASSISTED_ELEMENT_TYPE_FILTER__NAME: setName(NAME_EDEFAULT); return; @@ -225,10 +211,8 @@ public class AssistedElementTypeFilterImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public boolean eIsSet(int featureID) - { - switch (featureID) - { + public boolean eIsSet(int featureID) { + switch (featureID) { case AssistantPackage.ASSISTED_ELEMENT_TYPE_FILTER__NAME: return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); case AssistantPackage.ASSISTED_ELEMENT_TYPE_FILTER__PROVIDER: @@ -244,10 +228,8 @@ public class AssistedElementTypeFilterImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException - { - switch (operationID) - { + public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException { + switch (operationID) { case AssistantPackage.ASSISTED_ELEMENT_TYPE_FILTER___MATCHES__OBJECT: return matches(arguments.get(0)); } @@ -261,8 +243,7 @@ public class AssistedElementTypeFilterImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public String toString() - { + public String toString() { if (eIsProxy()) { return super.toString(); } @@ -284,8 +265,7 @@ public class AssistedElementTypeFilterImpl extends MinimalEObjectImpl.Container * @return The new instance. * @generated */ - protected EObject create(EClass eClass) - { + protected EObject create(EClass eClass) { return EcoreUtil.create(eClass); } @@ -297,8 +277,7 @@ public class AssistedElementTypeFilterImpl extends MinimalEObjectImpl.Container * @return The cache adapter for this '<em><b>Assisted Element Type Filter</b></em>'. * @generated */ - protected CacheAdapter getCacheAdapter() - { + protected CacheAdapter getCacheAdapter() { return CacheAdapter.getCacheAdapter(this); } diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/impl/ConnectionAssistantImpl.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/impl/ConnectionAssistantImpl.java index 4a0c1264224..7dd73896a26 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/impl/ConnectionAssistantImpl.java +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/impl/ConnectionAssistantImpl.java @@ -46,8 +46,7 @@ import org.eclipse.papyrus.infra.gmfdiag.assistant.ModelingAssistantProvider; * * @generated */ -public class ConnectionAssistantImpl extends AssistantImpl implements ConnectionAssistant -{ +public class ConnectionAssistantImpl extends AssistantImpl implements ConnectionAssistant { /** * The cached value of the '{@link #getSourceFilter() <em>Source Filter</em>}' reference. * <!-- begin-user-doc --> @@ -98,8 +97,7 @@ public class ConnectionAssistantImpl extends AssistantImpl implements Connection * * @generated */ - protected ConnectionAssistantImpl() - { + protected ConnectionAssistantImpl() { super(); } @@ -110,8 +108,7 @@ public class ConnectionAssistantImpl extends AssistantImpl implements Connection * @generated */ @Override - protected EClass eStaticClass() - { + protected EClass eStaticClass() { return AssistantPackage.Literals.CONNECTION_ASSISTANT; } @@ -122,8 +119,7 @@ public class ConnectionAssistantImpl extends AssistantImpl implements Connection * @generated */ @Override - public ModelingAssistantProvider getProvider() - { + public ModelingAssistantProvider getProvider() { ModelingAssistantProvider provider = basicGetProvider(); return provider != null && provider.eIsProxy() ? (ModelingAssistantProvider) eResolveProxy((InternalEObject) provider) : provider; } @@ -135,11 +131,9 @@ public class ConnectionAssistantImpl extends AssistantImpl implements Connection * @generated */ @Override - public ModelingAssistantProvider basicGetProvider() - { + public ModelingAssistantProvider basicGetProvider() { ModelingAssistantProvider owningProvider = getOwningProvider(); - if (owningProvider != null) - { + if (owningProvider != null) { return owningProvider; } return super.basicGetProvider(); @@ -152,14 +146,11 @@ public class ConnectionAssistantImpl extends AssistantImpl implements Connection * @generated */ @Override - public Filter getSourceFilter() - { - if (sourceFilter != null && sourceFilter.eIsProxy()) - { + public Filter getSourceFilter() { + if (sourceFilter != null && sourceFilter.eIsProxy()) { InternalEObject oldSourceFilter = (InternalEObject) sourceFilter; sourceFilter = (Filter) eResolveProxy(oldSourceFilter); - if (sourceFilter != oldSourceFilter) - { + if (sourceFilter != oldSourceFilter) { if (eNotificationRequired()) { eNotify(new ENotificationImpl(this, Notification.RESOLVE, AssistantPackage.CONNECTION_ASSISTANT__SOURCE_FILTER, oldSourceFilter, sourceFilter)); } @@ -174,8 +165,7 @@ public class ConnectionAssistantImpl extends AssistantImpl implements Connection * * @generated */ - public Filter basicGetSourceFilter() - { + public Filter basicGetSourceFilter() { return sourceFilter; } @@ -186,8 +176,7 @@ public class ConnectionAssistantImpl extends AssistantImpl implements Connection * @generated */ @Override - public void setSourceFilter(Filter newSourceFilter) - { + public void setSourceFilter(Filter newSourceFilter) { Filter oldSourceFilter = sourceFilter; sourceFilter = newSourceFilter; if (eNotificationRequired()) { @@ -195,8 +184,7 @@ public class ConnectionAssistantImpl extends AssistantImpl implements Connection } Resource.Internal eInternalResource = eInternalResource(); if (eInternalResource == null || !eInternalResource.isLoading()) { - if (ownedSourceFilter != null && ownedSourceFilter != newSourceFilter) - { + if (ownedSourceFilter != null && ownedSourceFilter != newSourceFilter) { setOwnedSourceFilter(null); } } @@ -209,14 +197,11 @@ public class ConnectionAssistantImpl extends AssistantImpl implements Connection * @generated */ @Override - public Filter getTargetFilter() - { - if (targetFilter != null && targetFilter.eIsProxy()) - { + public Filter getTargetFilter() { + if (targetFilter != null && targetFilter.eIsProxy()) { InternalEObject oldTargetFilter = (InternalEObject) targetFilter; targetFilter = (Filter) eResolveProxy(oldTargetFilter); - if (targetFilter != oldTargetFilter) - { + if (targetFilter != oldTargetFilter) { if (eNotificationRequired()) { eNotify(new ENotificationImpl(this, Notification.RESOLVE, AssistantPackage.CONNECTION_ASSISTANT__TARGET_FILTER, oldTargetFilter, targetFilter)); } @@ -231,8 +216,7 @@ public class ConnectionAssistantImpl extends AssistantImpl implements Connection * * @generated */ - public Filter basicGetTargetFilter() - { + public Filter basicGetTargetFilter() { return targetFilter; } @@ -243,8 +227,7 @@ public class ConnectionAssistantImpl extends AssistantImpl implements Connection * @generated */ @Override - public void setTargetFilter(Filter newTargetFilter) - { + public void setTargetFilter(Filter newTargetFilter) { Filter oldTargetFilter = targetFilter; targetFilter = newTargetFilter; if (eNotificationRequired()) { @@ -252,8 +235,7 @@ public class ConnectionAssistantImpl extends AssistantImpl implements Connection } Resource.Internal eInternalResource = eInternalResource(); if (eInternalResource == null || !eInternalResource.isLoading()) { - if (ownedTargetFilter != null && ownedTargetFilter != newTargetFilter) - { + if (ownedTargetFilter != null && ownedTargetFilter != newTargetFilter) { setOwnedTargetFilter(null); } } @@ -266,8 +248,7 @@ public class ConnectionAssistantImpl extends AssistantImpl implements Connection * @generated */ @Override - public ModelingAssistantProvider getOwningProvider() - { + public ModelingAssistantProvider getOwningProvider() { if (eContainerFeatureID() != AssistantPackage.CONNECTION_ASSISTANT__OWNING_PROVIDER) { return null; } @@ -280,8 +261,7 @@ public class ConnectionAssistantImpl extends AssistantImpl implements Connection * * @generated */ - public NotificationChain basicSetOwningProvider(ModelingAssistantProvider newOwningProvider, NotificationChain msgs) - { + public NotificationChain basicSetOwningProvider(ModelingAssistantProvider newOwningProvider, NotificationChain msgs) { msgs = eBasicSetContainer((InternalEObject) newOwningProvider, AssistantPackage.CONNECTION_ASSISTANT__OWNING_PROVIDER, msgs); return msgs; } @@ -293,10 +273,8 @@ public class ConnectionAssistantImpl extends AssistantImpl implements Connection * @generated */ @Override - public void setOwningProvider(ModelingAssistantProvider newOwningProvider) - { - if (newOwningProvider != eInternalContainer() || (eContainerFeatureID() != AssistantPackage.CONNECTION_ASSISTANT__OWNING_PROVIDER && newOwningProvider != null)) - { + public void setOwningProvider(ModelingAssistantProvider newOwningProvider) { + if (newOwningProvider != eInternalContainer() || (eContainerFeatureID() != AssistantPackage.CONNECTION_ASSISTANT__OWNING_PROVIDER && newOwningProvider != null)) { if (EcoreUtil.isAncestor(this, newOwningProvider)) { throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$ @@ -312,8 +290,7 @@ public class ConnectionAssistantImpl extends AssistantImpl implements Connection if (msgs != null) { msgs.dispatch(); } - } - else if (eNotificationRequired()) { + } else if (eNotificationRequired()) { eNotify(new ENotificationImpl(this, Notification.SET, AssistantPackage.CONNECTION_ASSISTANT__OWNING_PROVIDER, newOwningProvider, newOwningProvider)); } } @@ -325,8 +302,7 @@ public class ConnectionAssistantImpl extends AssistantImpl implements Connection * @generated */ @Override - public Filter getOwnedSourceFilter() - { + public Filter getOwnedSourceFilter() { return ownedSourceFilter; } @@ -336,12 +312,10 @@ public class ConnectionAssistantImpl extends AssistantImpl implements Connection * * @generated */ - public NotificationChain basicSetOwnedSourceFilter(Filter newOwnedSourceFilter, NotificationChain msgs) - { + public NotificationChain basicSetOwnedSourceFilter(Filter newOwnedSourceFilter, NotificationChain msgs) { Filter oldOwnedSourceFilter = ownedSourceFilter; ownedSourceFilter = newOwnedSourceFilter; - if (eNotificationRequired()) - { + if (eNotificationRequired()) { ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, AssistantPackage.CONNECTION_ASSISTANT__OWNED_SOURCE_FILTER, oldOwnedSourceFilter, newOwnedSourceFilter); if (msgs == null) { msgs = notification; @@ -351,10 +325,8 @@ public class ConnectionAssistantImpl extends AssistantImpl implements Connection } Resource.Internal eInternalResource = eInternalResource(); if (eInternalResource == null || !eInternalResource.isLoading()) { - if (newOwnedSourceFilter != null) - { - if (newOwnedSourceFilter != sourceFilter) - { + if (newOwnedSourceFilter != null) { + if (newOwnedSourceFilter != sourceFilter) { setSourceFilter(newOwnedSourceFilter); } } @@ -369,10 +341,8 @@ public class ConnectionAssistantImpl extends AssistantImpl implements Connection * @generated */ @Override - public void setOwnedSourceFilter(Filter newOwnedSourceFilter) - { - if (newOwnedSourceFilter != ownedSourceFilter) - { + public void setOwnedSourceFilter(Filter newOwnedSourceFilter) { + if (newOwnedSourceFilter != ownedSourceFilter) { NotificationChain msgs = null; if (ownedSourceFilter != null) { msgs = ((InternalEObject) ownedSourceFilter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - AssistantPackage.CONNECTION_ASSISTANT__OWNED_SOURCE_FILTER, null, msgs); @@ -384,8 +354,7 @@ public class ConnectionAssistantImpl extends AssistantImpl implements Connection if (msgs != null) { msgs.dispatch(); } - } - else if (eNotificationRequired()) { + } else if (eNotificationRequired()) { eNotify(new ENotificationImpl(this, Notification.SET, AssistantPackage.CONNECTION_ASSISTANT__OWNED_SOURCE_FILTER, newOwnedSourceFilter, newOwnedSourceFilter)); } } @@ -397,8 +366,7 @@ public class ConnectionAssistantImpl extends AssistantImpl implements Connection * @generated */ @Override - public Filter createOwnedSourceFilter(String name, EClass eClass) - { + public Filter createOwnedSourceFilter(String name, EClass eClass) { Filter newOwnedSourceFilter = (Filter) create(eClass); setOwnedSourceFilter(newOwnedSourceFilter); if (name != null) { @@ -414,8 +382,7 @@ public class ConnectionAssistantImpl extends AssistantImpl implements Connection * @generated */ @Override - public Filter getOwnedTargetFilter() - { + public Filter getOwnedTargetFilter() { return ownedTargetFilter; } @@ -425,12 +392,10 @@ public class ConnectionAssistantImpl extends AssistantImpl implements Connection * * @generated */ - public NotificationChain basicSetOwnedTargetFilter(Filter newOwnedTargetFilter, NotificationChain msgs) - { + public NotificationChain basicSetOwnedTargetFilter(Filter newOwnedTargetFilter, NotificationChain msgs) { Filter oldOwnedTargetFilter = ownedTargetFilter; ownedTargetFilter = newOwnedTargetFilter; - if (eNotificationRequired()) - { + if (eNotificationRequired()) { ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, AssistantPackage.CONNECTION_ASSISTANT__OWNED_TARGET_FILTER, oldOwnedTargetFilter, newOwnedTargetFilter); if (msgs == null) { msgs = notification; @@ -440,10 +405,8 @@ public class ConnectionAssistantImpl extends AssistantImpl implements Connection } Resource.Internal eInternalResource = eInternalResource(); if (eInternalResource == null || !eInternalResource.isLoading()) { - if (newOwnedTargetFilter != null) - { - if (newOwnedTargetFilter != targetFilter) - { + if (newOwnedTargetFilter != null) { + if (newOwnedTargetFilter != targetFilter) { setTargetFilter(newOwnedTargetFilter); } } @@ -458,10 +421,8 @@ public class ConnectionAssistantImpl extends AssistantImpl implements Connection * @generated */ @Override - public void setOwnedTargetFilter(Filter newOwnedTargetFilter) - { - if (newOwnedTargetFilter != ownedTargetFilter) - { + public void setOwnedTargetFilter(Filter newOwnedTargetFilter) { + if (newOwnedTargetFilter != ownedTargetFilter) { NotificationChain msgs = null; if (ownedTargetFilter != null) { msgs = ((InternalEObject) ownedTargetFilter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - AssistantPackage.CONNECTION_ASSISTANT__OWNED_TARGET_FILTER, null, msgs); @@ -473,8 +434,7 @@ public class ConnectionAssistantImpl extends AssistantImpl implements Connection if (msgs != null) { msgs.dispatch(); } - } - else if (eNotificationRequired()) { + } else if (eNotificationRequired()) { eNotify(new ENotificationImpl(this, Notification.SET, AssistantPackage.CONNECTION_ASSISTANT__OWNED_TARGET_FILTER, newOwnedTargetFilter, newOwnedTargetFilter)); } } @@ -486,8 +446,7 @@ public class ConnectionAssistantImpl extends AssistantImpl implements Connection * @generated */ @Override - public Filter createOwnedTargetFilter(String name, EClass eClass) - { + public Filter createOwnedTargetFilter(String name, EClass eClass) { Filter newOwnedTargetFilter = (Filter) create(eClass); setOwnedTargetFilter(newOwnedTargetFilter); if (name != null) { @@ -503,10 +462,8 @@ public class ConnectionAssistantImpl extends AssistantImpl implements Connection * @generated */ @Override - public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) - { - switch (featureID) - { + public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { case AssistantPackage.CONNECTION_ASSISTANT__OWNING_PROVIDER: if (eInternalContainer() != null) { msgs = eBasicRemoveFromContainer(msgs); @@ -523,10 +480,8 @@ public class ConnectionAssistantImpl extends AssistantImpl implements Connection * @generated */ @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) - { - switch (featureID) - { + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { case AssistantPackage.CONNECTION_ASSISTANT__OWNED_SOURCE_FILTER: return basicSetOwnedSourceFilter(null, msgs); case AssistantPackage.CONNECTION_ASSISTANT__OWNED_TARGET_FILTER: @@ -544,10 +499,8 @@ public class ConnectionAssistantImpl extends AssistantImpl implements Connection * @generated */ @Override - public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) - { - switch (eContainerFeatureID()) - { + public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) { + switch (eContainerFeatureID()) { case AssistantPackage.CONNECTION_ASSISTANT__OWNING_PROVIDER: return eInternalContainer().eInverseRemove(this, AssistantPackage.MODELING_ASSISTANT_PROVIDER__CONNECTION_ASSISTANT, ModelingAssistantProvider.class, msgs); } @@ -561,10 +514,8 @@ public class ConnectionAssistantImpl extends AssistantImpl implements Connection * @generated */ @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) - { - switch (featureID) - { + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { case AssistantPackage.CONNECTION_ASSISTANT__SOURCE_FILTER: if (resolve) { return getSourceFilter(); @@ -592,10 +543,8 @@ public class ConnectionAssistantImpl extends AssistantImpl implements Connection * @generated */ @Override - public void eSet(int featureID, Object newValue) - { - switch (featureID) - { + public void eSet(int featureID, Object newValue) { + switch (featureID) { case AssistantPackage.CONNECTION_ASSISTANT__SOURCE_FILTER: setSourceFilter((Filter) newValue); return; @@ -622,10 +571,8 @@ public class ConnectionAssistantImpl extends AssistantImpl implements Connection * @generated */ @Override - public void eUnset(int featureID) - { - switch (featureID) - { + public void eUnset(int featureID) { + switch (featureID) { case AssistantPackage.CONNECTION_ASSISTANT__SOURCE_FILTER: setSourceFilter((Filter) null); return; @@ -652,10 +599,8 @@ public class ConnectionAssistantImpl extends AssistantImpl implements Connection * @generated */ @Override - public boolean eIsSet(int featureID) - { - switch (featureID) - { + public boolean eIsSet(int featureID) { + switch (featureID) { case AssistantPackage.CONNECTION_ASSISTANT__PROVIDER: return isSetProvider(); case AssistantPackage.CONNECTION_ASSISTANT__SOURCE_FILTER: @@ -679,8 +624,7 @@ public class ConnectionAssistantImpl extends AssistantImpl implements Connection * @generated */ @Override - public boolean isSetProvider() - { + public boolean isSetProvider() { return super.isSetProvider() || eIsSet(AssistantPackage.CONNECTION_ASSISTANT__OWNING_PROVIDER); } diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/impl/ElementTypeFilterImpl.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/impl/ElementTypeFilterImpl.java index 4f948e6d660..a9b86f4a050 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/impl/ElementTypeFilterImpl.java +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/impl/ElementTypeFilterImpl.java @@ -43,8 +43,7 @@ import org.eclipse.uml2.common.util.CacheAdapter; * * @generated */ -public class ElementTypeFilterImpl extends MinimalEObjectImpl.Container implements ElementTypeFilter -{ +public class ElementTypeFilterImpl extends MinimalEObjectImpl.Container implements ElementTypeFilter { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. * <!-- begin-user-doc --> @@ -106,8 +105,7 @@ public class ElementTypeFilterImpl extends MinimalEObjectImpl.Container implemen * * @generated */ - protected ElementTypeFilterImpl() - { + protected ElementTypeFilterImpl() { super(); } @@ -118,8 +116,7 @@ public class ElementTypeFilterImpl extends MinimalEObjectImpl.Container implemen * @generated */ @Override - protected EClass eStaticClass() - { + protected EClass eStaticClass() { return AssistantPackage.Literals.ELEMENT_TYPE_FILTER; } @@ -130,8 +127,7 @@ public class ElementTypeFilterImpl extends MinimalEObjectImpl.Container implemen * @generated */ @Override - public String getName() - { + public String getName() { return name; } @@ -142,8 +138,7 @@ public class ElementTypeFilterImpl extends MinimalEObjectImpl.Container implemen * @generated */ @Override - public void setName(String newName) - { + public void setName(String newName) { newName = newName == null ? NAME_EDEFAULT : newName; String oldName = name; name = newName; @@ -159,8 +154,7 @@ public class ElementTypeFilterImpl extends MinimalEObjectImpl.Container implemen * @generated */ @Override - public String getElementTypeID() - { + public String getElementTypeID() { return elementTypeID; } @@ -171,8 +165,7 @@ public class ElementTypeFilterImpl extends MinimalEObjectImpl.Container implemen * @generated */ @Override - public void setElementTypeID(String newElementTypeID) - { + public void setElementTypeID(String newElementTypeID) { newElementTypeID = newElementTypeID == null ? ELEMENT_TYPE_ID_EDEFAULT : newElementTypeID; String oldElementTypeID = elementTypeID; elementTypeID = newElementTypeID; @@ -188,14 +181,11 @@ public class ElementTypeFilterImpl extends MinimalEObjectImpl.Container implemen * @generated */ @Override - public IElementType getElementType() - { + public IElementType getElementType() { CacheAdapter cache = getCacheAdapter(); - if (cache != null) - { + if (cache != null) { IElementType result = (IElementType) cache.get(eResource(), this, AssistantPackage.Literals.ELEMENT_TYPE_FILTER__ELEMENT_TYPE); - if (result == null) - { + if (result == null) { cache.put(eResource(), this, AssistantPackage.Literals.ELEMENT_TYPE_FILTER__ELEMENT_TYPE, result = ElementTypeFilterOperations.getElementType(this)); } return result; @@ -210,8 +200,7 @@ public class ElementTypeFilterImpl extends MinimalEObjectImpl.Container implemen * @generated */ @Override - public ModelingAssistantProvider getProvider() - { + public ModelingAssistantProvider getProvider() { ModelingAssistantProvider provider = basicGetProvider(); return provider != null && provider.eIsProxy() ? (ModelingAssistantProvider) eResolveProxy((InternalEObject) provider) : provider; } @@ -222,8 +211,7 @@ public class ElementTypeFilterImpl extends MinimalEObjectImpl.Container implemen * * @generated */ - public ModelingAssistantProvider basicGetProvider() - { + public ModelingAssistantProvider basicGetProvider() { return ElementTypeFilterOperations.getProvider(this); } @@ -234,8 +222,7 @@ public class ElementTypeFilterImpl extends MinimalEObjectImpl.Container implemen * @generated */ @Override - public boolean matches(Object input) - { + public boolean matches(Object input) { return ElementTypeFilterOperations.matches(this, input); } @@ -246,10 +233,8 @@ public class ElementTypeFilterImpl extends MinimalEObjectImpl.Container implemen * @generated */ @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) - { - switch (featureID) - { + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { case AssistantPackage.ELEMENT_TYPE_FILTER__NAME: return getName(); case AssistantPackage.ELEMENT_TYPE_FILTER__ELEMENT_TYPE_ID: @@ -272,10 +257,8 @@ public class ElementTypeFilterImpl extends MinimalEObjectImpl.Container implemen * @generated */ @Override - public void eSet(int featureID, Object newValue) - { - switch (featureID) - { + public void eSet(int featureID, Object newValue) { + switch (featureID) { case AssistantPackage.ELEMENT_TYPE_FILTER__NAME: setName((String) newValue); return; @@ -293,10 +276,8 @@ public class ElementTypeFilterImpl extends MinimalEObjectImpl.Container implemen * @generated */ @Override - public void eUnset(int featureID) - { - switch (featureID) - { + public void eUnset(int featureID) { + switch (featureID) { case AssistantPackage.ELEMENT_TYPE_FILTER__NAME: setName(NAME_EDEFAULT); return; @@ -314,10 +295,8 @@ public class ElementTypeFilterImpl extends MinimalEObjectImpl.Container implemen * @generated */ @Override - public boolean eIsSet(int featureID) - { - switch (featureID) - { + public boolean eIsSet(int featureID) { + switch (featureID) { case AssistantPackage.ELEMENT_TYPE_FILTER__NAME: return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); case AssistantPackage.ELEMENT_TYPE_FILTER__ELEMENT_TYPE_ID: @@ -337,10 +316,8 @@ public class ElementTypeFilterImpl extends MinimalEObjectImpl.Container implemen * @generated */ @Override - public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException - { - switch (operationID) - { + public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException { + switch (operationID) { case AssistantPackage.ELEMENT_TYPE_FILTER___MATCHES__OBJECT: return matches(arguments.get(0)); } @@ -354,8 +331,7 @@ public class ElementTypeFilterImpl extends MinimalEObjectImpl.Container implemen * @generated */ @Override - public String toString() - { + public String toString() { if (eIsProxy()) { return super.toString(); } @@ -379,8 +355,7 @@ public class ElementTypeFilterImpl extends MinimalEObjectImpl.Container implemen * @return The new instance. * @generated */ - protected EObject create(EClass eClass) - { + protected EObject create(EClass eClass) { return EcoreUtil.create(eClass); } @@ -392,8 +367,7 @@ public class ElementTypeFilterImpl extends MinimalEObjectImpl.Container implemen * @return The cache adapter for this '<em><b>Element Type Filter</b></em>'. * @generated */ - protected CacheAdapter getCacheAdapter() - { + protected CacheAdapter getCacheAdapter() { return CacheAdapter.getCacheAdapter(this); } diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/impl/ModelingAssistantProviderImpl.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/impl/ModelingAssistantProviderImpl.java index eeb56801249..879ce2af2db 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/impl/ModelingAssistantProviderImpl.java +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/impl/ModelingAssistantProviderImpl.java @@ -77,8 +77,7 @@ import org.eclipse.uml2.common.util.SubsetSupersetEDataTypeUniqueEList; * * @generated */ -public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container implements ModelingAssistantProvider -{ +public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container implements ModelingAssistantProvider { /** * The cached value of the '{@link #getListeners() <em>Listener</em>}' attribute list. * <!-- begin-user-doc --> @@ -217,8 +216,7 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * * @generated */ - protected ModelingAssistantProviderImpl() - { + protected ModelingAssistantProviderImpl() { super(); } @@ -229,8 +227,7 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - protected EClass eStaticClass() - { + protected EClass eStaticClass() { return AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER; } @@ -240,11 +237,9 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * * @generated */ - public EList<IProviderChangeListener> getListeners() - { - if (listeners == null) - { - listeners = new EDataTypeUniqueEList<IProviderChangeListener>(IProviderChangeListener.class, this, AssistantPackage.MODELING_ASSISTANT_PROVIDER__LISTENER); + public EList<IProviderChangeListener> getListeners() { + if (listeners == null) { + listeners = new EDataTypeUniqueEList<>(IProviderChangeListener.class, this, AssistantPackage.MODELING_ASSISTANT_PROVIDER__LISTENER); } return listeners; } @@ -256,21 +251,19 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public EList<Assistant> getAssistants() - { + public EList<Assistant> getAssistants() { CacheAdapter cache = getCacheAdapter(); if (cache != null) { Resource eResource = eResource(); @SuppressWarnings("unchecked") EList<Assistant> assistants = (EList<Assistant>) cache.get(eResource, this, AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__ASSISTANT); - if (assistants == null) - { - cache.put(eResource, this, AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__ASSISTANT, assistants = new DerivedUnionEObjectEList<Assistant>(Assistant.class, this, AssistantPackage.MODELING_ASSISTANT_PROVIDER__ASSISTANT, - ASSISTANT_ESUBSETS)); + if (assistants == null) { + cache.put(eResource, this, AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__ASSISTANT, + assistants = new DerivedUnionEObjectEList<>(Assistant.class, this, AssistantPackage.MODELING_ASSISTANT_PROVIDER__ASSISTANT, ASSISTANT_ESUBSETS)); } return assistants; } - return new DerivedUnionEObjectEList<Assistant>(Assistant.class, this, AssistantPackage.MODELING_ASSISTANT_PROVIDER__ASSISTANT, ASSISTANT_ESUBSETS); + return new DerivedUnionEObjectEList<>(Assistant.class, this, AssistantPackage.MODELING_ASSISTANT_PROVIDER__ASSISTANT, ASSISTANT_ESUBSETS); } /** @@ -291,8 +284,7 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public String getName() - { + public String getName() { return name; } @@ -303,8 +295,7 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public void setName(String newName) - { + public void setName(String newName) { newName = newName == null ? NAME_EDEFAULT : newName; String oldName = name; name = newName; @@ -320,11 +311,9 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public EList<Filter> getOwnedFilters() - { - if (ownedFilters == null) - { - ownedFilters = new EObjectContainmentEList<Filter>(Filter.class, this, AssistantPackage.MODELING_ASSISTANT_PROVIDER__OWNED_FILTER); + public EList<Filter> getOwnedFilters() { + if (ownedFilters == null) { + ownedFilters = new EObjectContainmentEList<>(Filter.class, this, AssistantPackage.MODELING_ASSISTANT_PROVIDER__OWNED_FILTER); } return ownedFilters; } @@ -336,8 +325,7 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public Filter createOwnedFilter(String name, EClass eClass) - { + public Filter createOwnedFilter(String name, EClass eClass) { Filter newOwnedFilter = (Filter) create(eClass); getOwnedFilters().add(newOwnedFilter); if (name != null) { @@ -353,8 +341,7 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public Filter getOwnedFilter(String name) - { + public Filter getOwnedFilter(String name) { return getOwnedFilter(name, false, null, false); } @@ -365,10 +352,8 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public Filter getOwnedFilter(String name, boolean ignoreCase, EClass eClass, boolean createOnDemand) - { - ownedFilterLoop: for (Filter ownedFilter : getOwnedFilters()) - { + public Filter getOwnedFilter(String name, boolean ignoreCase, EClass eClass, boolean createOnDemand) { + ownedFilterLoop: for (Filter ownedFilter : getOwnedFilters()) { if (eClass != null && !eClass.isInstance(ownedFilter)) { continue ownedFilterLoop; } @@ -387,11 +372,9 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public EList<PopupAssistant> getPopupAssistants() - { - if (popupAssistants == null) - { - popupAssistants = new EObjectContainmentWithInverseEList<PopupAssistant>(PopupAssistant.class, this, AssistantPackage.MODELING_ASSISTANT_PROVIDER__POPUP_ASSISTANT, AssistantPackage.POPUP_ASSISTANT__OWNING_PROVIDER); + public EList<PopupAssistant> getPopupAssistants() { + if (popupAssistants == null) { + popupAssistants = new EObjectContainmentWithInverseEList<>(PopupAssistant.class, this, AssistantPackage.MODELING_ASSISTANT_PROVIDER__POPUP_ASSISTANT, AssistantPackage.POPUP_ASSISTANT__OWNING_PROVIDER); } return popupAssistants; } @@ -403,8 +386,7 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public PopupAssistant createPopupAssistant() - { + public PopupAssistant createPopupAssistant() { PopupAssistant newPopupAssistant = (PopupAssistant) create(AssistantPackage.Literals.POPUP_ASSISTANT); getPopupAssistants().add(newPopupAssistant); return newPopupAssistant; @@ -417,11 +399,9 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public EList<ConnectionAssistant> getConnectionAssistants() - { - if (connectionAssistants == null) - { - connectionAssistants = new EObjectContainmentWithInverseEList<ConnectionAssistant>(ConnectionAssistant.class, this, AssistantPackage.MODELING_ASSISTANT_PROVIDER__CONNECTION_ASSISTANT, AssistantPackage.CONNECTION_ASSISTANT__OWNING_PROVIDER); + public EList<ConnectionAssistant> getConnectionAssistants() { + if (connectionAssistants == null) { + connectionAssistants = new EObjectContainmentWithInverseEList<>(ConnectionAssistant.class, this, AssistantPackage.MODELING_ASSISTANT_PROVIDER__CONNECTION_ASSISTANT, AssistantPackage.CONNECTION_ASSISTANT__OWNING_PROVIDER); } return connectionAssistants; } @@ -433,8 +413,7 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public ConnectionAssistant createConnectionAssistant() - { + public ConnectionAssistant createConnectionAssistant() { ConnectionAssistant newConnectionAssistant = (ConnectionAssistant) create(AssistantPackage.Literals.CONNECTION_ASSISTANT); getConnectionAssistants().add(newConnectionAssistant); return newConnectionAssistant; @@ -447,15 +426,12 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public EList<IElementType> getElementTypes() - { + public EList<IElementType> getElementTypes() { CacheAdapter cache = getCacheAdapter(); - if (cache != null) - { + if (cache != null) { @SuppressWarnings("unchecked") EList<IElementType> result = (EList<IElementType>) cache.get(eResource(), this, AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__ELEMENT_TYPE); - if (result == null) - { + if (result == null) { cache.put(eResource(), this, AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__ELEMENT_TYPE, result = ModelingAssistantProviderOperations.getElementTypes(this)); } return result; @@ -470,11 +446,9 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public EList<String> getElementTypeIDs() - { - if (elementTypeIDs == null) - { - elementTypeIDs = new SubsetSupersetEDataTypeUniqueEList<String>(String.class, this, AssistantPackage.MODELING_ASSISTANT_PROVIDER__ELEMENT_TYPE_ID, null, ELEMENT_TYPE_ID_ESUBSETS); + public EList<String> getElementTypeIDs() { + if (elementTypeIDs == null) { + elementTypeIDs = new SubsetSupersetEDataTypeUniqueEList<>(String.class, this, AssistantPackage.MODELING_ASSISTANT_PROVIDER__ELEMENT_TYPE_ID, null, ELEMENT_TYPE_ID_ESUBSETS); } return elementTypeIDs; } @@ -497,14 +471,11 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public IClientContext getClientContext() - { + public IClientContext getClientContext() { CacheAdapter cache = getCacheAdapter(); - if (cache != null) - { + if (cache != null) { IClientContext result = (IClientContext) cache.get(eResource(), this, AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__CLIENT_CONTEXT); - if (result == null) - { + if (result == null) { cache.put(eResource(), this, AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__CLIENT_CONTEXT, result = ModelingAssistantProviderOperations.getClientContext(this)); } return result; @@ -519,8 +490,7 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public String getClientContextID() - { + public String getClientContextID() { return clientContextID; } @@ -531,8 +501,7 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public void setClientContextID(String newClientContextID) - { + public void setClientContextID(String newClientContextID) { newClientContextID = newClientContextID == null ? CLIENT_CONTEXT_ID_EDEFAULT : newClientContextID; String oldClientContextID = clientContextID; clientContextID = newClientContextID; @@ -548,15 +517,12 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public EList<IElementType> getExcludedElementTypes() - { + public EList<IElementType> getExcludedElementTypes() { CacheAdapter cache = getCacheAdapter(); - if (cache != null) - { + if (cache != null) { @SuppressWarnings("unchecked") EList<IElementType> result = (EList<IElementType>) cache.get(eResource(), this, AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__EXCLUDED_ELEMENT_TYPE); - if (result == null) - { + if (result == null) { cache.put(eResource(), this, AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__EXCLUDED_ELEMENT_TYPE, result = ModelingAssistantProviderOperations.getExcludedElementTypes(this)); } return result; @@ -571,11 +537,9 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public EList<String> getExcludedElementTypeIDs() - { - if (excludedElementTypeIDs == null) - { - excludedElementTypeIDs = new EDataTypeUniqueEList<String>(String.class, this, AssistantPackage.MODELING_ASSISTANT_PROVIDER__EXCLUDED_ELEMENT_TYPE_ID); + public EList<String> getExcludedElementTypeIDs() { + if (excludedElementTypeIDs == null) { + excludedElementTypeIDs = new EDataTypeUniqueEList<>(String.class, this, AssistantPackage.MODELING_ASSISTANT_PROVIDER__EXCLUDED_ELEMENT_TYPE_ID); } return excludedElementTypeIDs; } @@ -587,15 +551,12 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public EList<IElementType> getRelationshipTypes() - { + public EList<IElementType> getRelationshipTypes() { CacheAdapter cache = getCacheAdapter(); - if (cache != null) - { + if (cache != null) { @SuppressWarnings("unchecked") EList<IElementType> result = (EList<IElementType>) cache.get(eResource(), this, AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__RELATIONSHIP_TYPE); - if (result == null) - { + if (result == null) { cache.put(eResource(), this, AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__RELATIONSHIP_TYPE, result = ModelingAssistantProviderOperations.getRelationshipTypes(this)); } return result; @@ -610,11 +571,9 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public EList<String> getRelationshipTypeIDs() - { - if (relationshipTypeIDs == null) - { - relationshipTypeIDs = new SubsetSupersetEDataTypeUniqueEList<String>(String.class, this, AssistantPackage.MODELING_ASSISTANT_PROVIDER__RELATIONSHIP_TYPE_ID, RELATIONSHIP_TYPE_ID_ESUPERSETS, null); + public EList<String> getRelationshipTypeIDs() { + if (relationshipTypeIDs == null) { + relationshipTypeIDs = new SubsetSupersetEDataTypeUniqueEList<>(String.class, this, AssistantPackage.MODELING_ASSISTANT_PROVIDER__RELATIONSHIP_TYPE_ID, RELATIONSHIP_TYPE_ID_ESUPERSETS, null); } return relationshipTypeIDs; } @@ -637,8 +596,7 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public boolean provides(IOperation operation) - { + public boolean provides(IOperation operation) { return ModelingAssistantProviderOperations.provides(this, operation); } @@ -649,8 +607,7 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public void addProviderChangeListener(IProviderChangeListener listener) - { + public void addProviderChangeListener(IProviderChangeListener listener) { ModelingAssistantProviderOperations.addProviderChangeListener(this, listener); } @@ -661,8 +618,7 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public void removeProviderChangeListener(IProviderChangeListener listener) - { + public void removeProviderChangeListener(IProviderChangeListener listener) { ModelingAssistantProviderOperations.removeProviderChangeListener(this, listener); } @@ -673,8 +629,7 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public EList<IElementType> getTypes(String hint, IAdaptable data) - { + public EList<IElementType> getTypes(String hint, IAdaptable data) { return ModelingAssistantProviderOperations.getTypes(this, hint, data); } @@ -685,8 +640,7 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public EList<IElementType> getRelTypesOnSource(IAdaptable source) - { + public EList<IElementType> getRelTypesOnSource(IAdaptable source) { return ModelingAssistantProviderOperations.getRelTypesOnSource(this, source); } @@ -697,8 +651,7 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public EList<IElementType> getRelTypesOnTarget(IAdaptable target) - { + public EList<IElementType> getRelTypesOnTarget(IAdaptable target) { return ModelingAssistantProviderOperations.getRelTypesOnTarget(this, target); } @@ -709,8 +662,7 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public EList<IElementType> getRelTypesOnSourceAndTarget(IAdaptable source, IAdaptable target) - { + public EList<IElementType> getRelTypesOnSourceAndTarget(IAdaptable source, IAdaptable target) { return ModelingAssistantProviderOperations.getRelTypesOnSourceAndTarget(this, source, target); } @@ -721,8 +673,7 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public EList<IElementType> getRelTypesForSREOnTarget(IAdaptable target) - { + public EList<IElementType> getRelTypesForSREOnTarget(IAdaptable target) { return ModelingAssistantProviderOperations.getRelTypesForSREOnTarget(this, target); } @@ -733,8 +684,7 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public EList<IElementType> getRelTypesForSREOnSource(IAdaptable source) - { + public EList<IElementType> getRelTypesForSREOnSource(IAdaptable source) { return ModelingAssistantProviderOperations.getRelTypesForSREOnSource(this, source); } @@ -745,8 +695,7 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public EList<IElementType> getTypesForSource(IAdaptable target, IElementType relationshipType) - { + public EList<IElementType> getTypesForSource(IAdaptable target, IElementType relationshipType) { return ModelingAssistantProviderOperations.getTypesForSource(this, target, relationshipType); } @@ -757,8 +706,7 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public EList<IElementType> getTypesForTarget(IAdaptable source, IElementType relationshipType) - { + public EList<IElementType> getTypesForTarget(IAdaptable source, IElementType relationshipType) { return ModelingAssistantProviderOperations.getTypesForTarget(this, source, relationshipType); } @@ -769,8 +717,7 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public EObject selectExistingElementForSource(IAdaptable target, IElementType relationshipType) - { + public EObject selectExistingElementForSource(IAdaptable target, IElementType relationshipType) { return ModelingAssistantProviderOperations.selectExistingElementForSource(this, target, relationshipType); } @@ -781,8 +728,7 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public EObject selectExistingElementForTarget(IAdaptable source, IElementType relationshipType) - { + public EObject selectExistingElementForTarget(IAdaptable source, IElementType relationshipType) { return ModelingAssistantProviderOperations.selectExistingElementForTarget(this, source, relationshipType); } @@ -793,8 +739,7 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public EList<IElementType> getTypesForPopupBar(IAdaptable host) - { + public EList<IElementType> getTypesForPopupBar(IAdaptable host) { return ModelingAssistantProviderOperations.getTypesForPopupBar(this, host); } @@ -805,8 +750,7 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public IElementType getElementType(String id) - { + public IElementType getElementType(String id) { return ModelingAssistantProviderOperations.getElementType(this, id); } @@ -817,8 +761,7 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public boolean isRelationshipType(IElementType elementType) - { + public boolean isRelationshipType(IElementType elementType) { return ModelingAssistantProviderOperations.isRelationshipType(this, elementType); } @@ -830,10 +773,8 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container */ @SuppressWarnings("unchecked") @Override - public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) - { - switch (featureID) - { + public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { case AssistantPackage.MODELING_ASSISTANT_PROVIDER__POPUP_ASSISTANT: return ((InternalEList<InternalEObject>) (InternalEList<?>) getPopupAssistants()).basicAdd(otherEnd, msgs); case AssistantPackage.MODELING_ASSISTANT_PROVIDER__CONNECTION_ASSISTANT: @@ -849,10 +790,8 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) - { - switch (featureID) - { + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { case AssistantPackage.MODELING_ASSISTANT_PROVIDER__OWNED_FILTER: return ((InternalEList<?>) getOwnedFilters()).basicRemove(otherEnd, msgs); case AssistantPackage.MODELING_ASSISTANT_PROVIDER__POPUP_ASSISTANT: @@ -870,10 +809,8 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) - { - switch (featureID) - { + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { case AssistantPackage.MODELING_ASSISTANT_PROVIDER__LISTENER: return getListeners(); case AssistantPackage.MODELING_ASSISTANT_PROVIDER__ASSISTANT: @@ -914,10 +851,8 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container */ @SuppressWarnings("unchecked") @Override - public void eSet(int featureID, Object newValue) - { - switch (featureID) - { + public void eSet(int featureID, Object newValue) { + switch (featureID) { case AssistantPackage.MODELING_ASSISTANT_PROVIDER__LISTENER: getListeners().clear(); getListeners().addAll((Collection<? extends IProviderChangeListener>) newValue); @@ -963,10 +898,8 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public void eUnset(int featureID) - { - switch (featureID) - { + public void eUnset(int featureID) { + switch (featureID) { case AssistantPackage.MODELING_ASSISTANT_PROVIDER__LISTENER: getListeners().clear(); return; @@ -1005,10 +938,8 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public boolean eIsSet(int featureID) - { - switch (featureID) - { + public boolean eIsSet(int featureID) { + switch (featureID) { case AssistantPackage.MODELING_ASSISTANT_PROVIDER__LISTENER: return listeners != null && !listeners.isEmpty(); case AssistantPackage.MODELING_ASSISTANT_PROVIDER__ASSISTANT: @@ -1048,10 +979,8 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException - { - switch (operationID) - { + public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException { + switch (operationID) { case AssistantPackage.MODELING_ASSISTANT_PROVIDER___PROVIDES__IOPERATION: return provides((IOperation) arguments.get(0)); case AssistantPackage.MODELING_ASSISTANT_PROVIDER___ADD_PROVIDER_CHANGE_LISTENER__IPROVIDERCHANGELISTENER: @@ -1097,8 +1026,7 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @generated */ @Override - public String toString() - { + public String toString() { if (eIsProxy()) { return super.toString(); } @@ -1130,8 +1058,7 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @return The new instance. * @generated */ - protected EObject create(EClass eClass) - { + protected EObject create(EClass eClass) { return EcoreUtil.create(eClass); } @@ -1143,8 +1070,7 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * @return The cache adapter for this '<em><b>Modeling Assistant Provider</b></em>'. * @generated */ - protected CacheAdapter getCacheAdapter() - { + protected CacheAdapter getCacheAdapter() { return CacheAdapter.getCacheAdapter(this); } @@ -1154,8 +1080,7 @@ public class ModelingAssistantProviderImpl extends MinimalEObjectImpl.Container * * @generated */ - public boolean isSetAssistants() - { + public boolean isSetAssistants() { return eIsSet(AssistantPackage.MODELING_ASSISTANT_PROVIDER__POPUP_ASSISTANT) || eIsSet(AssistantPackage.MODELING_ASSISTANT_PROVIDER__CONNECTION_ASSISTANT); } diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/impl/PopupAssistantImpl.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/impl/PopupAssistantImpl.java index 668be44144d..306fa2eafb0 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/impl/PopupAssistantImpl.java +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/impl/PopupAssistantImpl.java @@ -44,8 +44,7 @@ import org.eclipse.papyrus.infra.gmfdiag.assistant.PopupAssistant; * * @generated */ -public class PopupAssistantImpl extends AssistantImpl implements PopupAssistant -{ +public class PopupAssistantImpl extends AssistantImpl implements PopupAssistant { /** * The cached value of the '{@link #getFilter() <em>Filter</em>}' reference. * <!-- begin-user-doc --> @@ -74,8 +73,7 @@ public class PopupAssistantImpl extends AssistantImpl implements PopupAssistant * * @generated */ - protected PopupAssistantImpl() - { + protected PopupAssistantImpl() { super(); } @@ -86,8 +84,7 @@ public class PopupAssistantImpl extends AssistantImpl implements PopupAssistant * @generated */ @Override - protected EClass eStaticClass() - { + protected EClass eStaticClass() { return AssistantPackage.Literals.POPUP_ASSISTANT; } @@ -98,8 +95,7 @@ public class PopupAssistantImpl extends AssistantImpl implements PopupAssistant * @generated */ @Override - public ModelingAssistantProvider getProvider() - { + public ModelingAssistantProvider getProvider() { ModelingAssistantProvider provider = basicGetProvider(); return provider != null && provider.eIsProxy() ? (ModelingAssistantProvider) eResolveProxy((InternalEObject) provider) : provider; } @@ -111,11 +107,9 @@ public class PopupAssistantImpl extends AssistantImpl implements PopupAssistant * @generated */ @Override - public ModelingAssistantProvider basicGetProvider() - { + public ModelingAssistantProvider basicGetProvider() { ModelingAssistantProvider owningProvider = getOwningProvider(); - if (owningProvider != null) - { + if (owningProvider != null) { return owningProvider; } return super.basicGetProvider(); @@ -128,14 +122,11 @@ public class PopupAssistantImpl extends AssistantImpl implements PopupAssistant * @generated */ @Override - public Filter getFilter() - { - if (filter != null && filter.eIsProxy()) - { + public Filter getFilter() { + if (filter != null && filter.eIsProxy()) { InternalEObject oldFilter = (InternalEObject) filter; filter = (Filter) eResolveProxy(oldFilter); - if (filter != oldFilter) - { + if (filter != oldFilter) { if (eNotificationRequired()) { eNotify(new ENotificationImpl(this, Notification.RESOLVE, AssistantPackage.POPUP_ASSISTANT__FILTER, oldFilter, filter)); } @@ -150,8 +141,7 @@ public class PopupAssistantImpl extends AssistantImpl implements PopupAssistant * * @generated */ - public Filter basicGetFilter() - { + public Filter basicGetFilter() { return filter; } @@ -162,8 +152,7 @@ public class PopupAssistantImpl extends AssistantImpl implements PopupAssistant * @generated */ @Override - public void setFilter(Filter newFilter) - { + public void setFilter(Filter newFilter) { Filter oldFilter = filter; filter = newFilter; if (eNotificationRequired()) { @@ -171,8 +160,7 @@ public class PopupAssistantImpl extends AssistantImpl implements PopupAssistant } Resource.Internal eInternalResource = eInternalResource(); if (eInternalResource == null || !eInternalResource.isLoading()) { - if (ownedFilter != null && ownedFilter != newFilter) - { + if (ownedFilter != null && ownedFilter != newFilter) { setOwnedFilter(null); } } @@ -185,8 +173,7 @@ public class PopupAssistantImpl extends AssistantImpl implements PopupAssistant * @generated */ @Override - public Filter getOwnedFilter() - { + public Filter getOwnedFilter() { return ownedFilter; } @@ -196,12 +183,10 @@ public class PopupAssistantImpl extends AssistantImpl implements PopupAssistant * * @generated */ - public NotificationChain basicSetOwnedFilter(Filter newOwnedFilter, NotificationChain msgs) - { + public NotificationChain basicSetOwnedFilter(Filter newOwnedFilter, NotificationChain msgs) { Filter oldOwnedFilter = ownedFilter; ownedFilter = newOwnedFilter; - if (eNotificationRequired()) - { + if (eNotificationRequired()) { ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, AssistantPackage.POPUP_ASSISTANT__OWNED_FILTER, oldOwnedFilter, newOwnedFilter); if (msgs == null) { msgs = notification; @@ -211,10 +196,8 @@ public class PopupAssistantImpl extends AssistantImpl implements PopupAssistant } Resource.Internal eInternalResource = eInternalResource(); if (eInternalResource == null || !eInternalResource.isLoading()) { - if (newOwnedFilter != null) - { - if (newOwnedFilter != filter) - { + if (newOwnedFilter != null) { + if (newOwnedFilter != filter) { setFilter(newOwnedFilter); } } @@ -229,10 +212,8 @@ public class PopupAssistantImpl extends AssistantImpl implements PopupAssistant * @generated */ @Override - public void setOwnedFilter(Filter newOwnedFilter) - { - if (newOwnedFilter != ownedFilter) - { + public void setOwnedFilter(Filter newOwnedFilter) { + if (newOwnedFilter != ownedFilter) { NotificationChain msgs = null; if (ownedFilter != null) { msgs = ((InternalEObject) ownedFilter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - AssistantPackage.POPUP_ASSISTANT__OWNED_FILTER, null, msgs); @@ -244,8 +225,7 @@ public class PopupAssistantImpl extends AssistantImpl implements PopupAssistant if (msgs != null) { msgs.dispatch(); } - } - else if (eNotificationRequired()) { + } else if (eNotificationRequired()) { eNotify(new ENotificationImpl(this, Notification.SET, AssistantPackage.POPUP_ASSISTANT__OWNED_FILTER, newOwnedFilter, newOwnedFilter)); } } @@ -257,8 +237,7 @@ public class PopupAssistantImpl extends AssistantImpl implements PopupAssistant * @generated */ @Override - public Filter createOwnedFilter(String name, EClass eClass) - { + public Filter createOwnedFilter(String name, EClass eClass) { Filter newOwnedFilter = (Filter) create(eClass); setOwnedFilter(newOwnedFilter); if (name != null) { @@ -274,8 +253,7 @@ public class PopupAssistantImpl extends AssistantImpl implements PopupAssistant * @generated */ @Override - public ModelingAssistantProvider getOwningProvider() - { + public ModelingAssistantProvider getOwningProvider() { if (eContainerFeatureID() != AssistantPackage.POPUP_ASSISTANT__OWNING_PROVIDER) { return null; } @@ -288,8 +266,7 @@ public class PopupAssistantImpl extends AssistantImpl implements PopupAssistant * * @generated */ - public NotificationChain basicSetOwningProvider(ModelingAssistantProvider newOwningProvider, NotificationChain msgs) - { + public NotificationChain basicSetOwningProvider(ModelingAssistantProvider newOwningProvider, NotificationChain msgs) { msgs = eBasicSetContainer((InternalEObject) newOwningProvider, AssistantPackage.POPUP_ASSISTANT__OWNING_PROVIDER, msgs); return msgs; } @@ -301,10 +278,8 @@ public class PopupAssistantImpl extends AssistantImpl implements PopupAssistant * @generated */ @Override - public void setOwningProvider(ModelingAssistantProvider newOwningProvider) - { - if (newOwningProvider != eInternalContainer() || (eContainerFeatureID() != AssistantPackage.POPUP_ASSISTANT__OWNING_PROVIDER && newOwningProvider != null)) - { + public void setOwningProvider(ModelingAssistantProvider newOwningProvider) { + if (newOwningProvider != eInternalContainer() || (eContainerFeatureID() != AssistantPackage.POPUP_ASSISTANT__OWNING_PROVIDER && newOwningProvider != null)) { if (EcoreUtil.isAncestor(this, newOwningProvider)) { throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$ @@ -320,8 +295,7 @@ public class PopupAssistantImpl extends AssistantImpl implements PopupAssistant if (msgs != null) { msgs.dispatch(); } - } - else if (eNotificationRequired()) { + } else if (eNotificationRequired()) { eNotify(new ENotificationImpl(this, Notification.SET, AssistantPackage.POPUP_ASSISTANT__OWNING_PROVIDER, newOwningProvider, newOwningProvider)); } } @@ -333,10 +307,8 @@ public class PopupAssistantImpl extends AssistantImpl implements PopupAssistant * @generated */ @Override - public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) - { - switch (featureID) - { + public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { case AssistantPackage.POPUP_ASSISTANT__OWNING_PROVIDER: if (eInternalContainer() != null) { msgs = eBasicRemoveFromContainer(msgs); @@ -353,10 +325,8 @@ public class PopupAssistantImpl extends AssistantImpl implements PopupAssistant * @generated */ @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) - { - switch (featureID) - { + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { case AssistantPackage.POPUP_ASSISTANT__OWNED_FILTER: return basicSetOwnedFilter(null, msgs); case AssistantPackage.POPUP_ASSISTANT__OWNING_PROVIDER: @@ -372,10 +342,8 @@ public class PopupAssistantImpl extends AssistantImpl implements PopupAssistant * @generated */ @Override - public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) - { - switch (eContainerFeatureID()) - { + public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) { + switch (eContainerFeatureID()) { case AssistantPackage.POPUP_ASSISTANT__OWNING_PROVIDER: return eInternalContainer().eInverseRemove(this, AssistantPackage.MODELING_ASSISTANT_PROVIDER__POPUP_ASSISTANT, ModelingAssistantProvider.class, msgs); } @@ -389,10 +357,8 @@ public class PopupAssistantImpl extends AssistantImpl implements PopupAssistant * @generated */ @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) - { - switch (featureID) - { + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { case AssistantPackage.POPUP_ASSISTANT__FILTER: if (resolve) { return getFilter(); @@ -413,10 +379,8 @@ public class PopupAssistantImpl extends AssistantImpl implements PopupAssistant * @generated */ @Override - public void eSet(int featureID, Object newValue) - { - switch (featureID) - { + public void eSet(int featureID, Object newValue) { + switch (featureID) { case AssistantPackage.POPUP_ASSISTANT__FILTER: setFilter((Filter) newValue); return; @@ -437,10 +401,8 @@ public class PopupAssistantImpl extends AssistantImpl implements PopupAssistant * @generated */ @Override - public void eUnset(int featureID) - { - switch (featureID) - { + public void eUnset(int featureID) { + switch (featureID) { case AssistantPackage.POPUP_ASSISTANT__FILTER: setFilter((Filter) null); return; @@ -461,10 +423,8 @@ public class PopupAssistantImpl extends AssistantImpl implements PopupAssistant * @generated */ @Override - public boolean eIsSet(int featureID) - { - switch (featureID) - { + public boolean eIsSet(int featureID) { + switch (featureID) { case AssistantPackage.POPUP_ASSISTANT__PROVIDER: return isSetProvider(); case AssistantPackage.POPUP_ASSISTANT__FILTER: @@ -484,8 +444,7 @@ public class PopupAssistantImpl extends AssistantImpl implements PopupAssistant * @generated */ @Override - public boolean isSetProvider() - { + public boolean isSetProvider() { return super.isSetProvider() || eIsSet(AssistantPackage.POPUP_ASSISTANT__OWNING_PROVIDER); } diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/internal/operations/AssistantOperations.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/internal/operations/AssistantOperations.java index 466cd0b80b0..89cbf97ac0c 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/internal/operations/AssistantOperations.java +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/internal/operations/AssistantOperations.java @@ -29,8 +29,7 @@ import org.eclipse.papyrus.infra.gmfdiag.assistant.Assistant; * * @generated */ -public class AssistantOperations -{ +public class AssistantOperations { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/internal/operations/AssistedElementTypeFilterOperations.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/internal/operations/AssistedElementTypeFilterOperations.java index 2059c2a0ec7..510640f52ee 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/internal/operations/AssistedElementTypeFilterOperations.java +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/internal/operations/AssistedElementTypeFilterOperations.java @@ -38,8 +38,7 @@ import com.google.common.collect.Sets; * * @generated */ -public class AssistedElementTypeFilterOperations -{ +public class AssistedElementTypeFilterOperations { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -56,8 +55,7 @@ public class AssistedElementTypeFilterOperations * * @generated NOT */ - public static boolean matches(AssistedElementTypeFilter assistedElementTypeFilter, Object input) - { + public static boolean matches(AssistedElementTypeFilter assistedElementTypeFilter, Object input) { boolean result = false; ModelingAssistantProvider provider = assistedElementTypeFilter.getProvider(); @@ -91,8 +89,7 @@ public class AssistedElementTypeFilterOperations * * @generated NOT */ - public static ModelingAssistantProvider getProvider(AssistedElementTypeFilter assistedElementTypeFilter) - { + public static ModelingAssistantProvider getProvider(AssistedElementTypeFilter assistedElementTypeFilter) { ModelingAssistantProvider result = null; for (EObject container = assistedElementTypeFilter.eContainer(); (container != null) && (result == null); container = container.eContainer()) { diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/internal/operations/ElementTypeFilterOperations.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/internal/operations/ElementTypeFilterOperations.java index d147d51bceb..6c7113dbfb6 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/internal/operations/ElementTypeFilterOperations.java +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/internal/operations/ElementTypeFilterOperations.java @@ -34,8 +34,7 @@ import org.eclipse.papyrus.infra.gmfdiag.assistant.core.util.ModelingAssistantUt * * @generated */ -public class ElementTypeFilterOperations -{ +public class ElementTypeFilterOperations { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -94,8 +93,7 @@ public class ElementTypeFilterOperations * * @generated NOT */ - public static ModelingAssistantProvider getProvider(ElementTypeFilter elementTypeFilter) - { + public static ModelingAssistantProvider getProvider(ElementTypeFilter elementTypeFilter) { ModelingAssistantProvider result = null; for (EObject container = elementTypeFilter.eContainer(); (container != null) && (result == null); container = container.eContainer()) { diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/internal/operations/ModelingAssistantProviderOperations.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/internal/operations/ModelingAssistantProviderOperations.java index e07439a0053..494af99455f 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/internal/operations/ModelingAssistantProviderOperations.java +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/internal/operations/ModelingAssistantProviderOperations.java @@ -73,10 +73,10 @@ import com.google.common.collect.Sets; * <li>{@link org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantProvider#getRelTypesForSREOnSource(org.eclipse.core.runtime.IAdaptable) <em>Get Rel Types For SRE On Source</em>}</li> * <li>{@link org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantProvider#getTypesForSource(org.eclipse.core.runtime.IAdaptable, org.eclipse.gmf.runtime.emf.type.core.IElementType) <em>Get Types For Source</em>}</li> * <li>{@link org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantProvider#getTypesForTarget(org.eclipse.core.runtime.IAdaptable, org.eclipse.gmf.runtime.emf.type.core.IElementType) <em>Get Types For Target</em>}</li> - * <li>{@link org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantProvider#selectExistingElementForSource(org.eclipse.core.runtime.IAdaptable, org.eclipse.gmf.runtime.emf.type.core.IElementType) <em>Select Existing Element For Source - * </em>}</li> - * <li>{@link org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantProvider#selectExistingElementForTarget(org.eclipse.core.runtime.IAdaptable, org.eclipse.gmf.runtime.emf.type.core.IElementType) <em>Select Existing Element For Target - * </em>}</li> + * <li>{@link org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantProvider#selectExistingElementForSource(org.eclipse.core.runtime.IAdaptable, org.eclipse.gmf.runtime.emf.type.core.IElementType) <em>Select Existing Element For + * Source</em>}</li> + * <li>{@link org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantProvider#selectExistingElementForTarget(org.eclipse.core.runtime.IAdaptable, org.eclipse.gmf.runtime.emf.type.core.IElementType) <em>Select Existing Element For + * Target</em>}</li> * <li>{@link org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantProvider#getTypesForPopupBar(org.eclipse.core.runtime.IAdaptable) <em>Get Types For Popup Bar</em>}</li> * <li>{@link org.eclipse.papyrus.infra.gmfdiag.assistant.ModelingAssistantProvider#getElementTypes() <em>Get Element Types</em>}</li> * <li>{@link org.eclipse.papyrus.infra.gmfdiag.assistant.ModelingAssistantProvider#getClientContext() <em>Get Client Context</em>}</li> @@ -88,8 +88,7 @@ import com.google.common.collect.Sets; * * @generated */ -public class ModelingAssistantProviderOperations -{ +public class ModelingAssistantProviderOperations { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -106,8 +105,7 @@ public class ModelingAssistantProviderOperations * * @generated NOT */ - public static boolean provides(ModelingAssistantProvider modelingAssistantProvider, IOperation operation) - { + public static boolean provides(ModelingAssistantProvider modelingAssistantProvider, IOperation operation) { boolean result = false; switch (((IModelingAssistantOperation) operation).getId()) { @@ -130,8 +128,7 @@ public class ModelingAssistantProviderOperations * * @generated NOT */ - public static void addProviderChangeListener(ModelingAssistantProvider modelingAssistantProvider, IProviderChangeListener listener) - { + public static void addProviderChangeListener(ModelingAssistantProvider modelingAssistantProvider, IProviderChangeListener listener) { ((ModelingAssistantProviderImpl) modelingAssistantProvider).getListeners().add(listener); } @@ -141,8 +138,7 @@ public class ModelingAssistantProviderOperations * * @generated NOT */ - public static void removeProviderChangeListener(ModelingAssistantProvider modelingAssistantProvider, IProviderChangeListener listener) - { + public static void removeProviderChangeListener(ModelingAssistantProvider modelingAssistantProvider, IProviderChangeListener listener) { ((ModelingAssistantProviderImpl) modelingAssistantProvider).getListeners().remove(listener); } @@ -152,8 +148,7 @@ public class ModelingAssistantProviderOperations * * @generated */ - public static EList<IElementType> getTypes(ModelingAssistantProvider modelingAssistantProvider, String hint, IAdaptable data) - { + public static EList<IElementType> getTypes(ModelingAssistantProvider modelingAssistantProvider, String hint, IAdaptable data) { // TODO: implement this method // Ensure that you remove @generated or mark it @generated NOT throw new UnsupportedOperationException(); @@ -165,8 +160,7 @@ public class ModelingAssistantProviderOperations * * @generated NOT */ - public static EList<IElementType> getRelTypesOnSource(final ModelingAssistantProvider modelingAssistantProvider, IAdaptable source) - { + public static EList<IElementType> getRelTypesOnSource(final ModelingAssistantProvider modelingAssistantProvider, IAdaptable source) { ProviderCache<IAdaptable, EList<IElementType>> cache = ProviderCache.getCache(modelingAssistantProvider, GetRelTypesOnSourceOperation.class); if (cache == null) { cache = ProviderCache.cache(modelingAssistantProvider, GetRelTypesOnSourceOperation.class, new Function<IAdaptable, EList<IElementType>>() { @@ -197,8 +191,7 @@ public class ModelingAssistantProviderOperations * * @generated NOT */ - public static EList<IElementType> getRelTypesOnTarget(final ModelingAssistantProvider modelingAssistantProvider, IAdaptable target) - { + public static EList<IElementType> getRelTypesOnTarget(final ModelingAssistantProvider modelingAssistantProvider, IAdaptable target) { ProviderCache<IAdaptable, EList<IElementType>> cache = ProviderCache.getCache(modelingAssistantProvider, GetRelTypesOnTargetOperation.class); if (cache == null) { cache = ProviderCache.cache(modelingAssistantProvider, GetRelTypesOnTargetOperation.class, new Function<IAdaptable, EList<IElementType>>() { @@ -229,8 +222,7 @@ public class ModelingAssistantProviderOperations * * @generated NOT */ - public static EList<IElementType> getRelTypesOnSourceAndTarget(ModelingAssistantProvider modelingAssistantProvider, IAdaptable source, IAdaptable target) - { + public static EList<IElementType> getRelTypesOnSourceAndTarget(ModelingAssistantProvider modelingAssistantProvider, IAdaptable source, IAdaptable target) { Set<IElementType> result = Sets.newLinkedHashSet(); for (ConnectionAssistant next : modelingAssistantProvider.getConnectionAssistants()) { @@ -252,8 +244,7 @@ public class ModelingAssistantProviderOperations * * @generated */ - public static EList<IElementType> getRelTypesForSREOnTarget(ModelingAssistantProvider modelingAssistantProvider, IAdaptable target) - { + public static EList<IElementType> getRelTypesForSREOnTarget(ModelingAssistantProvider modelingAssistantProvider, IAdaptable target) { // TODO: implement this method // Ensure that you remove @generated or mark it @generated NOT throw new UnsupportedOperationException(); @@ -265,8 +256,7 @@ public class ModelingAssistantProviderOperations * * @generated */ - public static EList<IElementType> getRelTypesForSREOnSource(ModelingAssistantProvider modelingAssistantProvider, IAdaptable source) - { + public static EList<IElementType> getRelTypesForSREOnSource(ModelingAssistantProvider modelingAssistantProvider, IAdaptable source) { // TODO: implement this method // Ensure that you remove @generated or mark it @generated NOT throw new UnsupportedOperationException(); @@ -278,8 +268,7 @@ public class ModelingAssistantProviderOperations * * @generated NOT */ - public static EList<IElementType> getTypesForSource(ModelingAssistantProvider modelingAssistantProvider, IAdaptable target, IElementType relationshipType) - { + public static EList<IElementType> getTypesForSource(ModelingAssistantProvider modelingAssistantProvider, IAdaptable target, IElementType relationshipType) { Set<IElementType> types = Sets.newLinkedHashSet(); // In case we had to create a proxy for diagram-specific hinted types that are not modeled @@ -320,8 +309,7 @@ public class ModelingAssistantProviderOperations * * @generated NOT */ - public static EList<IElementType> getTypesForTarget(ModelingAssistantProvider modelingAssistantProvider, IAdaptable source, IElementType relationshipType) - { + public static EList<IElementType> getTypesForTarget(ModelingAssistantProvider modelingAssistantProvider, IAdaptable source, IElementType relationshipType) { Set<IElementType> types = Sets.newLinkedHashSet(); // In case we had to create a proxy for diagram-specific hinted types that are not modeled @@ -362,8 +350,7 @@ public class ModelingAssistantProviderOperations * * @generated */ - public static EObject selectExistingElementForSource(ModelingAssistantProvider modelingAssistantProvider, IAdaptable target, IElementType relationshipType) - { + public static EObject selectExistingElementForSource(ModelingAssistantProvider modelingAssistantProvider, IAdaptable target, IElementType relationshipType) { // TODO: implement this method // Ensure that you remove @generated or mark it @generated NOT throw new UnsupportedOperationException(); @@ -375,8 +362,7 @@ public class ModelingAssistantProviderOperations * * @generated */ - public static EObject selectExistingElementForTarget(ModelingAssistantProvider modelingAssistantProvider, IAdaptable source, IElementType relationshipType) - { + public static EObject selectExistingElementForTarget(ModelingAssistantProvider modelingAssistantProvider, IAdaptable source, IElementType relationshipType) { // TODO: implement this method // Ensure that you remove @generated or mark it @generated NOT throw new UnsupportedOperationException(); @@ -388,8 +374,7 @@ public class ModelingAssistantProviderOperations * * @generated NOT */ - public static EList<IElementType> getTypesForPopupBar(final ModelingAssistantProvider modelingAssistantProvider, IAdaptable host) - { + public static EList<IElementType> getTypesForPopupBar(final ModelingAssistantProvider modelingAssistantProvider, IAdaptable host) { ProviderCache<IAdaptable, EList<IElementType>> cache = ProviderCache.getCache(modelingAssistantProvider, GetTypesForPopupBarOperation.class); if (cache == null) { cache = ProviderCache.cache(modelingAssistantProvider, GetTypesForPopupBarOperation.class, new Function<IAdaptable, EList<IElementType>>() { @@ -448,8 +433,7 @@ public class ModelingAssistantProviderOperations * * @generated NOT */ - public static EList<IElementType> getElementTypes(ModelingAssistantProvider modelingAssistantProvider) - { + public static EList<IElementType> getElementTypes(ModelingAssistantProvider modelingAssistantProvider) { Set<IElementType> types = Sets.newLinkedHashSet(); for (String next : modelingAssistantProvider.getElementTypeIDs()) { IElementType type = modelingAssistantProvider.getElementType(next); @@ -469,8 +453,7 @@ public class ModelingAssistantProviderOperations * * @generated NOT */ - public static IClientContext getClientContext(ModelingAssistantProvider modelingAssistantProvider) - { + public static IClientContext getClientContext(ModelingAssistantProvider modelingAssistantProvider) { IClientContext result = null; if (modelingAssistantProvider.getClientContextID() != null) { @@ -494,8 +477,7 @@ public class ModelingAssistantProviderOperations * * @generated NOT */ - public static IElementType getElementType(ModelingAssistantProvider modelingAssistantProvider, String id) - { + public static IElementType getElementType(ModelingAssistantProvider modelingAssistantProvider, String id) { IElementType result = null; // First, try metamodel types @@ -525,8 +507,7 @@ public class ModelingAssistantProviderOperations * * @generated NOT */ - public static EList<IElementType> getExcludedElementTypes(ModelingAssistantProvider modelingAssistantProvider) - { + public static EList<IElementType> getExcludedElementTypes(ModelingAssistantProvider modelingAssistantProvider) { Set<IElementType> types = Sets.newLinkedHashSet(); for (String next : modelingAssistantProvider.getExcludedElementTypeIDs()) { IElementType type = modelingAssistantProvider.getElementType(next); @@ -546,8 +527,7 @@ public class ModelingAssistantProviderOperations * * @generated NOT */ - public static EList<IElementType> getRelationshipTypes(ModelingAssistantProvider modelingAssistantProvider) - { + public static EList<IElementType> getRelationshipTypes(ModelingAssistantProvider modelingAssistantProvider) { Set<IElementType> types = Sets.newLinkedHashSet(); for (String next : modelingAssistantProvider.getRelationshipTypeIDs()) { IElementType type = modelingAssistantProvider.getElementType(next); @@ -568,8 +548,7 @@ public class ModelingAssistantProviderOperations * @generated NOT */ @SuppressWarnings("unchecked") - public static boolean isRelationshipType(ModelingAssistantProvider modelingAssistantProvider, IElementType elementType) - { + public static boolean isRelationshipType(ModelingAssistantProvider modelingAssistantProvider, IElementType elementType) { Set<IElementType> relationshipTypes; CacheAdapter cache = CacheAdapter.getCacheAdapter(modelingAssistantProvider); if (cache == null) { diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/util/AssistantAdapterFactory.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/util/AssistantAdapterFactory.java index ab39338f4dd..6196cc3da50 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/util/AssistantAdapterFactory.java +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/util/AssistantAdapterFactory.java @@ -33,8 +33,7 @@ import org.eclipse.papyrus.infra.gmfdiag.assistant.*; * @see org.eclipse.papyrus.infra.gmfdiag.assistant.AssistantPackage * @generated */ -public class AssistantAdapterFactory extends AdapterFactoryImpl -{ +public class AssistantAdapterFactory extends AdapterFactoryImpl { /** * The cached model package. * <!-- begin-user-doc --> @@ -51,10 +50,8 @@ public class AssistantAdapterFactory extends AdapterFactoryImpl * * @generated */ - public AssistantAdapterFactory() - { - if (modelPackage == null) - { + public AssistantAdapterFactory() { + if (modelPackage == null) { modelPackage = AssistantPackage.eINSTANCE; } } @@ -69,14 +66,11 @@ public class AssistantAdapterFactory extends AdapterFactoryImpl * @generated */ @Override - public boolean isFactoryForType(Object object) - { - if (object == modelPackage) - { + public boolean isFactoryForType(Object object) { + if (object == modelPackage) { return true; } - if (object instanceof EObject) - { + if (object instanceof EObject) { return ((EObject) object).eClass().getEPackage() == modelPackage; } return false; @@ -89,69 +83,57 @@ public class AssistantAdapterFactory extends AdapterFactoryImpl * * @generated */ - protected AssistantSwitch<Adapter> modelSwitch = - new AssistantSwitch<Adapter>() - { - @Override - public Adapter caseAssistedElementTypeFilter(AssistedElementTypeFilter object) - { - return createAssistedElementTypeFilterAdapter(); - } + protected AssistantSwitch<Adapter> modelSwitch = new AssistantSwitch<Adapter>() { + @Override + public Adapter caseAssistedElementTypeFilter(AssistedElementTypeFilter object) { + return createAssistedElementTypeFilterAdapter(); + } - @Override - public Adapter caseModelingAssistantProvider(ModelingAssistantProvider object) - { - return createModelingAssistantProviderAdapter(); - } + @Override + public Adapter caseModelingAssistantProvider(ModelingAssistantProvider object) { + return createModelingAssistantProviderAdapter(); + } - @Override - public Adapter caseAssistant(Assistant object) - { - return createAssistantAdapter(); - } + @Override + public Adapter caseAssistant(Assistant object) { + return createAssistantAdapter(); + } - @Override - public Adapter casePopupAssistant(PopupAssistant object) - { - return createPopupAssistantAdapter(); - } + @Override + public Adapter casePopupAssistant(PopupAssistant object) { + return createPopupAssistantAdapter(); + } - @Override - public Adapter caseConnectionAssistant(ConnectionAssistant object) - { - return createConnectionAssistantAdapter(); - } + @Override + public Adapter caseConnectionAssistant(ConnectionAssistant object) { + return createConnectionAssistantAdapter(); + } - @Override - public Adapter caseIModelingAssistantProvider(IModelingAssistantProvider object) - { - return createIModelingAssistantProviderAdapter(); - } + @Override + public Adapter caseIModelingAssistantProvider(IModelingAssistantProvider object) { + return createIModelingAssistantProviderAdapter(); + } - @Override - public Adapter caseIProvider(IProvider object) - { - return createIProviderAdapter(); - } + @Override + public Adapter caseIProvider(IProvider object) { + return createIProviderAdapter(); + } - @Override - public Adapter caseElementTypeFilter(ElementTypeFilter object) - { - return createElementTypeFilterAdapter(); - } + @Override + public Adapter caseElementTypeFilter(ElementTypeFilter object) { + return createElementTypeFilterAdapter(); + } - @Override - public Adapter caseFilter(Filter object) - { - return createFilterAdapter(); - } + @Override + public Adapter caseFilter(Filter object) { + return createFilterAdapter(); + } - @Override - public Adapter defaultCase(EObject object) - { - return createEObjectAdapter(); - } - }; + @Override + public Adapter defaultCase(EObject object) { + return createEObjectAdapter(); + } + }; /** * Creates an adapter for the <code>target</code>. @@ -164,8 +146,7 @@ public class AssistantAdapterFactory extends AdapterFactoryImpl * @generated */ @Override - public Adapter createAdapter(Notifier target) - { + public Adapter createAdapter(Notifier target) { return modelSwitch.doSwitch((EObject) target); } @@ -181,8 +162,7 @@ public class AssistantAdapterFactory extends AdapterFactoryImpl * @see org.eclipse.papyrus.infra.gmfdiag.assistant.AssistedElementTypeFilter * @generated */ - public Adapter createAssistedElementTypeFilterAdapter() - { + public Adapter createAssistedElementTypeFilterAdapter() { return null; } @@ -197,8 +177,7 @@ public class AssistantAdapterFactory extends AdapterFactoryImpl * @see org.eclipse.papyrus.infra.gmfdiag.assistant.ModelingAssistantProvider * @generated */ - public Adapter createModelingAssistantProviderAdapter() - { + public Adapter createModelingAssistantProviderAdapter() { return null; } @@ -213,8 +192,7 @@ public class AssistantAdapterFactory extends AdapterFactoryImpl * @see org.eclipse.papyrus.infra.gmfdiag.assistant.Assistant * @generated */ - public Adapter createAssistantAdapter() - { + public Adapter createAssistantAdapter() { return null; } @@ -229,8 +207,7 @@ public class AssistantAdapterFactory extends AdapterFactoryImpl * @see org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantProvider * @generated */ - public Adapter createIModelingAssistantProviderAdapter() - { + public Adapter createIModelingAssistantProviderAdapter() { return null; } @@ -245,8 +222,7 @@ public class AssistantAdapterFactory extends AdapterFactoryImpl * @see org.eclipse.gmf.runtime.common.core.service.IProvider * @generated */ - public Adapter createIProviderAdapter() - { + public Adapter createIProviderAdapter() { return null; } @@ -261,8 +237,7 @@ public class AssistantAdapterFactory extends AdapterFactoryImpl * @see org.eclipse.papyrus.infra.gmfdiag.assistant.ConnectionAssistant * @generated */ - public Adapter createConnectionAssistantAdapter() - { + public Adapter createConnectionAssistantAdapter() { return null; } @@ -277,8 +252,7 @@ public class AssistantAdapterFactory extends AdapterFactoryImpl * @see org.eclipse.papyrus.infra.gmfdiag.assistant.PopupAssistant * @generated */ - public Adapter createPopupAssistantAdapter() - { + public Adapter createPopupAssistantAdapter() { return null; } @@ -293,8 +267,7 @@ public class AssistantAdapterFactory extends AdapterFactoryImpl * @see org.eclipse.papyrus.infra.gmfdiag.assistant.ElementTypeFilter * @generated */ - public Adapter createElementTypeFilterAdapter() - { + public Adapter createElementTypeFilterAdapter() { return null; } @@ -309,8 +282,7 @@ public class AssistantAdapterFactory extends AdapterFactoryImpl * @see org.eclipse.papyrus.infra.filters.Filter * @generated */ - public Adapter createFilterAdapter() - { + public Adapter createFilterAdapter() { return null; } @@ -323,8 +295,7 @@ public class AssistantAdapterFactory extends AdapterFactoryImpl * @return the new adapter. * @generated */ - public Adapter createEObjectAdapter() - { + public Adapter createEObjectAdapter() { return null; } diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/util/AssistantDerivedUnionAdapter.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/util/AssistantDerivedUnionAdapter.java index 56dddf41300..ad95837eaeb 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/util/AssistantDerivedUnionAdapter.java +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/util/AssistantDerivedUnionAdapter.java @@ -32,8 +32,7 @@ import org.eclipse.papyrus.infra.gmfdiag.assistant.PopupAssistant; * @see org.eclipse.papyrus.infra.gmfdiag.assistant.AssistantPackage * @generated */ -public class AssistantDerivedUnionAdapter extends AdapterImpl -{ +public class AssistantDerivedUnionAdapter extends AdapterImpl { /** * The cached model package. * <!-- begin-user-doc --> @@ -50,10 +49,8 @@ public class AssistantDerivedUnionAdapter extends AdapterImpl * * @generated */ - public AssistantDerivedUnionAdapter() - { - if (modelPackage == null) - { + public AssistantDerivedUnionAdapter() { + if (modelPackage == null) { modelPackage = AssistantPackage.eINSTANCE; } } @@ -68,14 +65,11 @@ public class AssistantDerivedUnionAdapter extends AdapterImpl * @generated */ @Override - public void notifyChanged(Notification notification) - { + public void notifyChanged(Notification notification) { Object notifier = notification.getNotifier(); - if (notifier instanceof EObject) - { + if (notifier instanceof EObject) { EClass eClass = ((EObject) notifier).eClass(); - if (eClass.eContainer() == modelPackage) - { + if (eClass.eContainer() == modelPackage) { notifyChanged(notification, eClass); } } @@ -92,10 +86,8 @@ public class AssistantDerivedUnionAdapter extends AdapterImpl * the Ecore class of the notifier. * @generated */ - protected void notifyChanged(Notification notification, EClass eClass) - { - switch (eClass.getClassifierID()) - { + protected void notifyChanged(Notification notification, EClass eClass) { + switch (eClass.getClassifierID()) { case AssistantPackage.MODELING_ASSISTANT_PROVIDER: notifyModelingAssistantProviderChanged(notification, eClass); break; @@ -121,8 +113,7 @@ public class AssistantDerivedUnionAdapter extends AdapterImpl * the derived union affected by the change. * @generated */ - public void notifyChanged(Notification notification, EClass eClass, EStructuralFeature derivedUnion) - { + public void notifyChanged(Notification notification, EClass eClass, EStructuralFeature derivedUnion) { // Do nothing. } @@ -137,10 +128,8 @@ public class AssistantDerivedUnionAdapter extends AdapterImpl * the Ecore class of the notifier. * @generated */ - protected void notifyConnectionAssistantChanged(Notification notification, EClass eClass) - { - switch (notification.getFeatureID(ConnectionAssistant.class)) - { + protected void notifyConnectionAssistantChanged(Notification notification, EClass eClass) { + switch (notification.getFeatureID(ConnectionAssistant.class)) { case AssistantPackage.CONNECTION_ASSISTANT__OWNING_PROVIDER: notifyChanged(notification, eClass, AssistantPackage.Literals.ASSISTANT__PROVIDER); break; @@ -158,10 +147,8 @@ public class AssistantDerivedUnionAdapter extends AdapterImpl * the Ecore class of the notifier. * @generated */ - protected void notifyModelingAssistantProviderChanged(Notification notification, EClass eClass) - { - switch (notification.getFeatureID(ModelingAssistantProvider.class)) - { + protected void notifyModelingAssistantProviderChanged(Notification notification, EClass eClass) { + switch (notification.getFeatureID(ModelingAssistantProvider.class)) { case AssistantPackage.MODELING_ASSISTANT_PROVIDER__POPUP_ASSISTANT: notifyChanged(notification, eClass, AssistantPackage.Literals.MODELING_ASSISTANT_PROVIDER__ASSISTANT); break; @@ -182,10 +169,8 @@ public class AssistantDerivedUnionAdapter extends AdapterImpl * the Ecore class of the notifier. * @generated */ - protected void notifyPopupAssistantChanged(Notification notification, EClass eClass) - { - switch (notification.getFeatureID(PopupAssistant.class)) - { + protected void notifyPopupAssistantChanged(Notification notification, EClass eClass) { + switch (notification.getFeatureID(PopupAssistant.class)) { case AssistantPackage.POPUP_ASSISTANT__OWNING_PROVIDER: notifyChanged(notification, eClass, AssistantPackage.Literals.ASSISTANT__PROVIDER); break; diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/util/AssistantResource.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/util/AssistantResource.java index 0a60e61c5e0..04c214b29d4 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/util/AssistantResource.java +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/util/AssistantResource.java @@ -21,8 +21,7 @@ import org.eclipse.emf.ecore.xmi.XMIResource; * * @generated */ -public interface AssistantResource extends XMIResource -{ +public interface AssistantResource extends XMIResource { /** * <!-- begin-user-doc --> * The factory for '<em><b>assistant</b></em>' resources. diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/util/AssistantResourceFactoryImpl.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/util/AssistantResourceFactoryImpl.java index 8d9e193e68b..61c15dc3988 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/util/AssistantResourceFactoryImpl.java +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/util/AssistantResourceFactoryImpl.java @@ -23,8 +23,7 @@ import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl; * @see org.eclipse.papyrus.infra.gmfdiag.assistant.util.AssistantResourceImpl * @generated */ -public class AssistantResourceFactoryImpl extends ResourceFactoryImpl implements AssistantResource.Factory -{ +public class AssistantResourceFactoryImpl extends ResourceFactoryImpl implements AssistantResource.Factory { /** * Creates an instance of the resource factory. * <!-- begin-user-doc --> @@ -32,8 +31,7 @@ public class AssistantResourceFactoryImpl extends ResourceFactoryImpl implements * * @generated */ - public AssistantResourceFactoryImpl() - { + public AssistantResourceFactoryImpl() { super(); } @@ -45,8 +43,7 @@ public class AssistantResourceFactoryImpl extends ResourceFactoryImpl implements * @generated */ @Override - public Resource createResource(URI uri) - { + public Resource createResource(URI uri) { AssistantResource result = new AssistantResourceImpl(uri); result.setEncoding(AssistantResource.DEFAULT_ENCODING); return result; diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/util/AssistantResourceImpl.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/util/AssistantResourceImpl.java index 6ee7348051b..20b63cb70e2 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/util/AssistantResourceImpl.java +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/util/AssistantResourceImpl.java @@ -23,8 +23,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl; * @see org.eclipse.papyrus.infra.gmfdiag.assistant.util.AssistantResourceFactoryImpl * @generated */ -public class AssistantResourceImpl extends XMIResourceImpl implements AssistantResource -{ +public class AssistantResourceImpl extends XMIResourceImpl implements AssistantResource { /** * Creates an instance of the resource. * <!-- begin-user-doc --> @@ -34,8 +33,7 @@ public class AssistantResourceImpl extends XMIResourceImpl implements AssistantR * the URI of the new resource. * @generated */ - public AssistantResourceImpl(URI uri) - { + public AssistantResourceImpl(URI uri) { super(uri); } diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/util/AssistantSwitch.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/util/AssistantSwitch.java index 984c0c24fba..fe9f33f3c78 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/util/AssistantSwitch.java +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/util/AssistantSwitch.java @@ -35,8 +35,7 @@ import org.eclipse.papyrus.infra.gmfdiag.assistant.*; * @see org.eclipse.papyrus.infra.gmfdiag.assistant.AssistantPackage * @generated */ -public class AssistantSwitch<T> extends Switch<T> -{ +public class AssistantSwitch<T> extends Switch<T> { /** * The cached model package * <!-- begin-user-doc --> @@ -53,10 +52,8 @@ public class AssistantSwitch<T> extends Switch<T> * * @generated */ - public AssistantSwitch() - { - if (modelPackage == null) - { + public AssistantSwitch() { + if (modelPackage == null) { modelPackage = AssistantPackage.eINSTANCE; } } @@ -72,8 +69,7 @@ public class AssistantSwitch<T> extends Switch<T> * @generated */ @Override - protected boolean isSwitchFor(EPackage ePackage) - { + protected boolean isSwitchFor(EPackage ePackage) { return ePackage == modelPackage; } @@ -86,10 +82,8 @@ public class AssistantSwitch<T> extends Switch<T> * @generated */ @Override - protected T doSwitch(int classifierID, EObject theEObject) - { - switch (classifierID) - { + protected T doSwitch(int classifierID, EObject theEObject) { + switch (classifierID) { case AssistantPackage.ASSISTED_ELEMENT_TYPE_FILTER: { AssistedElementTypeFilter assistedElementTypeFilter = (AssistedElementTypeFilter) theEObject; T result = caseAssistedElementTypeFilter(assistedElementTypeFilter); @@ -193,8 +187,7 @@ public class AssistantSwitch<T> extends Switch<T> * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseAssistedElementTypeFilter(AssistedElementTypeFilter object) - { + public T caseAssistedElementTypeFilter(AssistedElementTypeFilter object) { return null; } @@ -211,8 +204,7 @@ public class AssistantSwitch<T> extends Switch<T> * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseModelingAssistantProvider(ModelingAssistantProvider object) - { + public T caseModelingAssistantProvider(ModelingAssistantProvider object) { return null; } @@ -229,8 +221,7 @@ public class AssistantSwitch<T> extends Switch<T> * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseAssistant(Assistant object) - { + public T caseAssistant(Assistant object) { return null; } @@ -247,8 +238,7 @@ public class AssistantSwitch<T> extends Switch<T> * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseIModelingAssistantProvider(IModelingAssistantProvider object) - { + public T caseIModelingAssistantProvider(IModelingAssistantProvider object) { return null; } @@ -265,8 +255,7 @@ public class AssistantSwitch<T> extends Switch<T> * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseIProvider(IProvider object) - { + public T caseIProvider(IProvider object) { return null; } @@ -283,8 +272,7 @@ public class AssistantSwitch<T> extends Switch<T> * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseConnectionAssistant(ConnectionAssistant object) - { + public T caseConnectionAssistant(ConnectionAssistant object) { return null; } @@ -301,8 +289,7 @@ public class AssistantSwitch<T> extends Switch<T> * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T casePopupAssistant(PopupAssistant object) - { + public T casePopupAssistant(PopupAssistant object) { return null; } @@ -319,8 +306,7 @@ public class AssistantSwitch<T> extends Switch<T> * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseElementTypeFilter(ElementTypeFilter object) - { + public T caseElementTypeFilter(ElementTypeFilter object) { return null; } @@ -337,8 +323,7 @@ public class AssistantSwitch<T> extends Switch<T> * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseFilter(Filter object) - { + public T caseFilter(Filter object) { return null; } @@ -356,8 +341,7 @@ public class AssistantSwitch<T> extends Switch<T> * @generated */ @Override - public T defaultCase(EObject object) - { + public T defaultCase(EObject object) { return null; } diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/icons/filter.gif b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/icons/filter.gif Binary files differnew file mode 100644 index 00000000000..3f46cf04164 --- /dev/null +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/icons/filter.gif diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/ExtendedPluginPaletteProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/ExtendedPluginPaletteProvider.java index b14b087fe3e..6fa4269e505 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/ExtendedPluginPaletteProvider.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/ExtendedPluginPaletteProvider.java @@ -56,6 +56,7 @@ import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory; import org.eclipse.gmf.runtime.gef.ui.internal.palette.PaletteStack; import org.eclipse.gmf.runtime.notation.Diagram; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.papyrus.infra.filters.Filter; import org.eclipse.papyrus.infra.gmfdiag.common.Activator; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.ChildConfiguration; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.Configuration; @@ -193,7 +194,8 @@ public class ExtendedPluginPaletteProvider extends AbstractProvider implements I // on diagrams. So... just test on both. // Edit parts don't make sense either, because the palette is global to the diagram. //Moreover, the palette is created before the EditParts, so we don't always have them. - return paletteElement.getFilters().stream().allMatch(f -> f.matches(diagram) || f.matches(diagram.getElement())); + Filter filter = paletteElement.getFilter(); + return filter == null ? true : filter.matches(diagram) || filter.matches(diagram.getElement()); } /** diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/.settings/.api_filters b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/.settings/.api_filters new file mode 100644 index 00000000000..0ecdfc7575e --- /dev/null +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/.settings/.api_filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit" version="2"> + <resource path="src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/PaletteconfigurationItemProviderAdapterFactory.java" type="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider.PaletteconfigurationItemProviderAdapterFactory"> + <filter comment="Generated code" id="336658481"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider.PaletteconfigurationItemProviderAdapterFactory"/> + <message_argument value="childCreationExtenderManager"/> + </message_arguments> + </filter> + </resource> +</component> diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/META-INF/MANIFEST.MF index 236a06869b4..081edd69e67 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/META-INF/MANIFEST.MF @@ -15,13 +15,14 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)", org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)", org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.types.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.uml2.common.edit;bundle-version="[2.1.0,3.0.0)";visibility:=reexport + org.eclipse.uml2.common.edit;bundle-version="[2.1.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.emf;bundle-version="3.0.0" Export-Package: org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider, org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.utils Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: . -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.1.0.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider.PaletteConfigurationEditPlugin$Implementation diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/pom.xml b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/pom.xml index 2060309e92d..c15a0546753 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/pom.xml +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/pom.xml @@ -8,6 +8,6 @@ <version>0.0.1-SNAPSHOT</version> </parent>
<artifactId>org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ChildConfigurationItemProvider.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ChildConfigurationItemProvider.java index ef5ac5140cf..60807c7c994 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ChildConfigurationItemProvider.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ChildConfigurationItemProvider.java @@ -18,9 +18,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; - import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.ChildConfiguration; /** diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ConfigurationItemProvider.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ConfigurationItemProvider.java index cb0415b2737..ef63d26e09e 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ConfigurationItemProvider.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ConfigurationItemProvider.java @@ -18,23 +18,12 @@ 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.edit.provider.ComposeableAdapterFactory; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; - -import org.eclipse.papyrus.infra.filters.FiltersFactory; +import org.eclipse.papyrus.infra.filters.provider.FilteredElementItemProvider; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.Configuration; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage; @@ -45,13 +34,7 @@ import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.Paletteconfigurati * @generated */ public class ConfigurationItemProvider - extends ItemProviderAdapter - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource { + extends FilteredElementItemProvider { /** * This constructs an instance from a factory and a notifier. * <!-- begin-user-doc --> @@ -159,7 +142,6 @@ public class ConfigurationItemProvider if (childrenFeatures == null) { super.getChildrenFeatures(object); childrenFeatures.add(PaletteconfigurationPackage.Literals.CONFIGURATION__ICON); - childrenFeatures.add(PaletteconfigurationPackage.Literals.CONFIGURATION__FILTERS); } return childrenFeatures; } @@ -210,7 +192,6 @@ public class ConfigurationItemProvider fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); return; case PaletteconfigurationPackage.CONFIGURATION__ICON: - case PaletteconfigurationPackage.CONFIGURATION__FILTERS: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); return; } @@ -227,27 +208,6 @@ public class ConfigurationItemProvider @Override protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - - newChildDescriptors.add - (createChildParameter - (PaletteconfigurationPackage.Literals.CONFIGURATION__FILTERS, - FiltersFactory.eINSTANCE.createCompoundFilter())); - - newChildDescriptors.add - (createChildParameter - (PaletteconfigurationPackage.Literals.CONFIGURATION__FILTERS, - FiltersFactory.eINSTANCE.createEquals())); - } - - /** - * Return the resource locator for this item provider's resources. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public ResourceLocator getResourceLocator() { - return PaletteConfigurationEditPlugin.INSTANCE; } } diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/DrawerConfigurationItemProvider.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/DrawerConfigurationItemProvider.java index 1054115e53c..ab27724833b 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/DrawerConfigurationItemProvider.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/DrawerConfigurationItemProvider.java @@ -18,12 +18,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.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.DrawerConfiguration; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationFactory; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage; diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ElementDescriptorItemProvider.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ElementDescriptorItemProvider.java index 64562135459..4b3f2ab2dd2 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ElementDescriptorItemProvider.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ElementDescriptorItemProvider.java @@ -18,10 +18,9 @@ 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.edit.provider.ComposeableAdapterFactory; +import org.eclipse.emf.edit.provider.IChildCreationExtender; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; @@ -31,7 +30,6 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; 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.infra.gmfdiag.paletteconfiguration.ElementDescriptor; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage; @@ -182,7 +180,7 @@ public class ElementDescriptorItemProvider */ @Override public ResourceLocator getResourceLocator() { - return PaletteConfigurationEditPlugin.INSTANCE; + return ((IChildCreationExtender)adapterFactory).getResourceLocator(); } } diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/IconDescriptorItemProvider.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/IconDescriptorItemProvider.java index 828580b4fea..d337fa44ac1 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/IconDescriptorItemProvider.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/IconDescriptorItemProvider.java @@ -18,10 +18,9 @@ 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.edit.provider.ComposeableAdapterFactory; +import org.eclipse.emf.edit.provider.IChildCreationExtender; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; @@ -31,7 +30,6 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; 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.infra.gmfdiag.paletteconfiguration.IconDescriptor; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage; @@ -186,7 +184,7 @@ public class IconDescriptorItemProvider */ @Override public ResourceLocator getResourceLocator() { - return PaletteConfigurationEditPlugin.INSTANCE; + return ((IChildCreationExtender)adapterFactory).getResourceLocator(); } } diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/LeafConfigurationItemProvider.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/LeafConfigurationItemProvider.java index 0434efb5e38..890c9c7845c 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/LeafConfigurationItemProvider.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/LeafConfigurationItemProvider.java @@ -18,9 +18,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; - import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.LeafConfiguration; /** diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/PaletteConfigurationEditPlugin.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/PaletteConfigurationEditPlugin.java index 85122c27d98..2a48c98ffbe 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/PaletteConfigurationEditPlugin.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/PaletteConfigurationEditPlugin.java @@ -13,11 +13,8 @@ package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider; import org.eclipse.emf.common.EMFPlugin; - import org.eclipse.emf.common.util.ResourceLocator; - import org.eclipse.emf.ecore.provider.EcoreEditPlugin; - import org.eclipse.papyrus.infra.filters.provider.FiltersEditPlugin; import org.eclipse.papyrus.infra.types.provider.TypesConfigurationsEditPlugin; @@ -54,8 +51,8 @@ public final class PaletteConfigurationEditPlugin extends EMFPlugin { super (new ResourceLocator [] { EcoreEditPlugin.INSTANCE, - FiltersEditPlugin.INSTANCE, TypesConfigurationsEditPlugin.INSTANCE, + FiltersEditPlugin.INSTANCE, }); } diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/PaletteConfigurationItemProvider.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/PaletteConfigurationItemProvider.java index cafa93497cc..da54964b559 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/PaletteConfigurationItemProvider.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/PaletteConfigurationItemProvider.java @@ -18,14 +18,11 @@ 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.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteConfiguration; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationFactory; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage; diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/PaletteconfigurationItemProviderAdapterFactory.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/PaletteconfigurationItemProviderAdapterFactory.java index 40b7f8a49a5..cf9a99811c9 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/PaletteconfigurationItemProviderAdapterFactory.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/PaletteconfigurationItemProviderAdapterFactory.java @@ -14,15 +14,19 @@ package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider; import java.util.ArrayList; import java.util.Collection; +import java.util.List; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.Notifier; - +import org.eclipse.emf.common.util.ResourceLocator; +import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.emf.edit.provider.ChangeNotifier; +import org.eclipse.emf.edit.provider.ChildCreationExtenderManager; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.ComposedAdapterFactory; import org.eclipse.emf.edit.provider.IChangeNotifier; +import org.eclipse.emf.edit.provider.IChildCreationExtender; import org.eclipse.emf.edit.provider.IDisposable; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; @@ -30,7 +34,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.INotifyChangedListener; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; - +import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.util.PaletteconfigurationAdapterFactory; /** @@ -42,7 +46,7 @@ import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.util.Paletteconfig * <!-- end-user-doc --> * @generated */ -public class PaletteconfigurationItemProviderAdapterFactory extends PaletteconfigurationAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable { +public class PaletteconfigurationItemProviderAdapterFactory extends PaletteconfigurationAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable, IChildCreationExtender { /** * This keeps track of the root adapter factory that delegates to this adapter factory. * <!-- begin-user-doc --> @@ -60,6 +64,15 @@ public class PaletteconfigurationItemProviderAdapterFactory extends Paletteconfi protected IChangeNotifier changeNotifier = new ChangeNotifier(); /** + * This helps manage the child creation extenders. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @since 3.1 + */ + protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(PaletteConfigurationEditPlugin.INSTANCE, PaletteconfigurationPackage.eNS_URI); + + /** * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -301,6 +314,34 @@ public class PaletteconfigurationItemProviderAdapterFactory extends Paletteconfi } /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @since 3.1 + */ + public List<IChildCreationExtender> getChildCreationExtenders() { + return childCreationExtenderManager.getChildCreationExtenders(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public Collection<?> getNewChildDescriptors(Object object, EditingDomain editingDomain) { + return childCreationExtenderManager.getNewChildDescriptors(object, editingDomain); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public ResourceLocator getResourceLocator() { + return childCreationExtenderManager; + } + + /** * This adds a listener. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/SeparatorConfigurationItemProvider.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/SeparatorConfigurationItemProvider.java index 2bca49841c6..ba28bbbc35e 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/SeparatorConfigurationItemProvider.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/SeparatorConfigurationItemProvider.java @@ -18,9 +18,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; - import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.SeparatorConfiguration; /** diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/StackConfigurationItemProvider.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/StackConfigurationItemProvider.java index c565d1736e9..47f62f0c5c8 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/StackConfigurationItemProvider.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/StackConfigurationItemProvider.java @@ -18,12 +18,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.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationFactory; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.StackConfiguration; diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ToolConfigurationItemProvider.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ToolConfigurationItemProvider.java index 22c984db482..d5da4c07398 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ToolConfigurationItemProvider.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ToolConfigurationItemProvider.java @@ -18,14 +18,11 @@ 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.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.ToolConfiguration; diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/CustomDrawerConfigurationItemProvider.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/CustomDrawerConfigurationItemProvider.java index 9c2d8f4d48b..292c96d6211 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/CustomDrawerConfigurationItemProvider.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/CustomDrawerConfigurationItemProvider.java @@ -116,6 +116,13 @@ public class CustomDrawerConfigurationItemProvider extends DrawerConfigurationIt return null != command && command.canExecute() ? command : UnexecutableCommand.INSTANCE; } + @Override + protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { + super.collectNewChildDescriptors(newChildDescriptors, object); + + FilteredElementUtil.collectNewFilters(newChildDescriptors, object); + } + /** * Override to not show icon descriptor. <br> @@ -126,10 +133,12 @@ public class CustomDrawerConfigurationItemProvider extends DrawerConfigurationIt public Collection<?> getChildren(final Object object) { DrawerConfiguration configuration = (DrawerConfiguration) object; List<EObject> children = new ArrayList<>(); - - children.addAll(configuration.getFilters()); + + if (configuration.getFilter() != null) { + children.add(configuration.getFilter()); + } children.addAll(configuration.getOwnedConfigurations()); - + return children; } diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/CustomIconDescriptorItemProvider.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/CustomIconDescriptorItemProvider.java index 19ab1372dfe..1224f1c2ad4 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/CustomIconDescriptorItemProvider.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/CustomIconDescriptorItemProvider.java @@ -19,7 +19,6 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.edit.provider.ViewerNotification; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.IconDescriptor; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage; -import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider.IconDescriptorItemProvider; /** * Custom item provider for IconDescriptor. Used to notify changed on eContainer. diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/CustomPaletteConfigurationItemProvider.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/CustomPaletteConfigurationItemProvider.java index 936f502de18..e52721668f2 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/CustomPaletteConfigurationItemProvider.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/CustomPaletteConfigurationItemProvider.java @@ -21,7 +21,6 @@ import org.eclipse.emf.edit.provider.ViewerNotification; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.Configuration; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteConfiguration; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage; -import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider.PaletteConfigurationItemProvider; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.utils.CreatePaletteItemUtil; /** @@ -45,6 +44,13 @@ public class CustomPaletteConfigurationItemProvider extends PaletteConfiguration // Only gets the drawer, no the icon return ((PaletteConfiguration) object).getDrawerConfigurations(); } + + @Override + protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { + super.collectNewChildDescriptors(newChildDescriptors, object); + + FilteredElementUtil.collectNewFilters(newChildDescriptors, object); + } /** * {@inheritDoc} diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/CustomPaletteconfigurationItemProviderAdapterFactory.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/CustomPaletteconfigurationItemProviderAdapterFactory.java index e8040982e30..1d00c35a427 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/CustomPaletteconfigurationItemProviderAdapterFactory.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/CustomPaletteconfigurationItemProviderAdapterFactory.java @@ -14,7 +14,6 @@ package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider; import org.eclipse.emf.common.notify.Adapter; -import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider.PaletteconfigurationItemProviderAdapterFactory; /** * Custom Item provider adapter factory to palette configuration. diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/CustomSeparatorConfigurationItemProvider.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/CustomSeparatorConfigurationItemProvider.java index 2a17fe3bcf7..68bc08cbc79 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/CustomSeparatorConfigurationItemProvider.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/CustomSeparatorConfigurationItemProvider.java @@ -17,7 +17,6 @@ import java.util.Collection; import java.util.Collections; import org.eclipse.emf.common.notify.AdapterFactory; -import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider.SeparatorConfigurationItemProvider; /** * Custom Item provider for SeparatorConfiguration. @@ -43,6 +42,13 @@ public class CustomSeparatorConfigurationItemProvider extends SeparatorConfigura return Collections.emptyList(); } + @Override + protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { + super.collectNewChildDescriptors(newChildDescriptors, object); + + FilteredElementUtil.collectNewFilters(newChildDescriptors, object); + } + /** * {@inheritDoc} */ diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/CustomStackConfigurationItemProvider.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/CustomStackConfigurationItemProvider.java index 398c169f4a7..962402b3469 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/CustomStackConfigurationItemProvider.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/CustomStackConfigurationItemProvider.java @@ -27,7 +27,6 @@ import org.eclipse.gef.palette.ToolEntry; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.Configuration; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.StackConfiguration; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.ToolConfiguration; -import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider.StackConfigurationItemProvider; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.utils.CreatePaletteItemUtil; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.utils.DragAndDropCompoundCommand; @@ -122,6 +121,13 @@ public class CustomStackConfigurationItemProvider extends StackConfigurationItem public Collection<?> getChildren(final Object object) { return ((StackConfiguration) object).getOwnedConfigurations(); } + + @Override + protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { + super.collectNewChildDescriptors(newChildDescriptors, object); + + FilteredElementUtil.collectNewFilters(newChildDescriptors, object); + } /** diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/CustomToolConfigurationItemProvider.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/CustomToolConfigurationItemProvider.java index ba18feaa39c..312fb0268e5 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/CustomToolConfigurationItemProvider.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/CustomToolConfigurationItemProvider.java @@ -22,7 +22,6 @@ import org.eclipse.emf.edit.provider.ViewerNotification; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.Configuration; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.DrawerConfiguration; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage; -import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider.ToolConfigurationItemProvider; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.utils.CreatePaletteItemUtil; /** @@ -47,6 +46,13 @@ public class CustomToolConfigurationItemProvider extends ToolConfigurationItemPr public Collection<?> getChildren(Object object) { return Collections.emptyList(); } + + @Override + protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { + super.collectNewChildDescriptors(newChildDescriptors, object); + + FilteredElementUtil.collectNewFilters(newChildDescriptors, object); + } /** * {@inheritDoc} @@ -62,10 +68,6 @@ public class CustomToolConfigurationItemProvider extends ToolConfigurationItemPr return result != null ? result : super.getImage(object); } - - - - /** * {@inheritDoc} */ diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/FilteredElementUtil.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/FilteredElementUtil.java new file mode 100644 index 00000000000..2e400e373ca --- /dev/null +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/FilteredElementUtil.java @@ -0,0 +1,63 @@ +/***************************************************************************** + * Copyright (c) 2017 EclipseSource and others. + * + * 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: + * EclipseSource - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider; + +import java.util.Collection; +import java.util.Set; +import java.util.stream.Collectors; + +import org.eclipse.emf.common.notify.AdapterFactory; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.edit.command.CommandParameter; +import org.eclipse.papyrus.infra.emf.utils.EMFHelper; +import org.eclipse.papyrus.infra.filters.provider.FilteredElementItemProvider; +import org.eclipse.papyrus.infra.filters.provider.FiltersItemProviderAdapterFactory; + +/** + * @since 3.1 + */ +public class FilteredElementUtil { + public static void collectNewFilters(Collection<Object> newChildDescriptors, Object context) { + + // IChildCreationExtender is not supported when inheriting from another Ecore Metamodel + // We need to delegate to the FilteredElementItemProvider + // However, this will cause duplicates for known (non-extended) new child descriptors, such as CompoundFilter and Equals + // So the second step is to filter to merge only non-duplicates new childs + + // Delegate to FilteredElementItemProvider to get the extended new child + AdapterFactory delegateAF = new FiltersItemProviderAdapterFactory(); + FilteredElementItemProvider delegate = new FilteredElementItemProvider(delegateAF); + Collection<?> delegateNewChild = delegate.getNewChildDescriptors(context, EMFHelper.resolveEditingDomain(context), null); + + // Identify EClass for each known new child descriptor + Set<EClass> knownTypes = newChildDescriptors.stream() + .filter(CommandParameter.class::isInstance) + .map(CommandParameter.class::cast) + .map(CommandParameter::getEValue) + .filter(v -> v != null) + .map(EObject::eClass) + .collect(Collectors.toSet()); + + // Filter known new child descriptors to avoid duplicates, based on the EClass + delegateNewChild.stream() + .filter(CommandParameter.class::isInstance) + .map(CommandParameter.class::cast) + .filter(cp -> !knownTypes.contains(cp.getEValue().eClass())) + .forEach(newChildDescriptors::add); + + delegate.dispose(); + + } +} diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/utils/CreatePaletteItemUtil.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/utils/CreatePaletteItemUtil.java index 9542dd8a2ce..84673498a91 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/utils/CreatePaletteItemUtil.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/utils/CreatePaletteItemUtil.java @@ -141,8 +141,8 @@ public class CreatePaletteItemUtil { // Get stereotype to apply // TODO manage it if (entry instanceof AspectCreationEntry) { - List advices = (List) ((AspectCreationEntry) entry).getAspectProperties(IPapyrusPaletteConstant.ADVICES_TO_APPLY); - if (null != advices && !((List) advices).isEmpty()) { + List<?> advices = (List<?>) ((AspectCreationEntry) entry).getAspectProperties(IPapyrusPaletteConstant.ADVICES_TO_APPLY); + if (null != advices && !((List<?>) advices).isEmpty()) { // Add Advice to element type model. for (Object advice : advices) { if (advice instanceof AbstractAdviceBindingConfiguration) { diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/presentation/CustomPaletteconfigurationEditor.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/presentation/CustomPaletteconfigurationEditor.java index a476bd9cd26..6891d0663a1 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/presentation/CustomPaletteconfigurationEditor.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/presentation/CustomPaletteconfigurationEditor.java @@ -21,11 +21,17 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; import org.eclipse.emf.common.command.BasicCommandStack; import org.eclipse.emf.common.command.Command; import org.eclipse.emf.common.command.CommandStack; import org.eclipse.emf.common.command.CommandStackListener; +import org.eclipse.emf.common.command.CompoundCommand; +import org.eclipse.emf.common.command.StrictCompoundCommand; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; @@ -37,6 +43,7 @@ import org.eclipse.emf.ecore.xmi.XMLResource; import org.eclipse.emf.ecore.xmi.impl.URIHandlerImpl; import org.eclipse.emf.edit.command.CommandParameter; import org.eclipse.emf.edit.command.CreateChildCommand; +import org.eclipse.emf.edit.command.DeleteCommand; import org.eclipse.emf.edit.provider.ComposedAdapterFactory; import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory; import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory; @@ -47,9 +54,13 @@ import org.eclipse.emf.edit.ui.dnd.LocalTransfer; import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter; import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider; import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider; +import org.eclipse.emf.transaction.RollbackException; import org.eclipse.emf.transaction.TransactionalCommandStack; +import org.eclipse.emf.transaction.TransactionalEditingDomain; import org.eclipse.emf.transaction.impl.TransactionalCommandStackImpl; import org.eclipse.emf.transaction.impl.TransactionalEditingDomainImpl; +import org.eclipse.emf.workspace.AbstractEMFOperation; +import org.eclipse.emf.workspace.EMFOperationCommand; import org.eclipse.emf.workspace.WorkspaceEditingDomainFactory; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.ProgressMonitorDialog; @@ -125,6 +136,9 @@ public class CustomPaletteconfigurationEditor extends PaletteconfigurationEditor /** icon path for the delete button */ protected static final String DELETE_ICON = "/icons/delete.gif";//$NON-NLS-1$ + /** icon path for the filters button */ + protected static final String FILTERS_ICON = "/icons/filter.gif";//$NON-NLS-1$ + private static final String NEW_TOOL_LABEL = Messages.CustomPaletteconfigurationEditor_NewTool; private static final String STACK_LABEL = "Stack"; //$NON-NLS-1$ @@ -199,8 +213,8 @@ public class CustomPaletteconfigurationEditor extends PaletteconfigurationEditor // Create the editing domain with a special command stack. TransactionalEditingDomainImpl editingDomain = new TransactionalEditingDomainImpl(adapterFactory, commandStack); WorkspaceEditingDomainFactory.INSTANCE.mapResourceSet(editingDomain); - - this.editingDomain = editingDomain; + + this.editingDomain = editingDomain; } /** @@ -362,41 +376,66 @@ public class CustomPaletteconfigurationEditor extends PaletteconfigurationEditor createToolBarItem(toolbar, CREATE_SEPARATOR_ICON, Messages.CustomPaletteconfigurationEditor_Create_Separator_Tooltip, createNewSeparatorListener(), validatorForNotStackChild); createToolBarItem(toolbar, CREATE_TOOL_ICON, Messages.CustomPaletteconfigurationEditor_Create_Tool_Tooltip, createNewToolListener(), validator); createToolBarItem(toolbar, CREATE_STACK_ICON, Messages.CustomPaletteconfigurationEditor_Create_Stack_Tooltip, createNewStackListener(), validatorForNotStackChild); - createToolBarItem(toolbar, CREATE_DRAWERS_ICON, "Filter", createFilterListener(), () -> true); + createToolBarItem(toolbar, FILTERS_ICON, "Create a new Filter", createFilterListener(), () -> { + Object firstElement = ((IStructuredSelection) getSelection()).getFirstElement(); + return firstElement instanceof Configuration || firstElement instanceof CompoundFilter; + }); } - /** - * @return - */ private Listener createFilterListener() { return event -> { IStructuredSelection selection = (IStructuredSelection) selectionViewer.getSelection(); if (selection == null || selection.size() != 1) { return; } - + Object selected = selection.getFirstElement(); - + EObject parent; - + + CompoundCommand command = new StrictCompoundCommand(); + if (selected instanceof Configuration) { - parent = (Configuration)selected; + Configuration configuration = (Configuration) selected; + if (configuration.getFilter() != null) { + command.append(new DeleteCommand(getEditingDomain(), Collections.singleton(configuration.getFilter()))); + } + parent = configuration; } else if (selected instanceof CompoundFilter) { - parent = (CompoundFilter)selected; + parent = (CompoundFilter) selected; } else { return; } - + List<CommandParameter> newChildDescriptors = editingDomain.getNewChildDescriptors(parent, null).stream() - .filter(CommandParameter.class::isInstance) - .map(CommandParameter.class::cast) - .collect(Collectors.toList()); - + .filter(CommandParameter.class::isInstance) + .map(CommandParameter.class::cast) + .collect(Collectors.toList()); + NewFilterDialog dialog = new NewFilterDialog(getSite().getShell(), newChildDescriptors); if (dialog.open() == Dialog.OK && dialog.getNewChild() != null) { CommandParameter newChild = dialog.getNewChild(); + Command createCommand = editingDomain.createCommand(CreateChildCommand.class, new CommandParameter(parent, null, newChild)); - editingDomain.getCommandStack().execute(createCommand); + command.append(createCommand); + + TransactionalEditingDomain ted = (TransactionalEditingDomain) editingDomain; + + Command operation = new EMFOperationCommand(ted, new AbstractEMFOperation(ted, "Create filter") { + + @Override + protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { + if (command.canExecute()) { + command.execute(); + return Status.OK_STATUS; + } else { + throw new ExecutionException("Unable to create a new filter - the operation is not enabled"); + } + } + + }); + + ted.getCommandStack().execute(operation); } }; } diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/.settings/.api_filters b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/.settings/.api_filters index fb893e45c48..181bfb85a6e 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/.settings/.api_filters +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/.settings/.api_filters @@ -1,38 +1,466 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <component id="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration" version="2"> - <resource path="META-INF/MANIFEST.MF"> - <filter comment="Generated code not meant to be implemented" id="923795461"> + <resource path="src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/ChildConfiguration.java" type="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.ChildConfiguration"> + <filter comment="Generated code" id="403984517"> <message_arguments> - <message_argument value="3.1.0"/> - <message_argument value="3.0.0"/> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.ChildConfiguration"/> + <message_argument value="org.eclipse.papyrus.infra.filters.FilteredElement"/> + <message_argument value="getFilter()"/> </message_arguments> </filter> </resource> <resource path="src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/Configuration.java" type="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.Configuration"> - <filter comment="Generated code not meant to be implemented" id="403804204"> + <filter comment="Generated code" id="403984517"> <message_arguments> <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.Configuration"/> - <message_argument value="getFilters()"/> + <message_argument value="org.eclipse.papyrus.infra.filters.FilteredElement"/> + <message_argument value="getFilter()"/> </message_arguments> </filter> - <filter comment="Generated code not meant to be implemented" id="403804204"> + </resource> + <resource path="src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/DrawerConfiguration.java" type="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.DrawerConfiguration"> + <filter comment="Generated code" id="403984517"> <message_arguments> - <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.Configuration"/> - <message_argument value="getFilters(String)"/> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.DrawerConfiguration"/> + <message_argument value="org.eclipse.papyrus.infra.filters.FilteredElement"/> + <message_argument value="getFilter()"/> </message_arguments> </filter> - <filter comment="Generated code not meant to be implemented" id="403804204"> + </resource> + <resource path="src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/LeafConfiguration.java" type="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.LeafConfiguration"> + <filter comment="Generated code" id="403984517"> <message_arguments> - <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.Configuration"/> - <message_argument value="getFilters(String, boolean, EClass)"/> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.LeafConfiguration"/> + <message_argument value="org.eclipse.papyrus.infra.filters.FilteredElement"/> + <message_argument value="getFilter()"/> + </message_arguments> + </filter> + </resource> + <resource path="src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/PaletteConfiguration.java" type="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteConfiguration"> + <filter comment="Generated code" id="403984517"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteConfiguration"/> + <message_argument value="org.eclipse.papyrus.infra.filters.FilteredElement"/> + <message_argument value="getFilter()"/> + </message_arguments> + </filter> + </resource> + <resource path="src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/PaletteconfigurationPackage.java" type="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="CHILD_CONFIGURATION_FEATURE_COUNT"/> + <message_argument value="4"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="CHILD_CONFIGURATION__DESCRIPTION"/> + <message_argument value="2"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="CHILD_CONFIGURATION__ICON"/> + <message_argument value="3"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="CHILD_CONFIGURATION__ID"/> + <message_argument value="0"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="CHILD_CONFIGURATION__LABEL"/> + <message_argument value="1"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="CONFIGURATION_FEATURE_COUNT"/> + <message_argument value="4"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="CONFIGURATION__DESCRIPTION"/> + <message_argument value="2"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="CONFIGURATION__ICON"/> + <message_argument value="3"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="CONFIGURATION__ID"/> + <message_argument value="0"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="CONFIGURATION__LABEL"/> + <message_argument value="1"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="DRAWER_CONFIGURATION_FEATURE_COUNT"/> + <message_argument value="5"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="DRAWER_CONFIGURATION__DESCRIPTION"/> + <message_argument value="2"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="DRAWER_CONFIGURATION__ICON"/> + <message_argument value="3"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="DRAWER_CONFIGURATION__ID"/> + <message_argument value="0"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="DRAWER_CONFIGURATION__LABEL"/> + <message_argument value="1"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="DRAWER_CONFIGURATION__OWNED_CONFIGURATIONS"/> + <message_argument value="4"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="LEAF_CONFIGURATION_FEATURE_COUNT"/> + <message_argument value="4"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="LEAF_CONFIGURATION__DESCRIPTION"/> + <message_argument value="2"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="LEAF_CONFIGURATION__ICON"/> + <message_argument value="3"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="LEAF_CONFIGURATION__ID"/> + <message_argument value="0"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="LEAF_CONFIGURATION__LABEL"/> + <message_argument value="1"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="PALETTE_CONFIGURATION_FEATURE_COUNT"/> + <message_argument value="6"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="PALETTE_CONFIGURATION__DESCRIPTION"/> + <message_argument value="2"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="PALETTE_CONFIGURATION__DRAWER_CONFIGURATIONS"/> + <message_argument value="4"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="PALETTE_CONFIGURATION__ICON"/> + <message_argument value="3"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="PALETTE_CONFIGURATION__ID"/> + <message_argument value="0"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="PALETTE_CONFIGURATION__LABEL"/> + <message_argument value="1"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="PALETTE_CONFIGURATION__REQUIRED_PROFILES"/> + <message_argument value="5"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="SEPARATOR_CONFIGURATION_FEATURE_COUNT"/> + <message_argument value="4"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="SEPARATOR_CONFIGURATION__DESCRIPTION"/> + <message_argument value="2"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="SEPARATOR_CONFIGURATION__ICON"/> + <message_argument value="3"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="SEPARATOR_CONFIGURATION__ID"/> + <message_argument value="0"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="SEPARATOR_CONFIGURATION__LABEL"/> + <message_argument value="1"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="STACK_CONFIGURATION_FEATURE_COUNT"/> + <message_argument value="5"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="STACK_CONFIGURATION__DESCRIPTION"/> + <message_argument value="2"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="STACK_CONFIGURATION__ICON"/> + <message_argument value="3"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="STACK_CONFIGURATION__ID"/> + <message_argument value="0"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="STACK_CONFIGURATION__LABEL"/> + <message_argument value="1"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="STACK_CONFIGURATION__OWNED_CONFIGURATIONS"/> + <message_argument value="4"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="TOOL_CONFIGURATION_FEATURE_COUNT"/> + <message_argument value="7"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="TOOL_CONFIGURATION__DESCRIPTION"/> + <message_argument value="2"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="TOOL_CONFIGURATION__ELEMENT_DESCRIPTORS"/> + <message_argument value="5"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="TOOL_CONFIGURATION__ICON"/> + <message_argument value="3"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="TOOL_CONFIGURATION__ID"/> + <message_argument value="0"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="TOOL_CONFIGURATION__KIND"/> + <message_argument value="4"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="TOOL_CONFIGURATION__LABEL"/> + <message_argument value="1"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="388194388"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage"/> + <message_argument value="TOOL_CONFIGURATION__TOOL_CLASS_NAME"/> + <message_argument value="6"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="1211105284"> + <message_arguments> + <message_argument value="CHILD_CONFIGURATION__FILTER"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="1211105284"> + <message_arguments> + <message_argument value="CONFIGURATION__FILTER"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="1211105284"> + <message_arguments> + <message_argument value="DRAWER_CONFIGURATION__FILTER"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="1211105284"> + <message_arguments> + <message_argument value="LEAF_CONFIGURATION__FILTER"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="1211105284"> + <message_arguments> + <message_argument value="PALETTE_CONFIGURATION__FILTER"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="1211105284"> + <message_arguments> + <message_argument value="SEPARATOR_CONFIGURATION__FILTER"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="1211105284"> + <message_arguments> + <message_argument value="STACK_CONFIGURATION__FILTER"/> + </message_arguments> + </filter> + <filter comment="Generated code" id="1211105284"> + <message_arguments> + <message_argument value="TOOL_CONFIGURATION__FILTER"/> + </message_arguments> + </filter> + </resource> + <resource path="src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/SeparatorConfiguration.java" type="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.SeparatorConfiguration"> + <filter comment="Generated code" id="403984517"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.SeparatorConfiguration"/> + <message_argument value="org.eclipse.papyrus.infra.filters.FilteredElement"/> + <message_argument value="getFilter()"/> + </message_arguments> + </filter> + </resource> + <resource path="src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/StackConfiguration.java" type="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.StackConfiguration"> + <filter comment="Generated code" id="403984517"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.StackConfiguration"/> + <message_argument value="org.eclipse.papyrus.infra.filters.FilteredElement"/> + <message_argument value="getFilter()"/> + </message_arguments> + </filter> + </resource> + <resource path="src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/ToolConfiguration.java" type="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.ToolConfiguration"> + <filter comment="Generated code" id="403984517"> + <message_arguments> + <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.ToolConfiguration"/> + <message_argument value="org.eclipse.papyrus.infra.filters.FilteredElement"/> + <message_argument value="getFilter()"/> </message_arguments> </filter> </resource> <resource path="src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/ConfigurationImpl.java" type="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.impl.ConfigurationImpl"> - <filter comment="Generated code not meant to be implemented" id="336658481"> + <filter comment="Generated code detail" id="338849923"> <message_arguments> <message_argument value="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.impl.ConfigurationImpl"/> - <message_argument value="filters"/> + </message_arguments> + </filter> + </resource> + <resource path="src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/util/PaletteconfigurationAdapterFactory.java" type="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.util.PaletteconfigurationAdapterFactory"> + <filter comment="Generated code" id="1143996420"> + <message_arguments> + <message_argument value="createFilteredElementAdapter()"/> + </message_arguments> + </filter> + </resource> + <resource path="src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/util/PaletteconfigurationSwitch.java" type="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.util.PaletteconfigurationSwitch"> + <filter comment="Generated code" id="1143996420"> + <message_arguments> + <message_argument value="caseFilteredElement(FilteredElement)"/> </message_arguments> </filter> </resource> diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/model/PaletteConfiguration.ecore b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/model/PaletteConfiguration.ecore index eb97b435124..c48675f3235 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/model/PaletteConfiguration.ecore +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/model/PaletteConfiguration.ecore @@ -8,7 +8,7 @@ <eStructuralFeatures xsi:type="ecore:EAttribute" name="requiredProfiles" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Configuration" abstract="true"> + <eClassifiers xsi:type="ecore:EClass" name="Configuration" abstract="true" eSuperTypes="../../org.eclipse.papyrus.infra.filters/model/filters.ecore#//FilteredElement"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="unique identifier of the configuration, used by the tool to retrieve the configuration
unique identifier of the configuration, used by the tool to retrieve the configuration"/> @@ -26,9 +26,6 @@ </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EReference" name="icon" eType="#//IconDescriptor" containment="true"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="filters" ordered="false" - upperBound="-1" eType="ecore:EClass ../../org.eclipse.papyrus.infra.filters/model/filters.ecore#//Filter" - containment="true"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="IconDescriptor"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/model/PaletteConfiguration.genmodel b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/model/PaletteConfiguration.genmodel index dd2c3b1615a..75214979434 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/model/PaletteConfiguration.genmodel +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/model/PaletteConfiguration.genmodel @@ -11,7 +11,7 @@ testsDirectory="/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/src-gen" testSuiteClass="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests.PaletteConfigurationAllTests" importerID="org.eclipse.uml2.uml.ecore.importer" complianceLevel="5.0" copyrightFields="false" - usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.papyrus.infra.filters/model/filters.genmodel#//filters ../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel#//types platform:/plugin/org.eclipse.uml2.types/model/Types.genmodel#//types"> + providerRootExtendsClass="" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel#//types ../../org.eclipse.papyrus.infra.filters/model/filters.genmodel#//filters ../../org.eclipse.uml2.types/model/Types.genmodel#//types"> <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/importer/org.eclipse.uml2.uml.ecore.importer"> <details key="OPPOSITE_ROLE_NAMES" value="IGNORE"/> <details key="DUPLICATE_FEATURES" value="DISCARD"/> @@ -39,7 +39,7 @@ <foreignModel>PaletteConfiguration.uml</foreignModel> <genPackages xsi:type="genmodel:GenPackage" prefix="Paletteconfiguration" basePackage="org.eclipse.papyrus.infra.gmfdiag" resource="XMI" disposableProviderFactory="true" multipleEditorPages="false" - ecorePackage="PaletteConfiguration.ecore#/"> + extensibleProviderFactory="true" childCreationExtenders="true" ecorePackage="PaletteConfiguration.ecore#/"> <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="PaletteConfiguration.ecore#//ToolKind"> <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="PaletteConfiguration.ecore#//ToolKind/CreationTool"/> <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="PaletteConfiguration.ecore#//ToolKind/ConnectionTool"/> @@ -55,8 +55,6 @@ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute PaletteConfiguration.ecore#//Configuration/description"/> <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true" createChild="false" ecoreFeature="ecore:EReference PaletteConfiguration.ecore#//Configuration/icon"/> - <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true" - createChild="true" ecoreFeature="ecore:EReference PaletteConfiguration.ecore#//Configuration/filters"/> </genClasses> <genClasses xsi:type="genmodel:GenClass" ecoreClass="PaletteConfiguration.ecore#//IconDescriptor"> <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute PaletteConfiguration.ecore#//IconDescriptor/pluginID"/> diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/model/PaletteConfiguration.notation b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/model/PaletteConfiguration.notation index 955032f4c5e..6a8b44c8849 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/model/PaletteConfiguration.notation +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/model/PaletteConfiguration.notation @@ -406,31 +406,31 @@ <element xsi:nil="true"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EZ9kUi8FEeede-9TuA3-_g" x="200"/> </children> - <children xmi:type="notation:Shape" xmi:id="_yJ-xkIvlEeeGyKO2MvkxHA" type="Interface_Shape"> - <children xmi:type="notation:DecorationNode" xmi:id="_yKDDAIvlEeeGyKO2MvkxHA" type="Interface_NameLabel"/> - <children xmi:type="notation:DecorationNode" xmi:id="_yKDDAYvlEeeGyKO2MvkxHA" type="Interface_FloatingNameLabel"> - <layoutConstraint xmi:type="notation:Location" xmi:id="_yKDDAovlEeeGyKO2MvkxHA" y="15"/> - </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_yKDDA4vlEeeGyKO2MvkxHA" type="Interface_AttributeCompartment"> - <styles xmi:type="notation:TitleStyle" xmi:id="_yKDDBIvlEeeGyKO2MvkxHA"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_yKDDBYvlEeeGyKO2MvkxHA"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_yKDDBovlEeeGyKO2MvkxHA"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yKDDB4vlEeeGyKO2MvkxHA"/> - </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_yKDqEIvlEeeGyKO2MvkxHA" type="Interface_OperationCompartment"> - <styles xmi:type="notation:TitleStyle" xmi:id="_yKDqEYvlEeeGyKO2MvkxHA"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_yKDqEovlEeeGyKO2MvkxHA"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_yKDqE4vlEeeGyKO2MvkxHA"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yKDqFIvlEeeGyKO2MvkxHA"/> - </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_yKDqFYvlEeeGyKO2MvkxHA" type="Interface_NestedClassifierCompartment"> - <styles xmi:type="notation:TitleStyle" xmi:id="_yKDqFovlEeeGyKO2MvkxHA"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_yKDqF4vlEeeGyKO2MvkxHA"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_yKDqGIvlEeeGyKO2MvkxHA"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yKDqGYvlEeeGyKO2MvkxHA"/> - </children> - <element xmi:type="uml:Interface" href="platform:/resource/org.eclipse.papyrus.infra.filters/model/filters.uml#_ftlkkHBIEeSbg_BqWNBy6A"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yJ-xkYvlEeeGyKO2MvkxHA" x="1000" y="20"/> + <children xmi:type="notation:Shape" xmi:id="_DdX9MIywEeesNNBCp0L8sw" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_DdZLUIywEeesNNBCp0L8sw" type="Class_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_DdZLUYywEeesNNBCp0L8sw" type="Class_FloatingNameLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_DdZLUoywEeesNNBCp0L8sw" y="15"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_DdZyYIywEeesNNBCp0L8sw" type="Class_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_DdZyYYywEeesNNBCp0L8sw"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_DdZyYoywEeesNNBCp0L8sw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_DdZyY4ywEeesNNBCp0L8sw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DdZyZIywEeesNNBCp0L8sw"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_DdZyZYywEeesNNBCp0L8sw" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_DdaZcIywEeesNNBCp0L8sw"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_DdaZcYywEeesNNBCp0L8sw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_DdaZcoywEeesNNBCp0L8sw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DdaZc4ywEeesNNBCp0L8sw"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_DdaZdIywEeesNNBCp0L8sw" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_DdaZdYywEeesNNBCp0L8sw"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_DdaZdoywEeesNNBCp0L8sw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_DdaZd4ywEeesNNBCp0L8sw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DdaZeIywEeesNNBCp0L8sw"/> + </children> + <element xmi:type="uml:Class" href="platform:/plugin/org.eclipse.papyrus.infra.filters/model/filters.uml#_xqfKYIyvEeesNNBCp0L8sw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DdX9MYywEeesNNBCp0L8sw" x="920" y="20"/> </children> <styles xmi:type="notation:StringValueStyle" xmi:id="_6dfb8SwWEeeGrqtgh2TERg" name="diagram_compatibility_version" stringValue="1.3.0"/> <styles xmi:type="notation:DiagramStyle" xmi:id="_6dfb8iwWEeeGrqtgh2TERg"/> @@ -780,29 +780,14 @@ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EZ-ycy8FEeede-9TuA3-_g"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EZ-ydC8FEeede-9TuA3-_g"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_1VPzsIvlEeeGyKO2MvkxHA" type="Association_Edge" source="_NvxysCwcEeetnM91DrjyzA" target="_yJ-xkIvlEeeGyKO2MvkxHA"> - <children xmi:type="notation:DecorationNode" xmi:id="_1VPzs4vlEeeGyKO2MvkxHA" type="Association_StereotypeLabel"> - <layoutConstraint xmi:type="notation:Location" xmi:id="_1VPztIvlEeeGyKO2MvkxHA" y="-20"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_1VQawIvlEeeGyKO2MvkxHA" type="Association_NameLabel"> - <layoutConstraint xmi:type="notation:Location" xmi:id="_1VQawYvlEeeGyKO2MvkxHA" y="20"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_1VQawovlEeeGyKO2MvkxHA" type="Association_TargetRoleLabel"> - <layoutConstraint xmi:type="notation:Location" xmi:id="_1VQaw4vlEeeGyKO2MvkxHA" x="35" y="-13"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_1VQaxIvlEeeGyKO2MvkxHA" type="Association_SourceRoleLabel"> - <layoutConstraint xmi:type="notation:Location" xmi:id="_1VQaxYvlEeeGyKO2MvkxHA" y="20"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_1VQaxovlEeeGyKO2MvkxHA" type="Association_SourceMultiplicityLabel"> - <layoutConstraint xmi:type="notation:Location" xmi:id="_1VQax4vlEeeGyKO2MvkxHA" y="20"/> - </children> - <children xmi:type="notation:DecorationNode" xmi:id="_1VQayIvlEeeGyKO2MvkxHA" type="Association_TargetMultiplicityLabel"> - <layoutConstraint xmi:type="notation:Location" xmi:id="_1VQayYvlEeeGyKO2MvkxHA" y="-20"/> - </children> - <styles xmi:type="notation:FontStyle" xmi:id="_1VPzsYvlEeeGyKO2MvkxHA"/> - <element xmi:type="uml:Association" href="PaletteConfiguration.uml#_1T5I0IvlEeeGyKO2MvkxHA"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1VPzsovlEeeGyKO2MvkxHA" points="[805, 60, -643984, -643984]$[1000, 60, -643984, -643984]"/> - <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1XBVUIvlEeeGyKO2MvkxHA" id="(1.0,0.4225352112676056)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1XB8YIvlEeeGyKO2MvkxHA" id="(0.0,0.3883495145631068)"/> + <edges xmi:type="notation:Connector" xmi:id="_FjriYIywEeesNNBCp0L8sw" type="Generalization_Edge" source="_NvxysCwcEeetnM91DrjyzA" target="_DdX9MIywEeesNNBCp0L8sw"> + <children xmi:type="notation:DecorationNode" xmi:id="_FjsJcIywEeesNNBCp0L8sw" type="Generalization_StereotypeLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_FjsJcYywEeesNNBCp0L8sw" y="40"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_FjriYYywEeesNNBCp0L8sw"/> + <element xmi:type="uml:Generalization" href="PaletteConfiguration.uml#_FiTpYIywEeesNNBCp0L8sw"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FjriYoywEeesNNBCp0L8sw" points="[805, 60, -643984, -643984]$[920, 60, -643984, -643984]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FkkTMIywEeesNNBCp0L8sw" id="(1.0,0.4225352112676056)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FkkTMYywEeesNNBCp0L8sw" id="(0.0,0.4)"/> </edges> </notation:Diagram> diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/model/PaletteConfiguration.uml b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/model/PaletteConfiguration.uml index 9359991b80e..9413675c508 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/model/PaletteConfiguration.uml +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/model/PaletteConfiguration.uml @@ -1,163 +1,155 @@ <?xml version="1.0" encoding="UTF-8"?> <xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA"> <uml:Model xmi:id="_2IHXICwWEeeGrqtgh2TERg" name="paletteconfiguration" URI="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8"> - <packageImport xmi:id="_w97OIIvlEeeGyKO2MvkxHA"> + <packageImport xmi:type="uml:PackageImport" xmi:id="_w97OIIvlEeeGyKO2MvkxHA"> <importedPackage xmi:type="uml:Model" href="platform:/plugin/org.eclipse.papyrus.infra.filters/model/filters.uml#_u1APUG86EeSumdlFUM6GVw"/> </packageImport> <packagedElement xmi:type="uml:Class" xmi:id="_2IHXISwWEeeGrqtgh2TERg" name="PaletteConfiguration"> - <generalization xmi:id="_2IHXIiwWEeeGrqtgh2TERg" general="_2IHXKCwWEeeGrqtgh2TERg"/> - <ownedAttribute xmi:id="_2IHXIywWEeeGrqtgh2TERg" name="drawerConfigurations" type="_2IHXOywWEeeGrqtgh2TERg" isOrdered="true" aggregation="composite" association="_2IHXQywWEeeGrqtgh2TERg"> + <generalization xmi:type="uml:Generalization" xmi:id="_2IHXIiwWEeeGrqtgh2TERg" general="_2IHXKCwWEeeGrqtgh2TERg"/> + <ownedAttribute xmi:type="uml:Property" xmi:id="_2IHXIywWEeeGrqtgh2TERg" name="drawerConfigurations" type="_2IHXOywWEeeGrqtgh2TERg" isOrdered="true" aggregation="composite" association="_2IHXQywWEeeGrqtgh2TERg"> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2IHXJCwWEeeGrqtgh2TERg" value="*"/> </ownedAttribute> - <ownedAttribute xmi:id="_2IHXJSwWEeeGrqtgh2TERg" name="requiredProfiles" visibility="public" isOrdered="true"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_2IHXJSwWEeeGrqtgh2TERg" name="requiredProfiles" visibility="public" isOrdered="true"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2IHXJiwWEeeGrqtgh2TERg"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2IHXJywWEeeGrqtgh2TERg" value="*"/> </ownedAttribute> </packagedElement> <packagedElement xmi:type="uml:Class" xmi:id="_2IHXKCwWEeeGrqtgh2TERg" name="Configuration" isAbstract="true"> - <ownedAttribute xmi:id="_2IHXKSwWEeeGrqtgh2TERg" name="id" visibility="public" isOrdered="true"> - <ownedComment xmi:id="_2IHXKiwWEeeGrqtgh2TERg" annotatedElement="_2IHXKSwWEeeGrqtgh2TERg"> + <generalization xmi:type="uml:Generalization" xmi:id="_FiTpYIywEeesNNBCp0L8sw"> + <general xmi:type="uml:Class" href="platform:/plugin/org.eclipse.papyrus.infra.filters/model/filters.uml#_xqfKYIyvEeesNNBCp0L8sw"/> + </generalization> + <ownedAttribute xmi:type="uml:Property" xmi:id="_2IHXKSwWEeeGrqtgh2TERg" name="id" visibility="public" isOrdered="true"> + <ownedComment xmi:type="uml:Comment" xmi:id="_2IHXKiwWEeeGrqtgh2TERg" annotatedElement="_2IHXKSwWEeeGrqtgh2TERg"> <body>unique identifier of the configuration, used by the tool to retrieve the configuration</body> </ownedComment> - <ownedComment xmi:id="_2IgYsCwWEeeGrqtgh2TERg" annotatedElement="_2IHXKSwWEeeGrqtgh2TERg"> + <ownedComment xmi:type="uml:Comment" xmi:id="_2IgYsCwWEeeGrqtgh2TERg" annotatedElement="_2IHXKSwWEeeGrqtgh2TERg"> <body>unique identifier of the configuration, used by the tool to retrieve the configuration</body> </ownedComment> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/> </ownedAttribute> - <ownedAttribute xmi:id="_2IHXKywWEeeGrqtgh2TERg" name="label" visibility="public" isOrdered="true"> - <ownedComment xmi:id="_2IHXLCwWEeeGrqtgh2TERg" annotatedElement="_2IHXKywWEeeGrqtgh2TERg"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_2IHXKywWEeeGrqtgh2TERg" name="label" visibility="public" isOrdered="true"> + <ownedComment xmi:type="uml:Comment" xmi:id="_2IHXLCwWEeeGrqtgh2TERg" annotatedElement="_2IHXKywWEeeGrqtgh2TERg"> <body>label of the configuration, used only for display</body> </ownedComment> - <ownedComment xmi:id="_2Ig_wCwWEeeGrqtgh2TERg" annotatedElement="_2IHXKywWEeeGrqtgh2TERg"> + <ownedComment xmi:type="uml:Comment" xmi:id="_2Ig_wCwWEeeGrqtgh2TERg" annotatedElement="_2IHXKywWEeeGrqtgh2TERg"> <body>label of the configuration, used only for display</body> </ownedComment> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/> </ownedAttribute> - <ownedAttribute xmi:id="_2IHXLSwWEeeGrqtgh2TERg" name="description" visibility="public" isOrdered="true"> - <ownedComment xmi:id="_2IHXLiwWEeeGrqtgh2TERg" annotatedElement="_2IHXLSwWEeeGrqtgh2TERg"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_2IHXLSwWEeeGrqtgh2TERg" name="description" visibility="public" isOrdered="true"> + <ownedComment xmi:type="uml:Comment" xmi:id="_2IHXLiwWEeeGrqtgh2TERg" annotatedElement="_2IHXLSwWEeeGrqtgh2TERg"> <body>Description of the configuration.</body> </ownedComment> - <ownedComment xmi:id="_2Ig_wSwWEeeGrqtgh2TERg" annotatedElement="_2IHXLSwWEeeGrqtgh2TERg"> + <ownedComment xmi:type="uml:Comment" xmi:id="_2Ig_wSwWEeeGrqtgh2TERg" annotatedElement="_2IHXLSwWEeeGrqtgh2TERg"> <body>Description of the configuration.</body> </ownedComment> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2IHXLywWEeeGrqtgh2TERg"/> </ownedAttribute> - <ownedAttribute xmi:id="_2IHXMCwWEeeGrqtgh2TERg" name="icon" type="_2IHXMiwWEeeGrqtgh2TERg" isOrdered="true" aggregation="composite" association="_2IHXOSwWEeeGrqtgh2TERg"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_2IHXMCwWEeeGrqtgh2TERg" name="icon" type="_2IHXMiwWEeeGrqtgh2TERg" isOrdered="true" aggregation="composite" association="_2IHXOSwWEeeGrqtgh2TERg"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2IHXMSwWEeeGrqtgh2TERg"/> </ownedAttribute> - <ownedAttribute xmi:id="_1ULcsIvlEeeGyKO2MvkxHA" name="filters" aggregation="composite" association="_1T5I0IvlEeeGyKO2MvkxHA"> - <type xmi:type="uml:Interface" href="platform:/plugin/org.eclipse.papyrus.infra.filters/model/filters.uml#_ftlkkHBIEeSbg_BqWNBy6A"/> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1UMq0IvlEeeGyKO2MvkxHA"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1UNR4IvlEeeGyKO2MvkxHA" value="*"/> - </ownedAttribute> </packagedElement> <packagedElement xmi:type="uml:Class" xmi:id="_2IHXMiwWEeeGrqtgh2TERg" name="IconDescriptor"> - <ownedComment xmi:id="_2IHXMywWEeeGrqtgh2TERg" annotatedElement="_2IHXMiwWEeeGrqtgh2TERg"> + <ownedComment xmi:type="uml:Comment" xmi:id="_2IHXMywWEeeGrqtgh2TERg" annotatedElement="_2IHXMiwWEeeGrqtgh2TERg"> <body>Descriptor for icons, constituted from the bundle ID and the path in the bundle.</body> </ownedComment> - <ownedComment xmi:id="_2Ig_wiwWEeeGrqtgh2TERg" annotatedElement="_2IHXMiwWEeeGrqtgh2TERg"> + <ownedComment xmi:type="uml:Comment" xmi:id="_2Ig_wiwWEeeGrqtgh2TERg" annotatedElement="_2IHXMiwWEeeGrqtgh2TERg"> <body>Descriptor for icons, constituted from the bundle ID and the path in the bundle.</body> </ownedComment> - <ownedAttribute xmi:id="_2IHXNCwWEeeGrqtgh2TERg" name="pluginID" visibility="public" isOrdered="true"> - <ownedComment xmi:id="_2IHXNSwWEeeGrqtgh2TERg" annotatedElement="_2IHXNCwWEeeGrqtgh2TERg"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_2IHXNCwWEeeGrqtgh2TERg" name="pluginID" visibility="public" isOrdered="true"> + <ownedComment xmi:type="uml:Comment" xmi:id="_2IHXNSwWEeeGrqtgh2TERg" annotatedElement="_2IHXNCwWEeeGrqtgh2TERg"> <body>ID of the plugin where the icon is located. If not set, the tool will look in the bundle defining the palette.</body> </ownedComment> - <ownedComment xmi:id="_2Ig_wywWEeeGrqtgh2TERg" annotatedElement="_2IHXNCwWEeeGrqtgh2TERg"> + <ownedComment xmi:type="uml:Comment" xmi:id="_2Ig_wywWEeeGrqtgh2TERg" annotatedElement="_2IHXNCwWEeeGrqtgh2TERg"> <body>ID of the plugin where the icon is located. If not set, the tool will look in the bundle defining the palette.</body> </ownedComment> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2IHXNiwWEeeGrqtgh2TERg"/> </ownedAttribute> - <ownedAttribute xmi:id="_2IHXNywWEeeGrqtgh2TERg" name="iconPath" visibility="public" isOrdered="true"> - <ownedComment xmi:id="_2IHXOCwWEeeGrqtgh2TERg" annotatedElement="_2IHXNywWEeeGrqtgh2TERg"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_2IHXNywWEeeGrqtgh2TERg" name="iconPath" visibility="public" isOrdered="true"> + <ownedComment xmi:type="uml:Comment" xmi:id="_2IHXOCwWEeeGrqtgh2TERg" annotatedElement="_2IHXNywWEeeGrqtgh2TERg"> <body>Path of the icon in the bundle. </body> </ownedComment> - <ownedComment xmi:id="_2Ig_xCwWEeeGrqtgh2TERg" annotatedElement="_2IHXNywWEeeGrqtgh2TERg"> + <ownedComment xmi:type="uml:Comment" xmi:id="_2Ig_xCwWEeeGrqtgh2TERg" annotatedElement="_2IHXNywWEeeGrqtgh2TERg"> <body>Path of the icon in the bundle. </body> </ownedComment> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/> </ownedAttribute> </packagedElement> <packagedElement xmi:type="uml:Association" xmi:id="_2IHXOSwWEeeGrqtgh2TERg" memberEnd="_2IHXMCwWEeeGrqtgh2TERg _2IHXOiwWEeeGrqtgh2TERg"> - <ownedEnd xmi:id="_2IHXOiwWEeeGrqtgh2TERg" type="_2IHXKCwWEeeGrqtgh2TERg" association="_2IHXOSwWEeeGrqtgh2TERg"/> + <ownedEnd xmi:type="uml:Property" xmi:id="_2IHXOiwWEeeGrqtgh2TERg" type="_2IHXKCwWEeeGrqtgh2TERg" association="_2IHXOSwWEeeGrqtgh2TERg"/> </packagedElement> <packagedElement xmi:type="uml:Class" xmi:id="_2IHXOywWEeeGrqtgh2TERg" name="DrawerConfiguration"> - <generalization xmi:id="_2IHXPCwWEeeGrqtgh2TERg" general="_2IHXKCwWEeeGrqtgh2TERg"/> - <ownedAttribute xmi:id="_2IHXPSwWEeeGrqtgh2TERg" name="ownedConfigurations" type="_2IHXPywWEeeGrqtgh2TERg" isOrdered="true" aggregation="composite" association="_2IHXQSwWEeeGrqtgh2TERg"> + <generalization xmi:type="uml:Generalization" xmi:id="_2IHXPCwWEeeGrqtgh2TERg" general="_2IHXKCwWEeeGrqtgh2TERg"/> + <ownedAttribute xmi:type="uml:Property" xmi:id="_2IHXPSwWEeeGrqtgh2TERg" name="ownedConfigurations" type="_2IHXPywWEeeGrqtgh2TERg" isOrdered="true" aggregation="composite" association="_2IHXQSwWEeeGrqtgh2TERg"> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2IHXPiwWEeeGrqtgh2TERg" value="*"/> </ownedAttribute> </packagedElement> <packagedElement xmi:type="uml:Class" xmi:id="_2IHXPywWEeeGrqtgh2TERg" name="ChildConfiguration" isAbstract="true"> - <generalization xmi:id="_2IHXQCwWEeeGrqtgh2TERg" general="_2IHXKCwWEeeGrqtgh2TERg"/> + <generalization xmi:type="uml:Generalization" xmi:id="_2IHXQCwWEeeGrqtgh2TERg" general="_2IHXKCwWEeeGrqtgh2TERg"/> </packagedElement> <packagedElement xmi:type="uml:Association" xmi:id="_2IHXQSwWEeeGrqtgh2TERg" memberEnd="_2IHXPSwWEeeGrqtgh2TERg _2IHXQiwWEeeGrqtgh2TERg"> - <ownedEnd xmi:id="_2IHXQiwWEeeGrqtgh2TERg" type="_2IHXOywWEeeGrqtgh2TERg" association="_2IHXQSwWEeeGrqtgh2TERg"/> + <ownedEnd xmi:type="uml:Property" xmi:id="_2IHXQiwWEeeGrqtgh2TERg" type="_2IHXOywWEeeGrqtgh2TERg" association="_2IHXQSwWEeeGrqtgh2TERg"/> </packagedElement> <packagedElement xmi:type="uml:Association" xmi:id="_2IHXQywWEeeGrqtgh2TERg" memberEnd="_2IHXIywWEeeGrqtgh2TERg _2IHXRCwWEeeGrqtgh2TERg"> - <ownedEnd xmi:id="_2IHXRCwWEeeGrqtgh2TERg" type="_2IHXISwWEeeGrqtgh2TERg" association="_2IHXQywWEeeGrqtgh2TERg"/> + <ownedEnd xmi:type="uml:Property" xmi:id="_2IHXRCwWEeeGrqtgh2TERg" type="_2IHXISwWEeeGrqtgh2TERg" association="_2IHXQywWEeeGrqtgh2TERg"/> </packagedElement> <packagedElement xmi:type="uml:Class" xmi:id="_2IHXRSwWEeeGrqtgh2TERg" name="ToolConfiguration"> - <generalization xmi:id="_2IHXRiwWEeeGrqtgh2TERg" general="_2IH-MSwWEeeGrqtgh2TERg"/> - <ownedAttribute xmi:id="_2IHXRywWEeeGrqtgh2TERg" name="kind" visibility="public" type="_2IH-MywWEeeGrqtgh2TERg" isOrdered="true"> + <generalization xmi:type="uml:Generalization" xmi:id="_2IHXRiwWEeeGrqtgh2TERg" general="_2IH-MSwWEeeGrqtgh2TERg"/> + <ownedAttribute xmi:type="uml:Property" xmi:id="_2IHXRywWEeeGrqtgh2TERg" name="kind" visibility="public" type="_2IH-MywWEeeGrqtgh2TERg" isOrdered="true"> <defaultValue xmi:type="uml:InstanceValue" xmi:id="_2IHXSCwWEeeGrqtgh2TERg" type="_2IH-MywWEeeGrqtgh2TERg" instance="_2IH-NCwWEeeGrqtgh2TERg"/> </ownedAttribute> - <ownedAttribute xmi:id="_2IHXSSwWEeeGrqtgh2TERg" name="elementDescriptors" type="_2IH-NiwWEeeGrqtgh2TERg" isOrdered="true" aggregation="composite" association="_2IH-PSwWEeeGrqtgh2TERg"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_2IHXSSwWEeeGrqtgh2TERg" name="elementDescriptors" type="_2IH-NiwWEeeGrqtgh2TERg" isOrdered="true" aggregation="composite" association="_2IH-PSwWEeeGrqtgh2TERg"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2IHXSiwWEeeGrqtgh2TERg"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2IHXSywWEeeGrqtgh2TERg" value="*"/> </ownedAttribute> - <ownedAttribute xmi:id="_2IHXTCwWEeeGrqtgh2TERg" name="toolClassName" visibility="public" isOrdered="true"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_2IHXTCwWEeeGrqtgh2TERg" name="toolClassName" visibility="public" isOrdered="true"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2IH-MCwWEeeGrqtgh2TERg"/> </ownedAttribute> </packagedElement> <packagedElement xmi:type="uml:Class" xmi:id="_2IH-MSwWEeeGrqtgh2TERg" name="LeafConfiguration" isAbstract="true"> - <generalization xmi:id="_2IH-MiwWEeeGrqtgh2TERg" general="_2IHXPywWEeeGrqtgh2TERg"/> + <generalization xmi:type="uml:Generalization" xmi:id="_2IH-MiwWEeeGrqtgh2TERg" general="_2IHXPywWEeeGrqtgh2TERg"/> </packagedElement> <packagedElement xmi:type="uml:Enumeration" xmi:id="_2IH-MywWEeeGrqtgh2TERg" name="ToolKind"> - <ownedLiteral xmi:id="_2IH-NCwWEeeGrqtgh2TERg" name="CreationTool"/> - <ownedLiteral xmi:id="_2IH-NSwWEeeGrqtgh2TERg" name="ConnectionTool"/> + <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_2IH-NCwWEeeGrqtgh2TERg" name="CreationTool"/> + <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_2IH-NSwWEeeGrqtgh2TERg" name="ConnectionTool"/> </packagedElement> <packagedElement xmi:type="uml:Class" xmi:id="_2IH-NiwWEeeGrqtgh2TERg" name="ElementDescriptor"> - <ownedAttribute xmi:id="_2IH-NywWEeeGrqtgh2TERg" name="graphicalHints" visibility="public" isOrdered="true"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_2IH-NywWEeeGrqtgh2TERg" name="graphicalHints" visibility="public" isOrdered="true"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2IH-OCwWEeeGrqtgh2TERg"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2IH-OSwWEeeGrqtgh2TERg" value="*"/> </ownedAttribute> - <ownedAttribute xmi:id="_2IH-OiwWEeeGrqtgh2TERg" name="elementType" association="_2IH-OywWEeeGrqtgh2TERg"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_2IH-OiwWEeeGrqtgh2TERg" name="elementType" association="_2IH-OywWEeeGrqtgh2TERg"> <type xmi:type="uml:Class" href="platform:/plugin/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.uml#_VkhwQhLoEeeDV7UHoBIkeA"/> </ownedAttribute> </packagedElement> <packagedElement xmi:type="uml:Association" xmi:id="_2IH-OywWEeeGrqtgh2TERg" memberEnd="_2IH-OiwWEeeGrqtgh2TERg _2IH-PCwWEeeGrqtgh2TERg"> - <ownedEnd xmi:id="_2IH-PCwWEeeGrqtgh2TERg" type="_2IH-NiwWEeeGrqtgh2TERg" association="_2IH-OywWEeeGrqtgh2TERg"/> + <ownedEnd xmi:type="uml:Property" xmi:id="_2IH-PCwWEeeGrqtgh2TERg" type="_2IH-NiwWEeeGrqtgh2TERg" association="_2IH-OywWEeeGrqtgh2TERg"/> </packagedElement> <packagedElement xmi:type="uml:Association" xmi:id="_2IH-PSwWEeeGrqtgh2TERg" memberEnd="_2IHXSSwWEeeGrqtgh2TERg _2IH-PiwWEeeGrqtgh2TERg"> - <ownedEnd xmi:id="_2IH-PiwWEeeGrqtgh2TERg" type="_2IHXRSwWEeeGrqtgh2TERg" association="_2IH-PSwWEeeGrqtgh2TERg"/> + <ownedEnd xmi:type="uml:Property" xmi:id="_2IH-PiwWEeeGrqtgh2TERg" type="_2IHXRSwWEeeGrqtgh2TERg" association="_2IH-PSwWEeeGrqtgh2TERg"/> </packagedElement> <packagedElement xmi:type="uml:Class" xmi:id="_2IH-PywWEeeGrqtgh2TERg" name="StackConfiguration"> - <generalization xmi:id="_2IH-QCwWEeeGrqtgh2TERg" general="_2IHXPywWEeeGrqtgh2TERg"/> - <ownedAttribute xmi:id="_2IH-QSwWEeeGrqtgh2TERg" name="ownedConfigurations" type="_2IH-MSwWEeeGrqtgh2TERg" isOrdered="true" aggregation="composite" association="_2IH-QywWEeeGrqtgh2TERg"> + <generalization xmi:type="uml:Generalization" xmi:id="_2IH-QCwWEeeGrqtgh2TERg" general="_2IHXPywWEeeGrqtgh2TERg"/> + <ownedAttribute xmi:type="uml:Property" xmi:id="_2IH-QSwWEeeGrqtgh2TERg" name="ownedConfigurations" type="_2IH-MSwWEeeGrqtgh2TERg" isOrdered="true" aggregation="composite" association="_2IH-QywWEeeGrqtgh2TERg"> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2IH-QiwWEeeGrqtgh2TERg" value="*"/> </ownedAttribute> </packagedElement> <packagedElement xmi:type="uml:Association" xmi:id="_2IH-QywWEeeGrqtgh2TERg" memberEnd="_2IH-QSwWEeeGrqtgh2TERg _2IH-RCwWEeeGrqtgh2TERg"> - <ownedEnd xmi:id="_2IH-RCwWEeeGrqtgh2TERg" type="_2IH-PywWEeeGrqtgh2TERg" association="_2IH-QywWEeeGrqtgh2TERg"/> + <ownedEnd xmi:type="uml:Property" xmi:id="_2IH-RCwWEeeGrqtgh2TERg" type="_2IH-PywWEeeGrqtgh2TERg" association="_2IH-QywWEeeGrqtgh2TERg"/> </packagedElement> <packagedElement xmi:type="uml:Class" xmi:id="_2IH-RSwWEeeGrqtgh2TERg" name="SeparatorConfiguration"> - <generalization xmi:id="_2IH-RiwWEeeGrqtgh2TERg" general="_2IH-MSwWEeeGrqtgh2TERg"/> - </packagedElement> - <packagedElement xmi:type="uml:Association" xmi:id="_1T5I0IvlEeeGyKO2MvkxHA" visibility="public" memberEnd="_1ULcsIvlEeeGyKO2MvkxHA _1UNR4YvlEeeGyKO2MvkxHA"> - <eAnnotations xmi:id="_1UHLQIvlEeeGyKO2MvkxHA" source="org.eclipse.papyrus"> - <details xmi:id="_1UIZYIvlEeeGyKO2MvkxHA" key="nature" value="UML_Nature"/> - </eAnnotations> - <ownedEnd xmi:id="_1UNR4YvlEeeGyKO2MvkxHA" name="configuration" type="_2IHXKCwWEeeGrqtgh2TERg" association="_1T5I0IvlEeeGyKO2MvkxHA"/> + <generalization xmi:type="uml:Generalization" xmi:id="_2IH-RiwWEeeGrqtgh2TERg" general="_2IH-MSwWEeeGrqtgh2TERg"/> </packagedElement> - <profileApplication xmi:id="_2IH-RywWEeeGrqtgh2TERg"> - <eAnnotations xmi:id="_2IH-SCwWEeeGrqtgh2TERg" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_2IH-RywWEeeGrqtgh2TERg"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2IH-SCwWEeeGrqtgh2TERg" source="http://www.eclipse.org/uml2/2.0.0/UML"> <references xmi:type="ecore:EPackage" href="pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA"/> </eAnnotations> - <appliedProfile href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/> + <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/> </profileApplication> </uml:Model> <Ecore:EPackage xmi:id="_2IH-SSwWEeeGrqtgh2TERg" base_Package="_2IHXICwWEeeGrqtgh2TERg" nsPrefix="paletteconfiguration" basePackage="org.eclipse.papyrus.infra.gmfdiag"/> diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/Configuration.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/Configuration.java index f1b8d107ce1..9565c6bd7b3 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/Configuration.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/Configuration.java @@ -12,10 +12,7 @@ */ package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration; -import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.papyrus.infra.filters.Filter; +import org.eclipse.papyrus.infra.filters.FilteredElement; /** * <!-- begin-user-doc --> @@ -30,14 +27,13 @@ import org.eclipse.papyrus.infra.filters.Filter; * <li>{@link org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.Configuration#getLabel <em>Label</em>}</li> * <li>{@link org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.Configuration#getDescription <em>Description</em>}</li> * <li>{@link org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.Configuration#getIcon <em>Icon</em>}</li> - * <li>{@link org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.Configuration#getFilters <em>Filters</em>}</li> * </ul> * * @see org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage#getConfiguration() * @model abstract="true" * @generated */ -public interface Configuration extends EObject { +public interface Configuration extends FilteredElement { /** * Returns the value of the '<em><b>Id</b></em>' attribute. * <!-- begin-user-doc --> @@ -142,47 +138,4 @@ public interface Configuration extends EObject { */ void setIcon(IconDescriptor value); - /** - * Returns the value of the '<em><b>Filters</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.papyrus.infra.filters.Filter}. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Filters</em>' containment reference list isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Filters</em>' containment reference list. - * @see org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage#getConfiguration_Filters() - * @model containment="true" ordered="false" - * @generated - * @since 3.1 - */ - EList<Filter> getFilters(); - - /** - * Retrieves the first {@link org.eclipse.papyrus.infra.filters.Filter} with the specified '<em><b>Name</b></em>' from the '<em><b>Filters</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param name The '<em><b>Name</b></em>' of the {@link org.eclipse.papyrus.infra.filters.Filter} to retrieve, or <code>null</code>. - * @return The first {@link org.eclipse.papyrus.infra.filters.Filter} with the specified '<em><b>Name</b></em>', or <code>null</code>. - * @see #getFilters() - * @generated - * @since 3.1 - */ - Filter getFilters(String name); - - /** - * Retrieves the first {@link org.eclipse.papyrus.infra.filters.Filter} with the specified '<em><b>Name</b></em>' from the '<em><b>Filters</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param name The '<em><b>Name</b></em>' of the {@link org.eclipse.papyrus.infra.filters.Filter} to retrieve, or <code>null</code>. - * @param ignoreCase Whether to ignore case in {@link java.lang.String} comparisons. - * @param eClass The Ecore class of the {@link org.eclipse.papyrus.infra.filters.Filter} to retrieve, or <code>null</code>. - * @return The first {@link org.eclipse.papyrus.infra.filters.Filter} with the specified '<em><b>Name</b></em>', or <code>null</code>. - * @see #getFilters() - * @generated - * @since 3.1 - */ - Filter getFilters(String name, boolean ignoreCase, EClass eClass); - } // Configuration diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/ElementDescriptor.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/ElementDescriptor.java index 363e4fb3861..6b236645b24 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/ElementDescriptor.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/ElementDescriptor.java @@ -13,9 +13,7 @@ package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration; import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EObject; - import org.eclipse.papyrus.infra.types.ElementTypeConfiguration; /** diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/PaletteconfigurationPackage.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/PaletteconfigurationPackage.java index 14c5d22991e..25374d0abb5 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/PaletteconfigurationPackage.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/PaletteconfigurationPackage.java @@ -17,6 +17,7 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EEnum; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; +import org.eclipse.papyrus.infra.filters.FiltersPackage; /** * <!-- begin-user-doc --> @@ -77,49 +78,49 @@ public interface PaletteconfigurationPackage extends EPackage { int CONFIGURATION = 1; /** - * The feature id for the '<em><b>Id</b></em>' attribute. + * The feature id for the '<em><b>Filter</b></em>' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CONFIGURATION__ID = 0; + int CONFIGURATION__FILTER = FiltersPackage.FILTERED_ELEMENT__FILTER; /** - * The feature id for the '<em><b>Label</b></em>' attribute. + * The feature id for the '<em><b>Id</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CONFIGURATION__LABEL = 1; + int CONFIGURATION__ID = FiltersPackage.FILTERED_ELEMENT_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Description</b></em>' attribute. + * The feature id for the '<em><b>Label</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CONFIGURATION__DESCRIPTION = 2; + int CONFIGURATION__LABEL = FiltersPackage.FILTERED_ELEMENT_FEATURE_COUNT + 1; /** - * The feature id for the '<em><b>Icon</b></em>' containment reference. + * The feature id for the '<em><b>Description</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CONFIGURATION__ICON = 3; + int CONFIGURATION__DESCRIPTION = FiltersPackage.FILTERED_ELEMENT_FEATURE_COUNT + 2; /** - * The feature id for the '<em><b>Filters</b></em>' containment reference list. + * The feature id for the '<em><b>Icon</b></em>' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CONFIGURATION__FILTERS = 4; + int CONFIGURATION__ICON = FiltersPackage.FILTERED_ELEMENT_FEATURE_COUNT + 3; /** * The number of structural features of the '<em>Configuration</em>' class. @@ -128,7 +129,7 @@ public interface PaletteconfigurationPackage extends EPackage { * @generated * @ordered */ - int CONFIGURATION_FEATURE_COUNT = 5; + int CONFIGURATION_FEATURE_COUNT = FiltersPackage.FILTERED_ELEMENT_FEATURE_COUNT + 4; /** * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.impl.PaletteConfigurationImpl <em>Palette Configuration</em>}' class. @@ -141,6 +142,15 @@ public interface PaletteconfigurationPackage extends EPackage { int PALETTE_CONFIGURATION = 0; /** + * The feature id for the '<em><b>Filter</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int PALETTE_CONFIGURATION__FILTER = CONFIGURATION__FILTER; + + /** * The feature id for the '<em><b>Id</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -177,15 +187,6 @@ public interface PaletteconfigurationPackage extends EPackage { int PALETTE_CONFIGURATION__ICON = CONFIGURATION__ICON; /** - * The feature id for the '<em><b>Filters</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int PALETTE_CONFIGURATION__FILTERS = CONFIGURATION__FILTERS; - - /** * The feature id for the '<em><b>Drawer Configurations</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -260,6 +261,15 @@ public interface PaletteconfigurationPackage extends EPackage { int DRAWER_CONFIGURATION = 3; /** + * The feature id for the '<em><b>Filter</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int DRAWER_CONFIGURATION__FILTER = CONFIGURATION__FILTER; + + /** * The feature id for the '<em><b>Id</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -296,15 +306,6 @@ public interface PaletteconfigurationPackage extends EPackage { int DRAWER_CONFIGURATION__ICON = CONFIGURATION__ICON; /** - * The feature id for the '<em><b>Filters</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int DRAWER_CONFIGURATION__FILTERS = CONFIGURATION__FILTERS; - - /** * The feature id for the '<em><b>Owned Configurations</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -333,6 +334,15 @@ public interface PaletteconfigurationPackage extends EPackage { int CHILD_CONFIGURATION = 4; /** + * The feature id for the '<em><b>Filter</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CHILD_CONFIGURATION__FILTER = CONFIGURATION__FILTER; + + /** * The feature id for the '<em><b>Id</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -369,15 +379,6 @@ public interface PaletteconfigurationPackage extends EPackage { int CHILD_CONFIGURATION__ICON = CONFIGURATION__ICON; /** - * The feature id for the '<em><b>Filters</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int CHILD_CONFIGURATION__FILTERS = CONFIGURATION__FILTERS; - - /** * The number of structural features of the '<em>Child Configuration</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -397,6 +398,15 @@ public interface PaletteconfigurationPackage extends EPackage { int LEAF_CONFIGURATION = 6; /** + * The feature id for the '<em><b>Filter</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int LEAF_CONFIGURATION__FILTER = CHILD_CONFIGURATION__FILTER; + + /** * The feature id for the '<em><b>Id</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -433,15 +443,6 @@ public interface PaletteconfigurationPackage extends EPackage { int LEAF_CONFIGURATION__ICON = CHILD_CONFIGURATION__ICON; /** - * The feature id for the '<em><b>Filters</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int LEAF_CONFIGURATION__FILTERS = CHILD_CONFIGURATION__FILTERS; - - /** * The number of structural features of the '<em>Leaf Configuration</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -461,6 +462,15 @@ public interface PaletteconfigurationPackage extends EPackage { int TOOL_CONFIGURATION = 5; /** + * The feature id for the '<em><b>Filter</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int TOOL_CONFIGURATION__FILTER = LEAF_CONFIGURATION__FILTER; + + /** * The feature id for the '<em><b>Id</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -497,15 +507,6 @@ public interface PaletteconfigurationPackage extends EPackage { int TOOL_CONFIGURATION__ICON = LEAF_CONFIGURATION__ICON; /** - * The feature id for the '<em><b>Filters</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int TOOL_CONFIGURATION__FILTERS = LEAF_CONFIGURATION__FILTERS; - - /** * The feature id for the '<em><b>Kind</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -589,6 +590,15 @@ public interface PaletteconfigurationPackage extends EPackage { int STACK_CONFIGURATION = 8; /** + * The feature id for the '<em><b>Filter</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int STACK_CONFIGURATION__FILTER = CHILD_CONFIGURATION__FILTER; + + /** * The feature id for the '<em><b>Id</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -625,15 +635,6 @@ public interface PaletteconfigurationPackage extends EPackage { int STACK_CONFIGURATION__ICON = CHILD_CONFIGURATION__ICON; /** - * The feature id for the '<em><b>Filters</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int STACK_CONFIGURATION__FILTERS = CHILD_CONFIGURATION__FILTERS; - - /** * The feature id for the '<em><b>Owned Configurations</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -662,6 +663,15 @@ public interface PaletteconfigurationPackage extends EPackage { int SEPARATOR_CONFIGURATION = 9; /** + * The feature id for the '<em><b>Filter</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int SEPARATOR_CONFIGURATION__FILTER = LEAF_CONFIGURATION__FILTER; + + /** * The feature id for the '<em><b>Id</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -698,15 +708,6 @@ public interface PaletteconfigurationPackage extends EPackage { int SEPARATOR_CONFIGURATION__ICON = LEAF_CONFIGURATION__ICON; /** - * The feature id for the '<em><b>Filters</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int SEPARATOR_CONFIGURATION__FILTERS = LEAF_CONFIGURATION__FILTERS; - - /** * The number of structural features of the '<em>Separator Configuration</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -813,17 +814,6 @@ public interface PaletteconfigurationPackage extends EPackage { EReference getConfiguration_Icon(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.Configuration#getFilters <em>Filters</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the containment reference list '<em>Filters</em>'. - * @see org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.Configuration#getFilters() - * @see #getConfiguration() - * @generated - */ - EReference getConfiguration_Filters(); - - /** * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.IconDescriptor <em>Icon Descriptor</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -1103,14 +1093,6 @@ public interface PaletteconfigurationPackage extends EPackage { EReference CONFIGURATION__ICON = eINSTANCE.getConfiguration_Icon(); /** - * The meta object literal for the '<em><b>Filters</b></em>' containment reference list feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EReference CONFIGURATION__FILTERS = eINSTANCE.getConfiguration_Filters(); - - /** * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.impl.IconDescriptorImpl <em>Icon Descriptor</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/ChildConfigurationImpl.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/ChildConfigurationImpl.java index c67aa6d1ca8..a5a053a9854 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/ChildConfigurationImpl.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/ChildConfigurationImpl.java @@ -13,7 +13,6 @@ package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.impl; import org.eclipse.emf.ecore.EClass; - import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.ChildConfiguration; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage; diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/ConfigurationImpl.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/ConfigurationImpl.java index 79974042170..f99469f6c17 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/ConfigurationImpl.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/ConfigurationImpl.java @@ -12,20 +12,12 @@ */ package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.impl; -import java.util.Collection; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - -import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.EObjectImpl; - -import org.eclipse.emf.ecore.util.EObjectContainmentEList; -import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.papyrus.infra.filters.Filter; +import org.eclipse.papyrus.infra.filters.impl.FilteredElementImpl; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.Configuration; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.IconDescriptor; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage; @@ -42,12 +34,11 @@ import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.Paletteconfigurati * <li>{@link org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.impl.ConfigurationImpl#getLabel <em>Label</em>}</li> * <li>{@link org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.impl.ConfigurationImpl#getDescription <em>Description</em>}</li> * <li>{@link org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.impl.ConfigurationImpl#getIcon <em>Icon</em>}</li> - * <li>{@link org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.impl.ConfigurationImpl#getFilters <em>Filters</em>}</li> * </ul> * * @generated */ -public abstract class ConfigurationImpl extends EObjectImpl implements Configuration { +public abstract class ConfigurationImpl extends FilteredElementImpl implements Configuration { /** * The default value of the '{@link #getId() <em>Id</em>}' attribute. * <!-- begin-user-doc --> @@ -119,17 +110,6 @@ public abstract class ConfigurationImpl extends EObjectImpl implements Configura protected IconDescriptor icon; /** - * The cached value of the '{@link #getFilters() <em>Filters</em>}' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getFilters() - * @generated - * @ordered - * @since 3.1 - */ - protected EList<Filter> filters; - - /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -259,50 +239,11 @@ public abstract class ConfigurationImpl extends EObjectImpl implements Configura * <!-- end-user-doc --> * @generated */ - public EList<Filter> getFilters() { - if (filters == null) { - filters = new EObjectContainmentEList<Filter>(Filter.class, this, PaletteconfigurationPackage.CONFIGURATION__FILTERS); - } - return filters; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public Filter getFilters(String name) { - return getFilters(name, false, null); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public Filter getFilters(String name, boolean ignoreCase, EClass eClass) { - filtersLoop: for (Filter filters : getFilters()) { - if (eClass != null && !eClass.isInstance(filters)) - continue filtersLoop; - if (name != null && !(ignoreCase ? name.equalsIgnoreCase(filters.getName()) : name.equals(filters.getName()))) - continue filtersLoop; - return filters; - } - return null; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ @Override public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { switch (featureID) { case PaletteconfigurationPackage.CONFIGURATION__ICON: return basicSetIcon(null, msgs); - case PaletteconfigurationPackage.CONFIGURATION__FILTERS: - return ((InternalEList<?>)getFilters()).basicRemove(otherEnd, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -323,8 +264,6 @@ public abstract class ConfigurationImpl extends EObjectImpl implements Configura return getDescription(); case PaletteconfigurationPackage.CONFIGURATION__ICON: return getIcon(); - case PaletteconfigurationPackage.CONFIGURATION__FILTERS: - return getFilters(); } return super.eGet(featureID, resolve, coreType); } @@ -334,7 +273,6 @@ public abstract class ConfigurationImpl extends EObjectImpl implements Configura * <!-- end-user-doc --> * @generated */ - @SuppressWarnings("unchecked") @Override public void eSet(int featureID, Object newValue) { switch (featureID) { @@ -350,10 +288,6 @@ public abstract class ConfigurationImpl extends EObjectImpl implements Configura case PaletteconfigurationPackage.CONFIGURATION__ICON: setIcon((IconDescriptor)newValue); return; - case PaletteconfigurationPackage.CONFIGURATION__FILTERS: - getFilters().clear(); - getFilters().addAll((Collection<? extends Filter>)newValue); - return; } super.eSet(featureID, newValue); } @@ -378,9 +312,6 @@ public abstract class ConfigurationImpl extends EObjectImpl implements Configura case PaletteconfigurationPackage.CONFIGURATION__ICON: setIcon((IconDescriptor)null); return; - case PaletteconfigurationPackage.CONFIGURATION__FILTERS: - getFilters().clear(); - return; } super.eUnset(featureID); } @@ -401,8 +332,6 @@ public abstract class ConfigurationImpl extends EObjectImpl implements Configura return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description); case PaletteconfigurationPackage.CONFIGURATION__ICON: return icon != null; - case PaletteconfigurationPackage.CONFIGURATION__FILTERS: - return filters != null && !filters.isEmpty(); } return super.eIsSet(featureID); } diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/DrawerConfigurationImpl.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/DrawerConfigurationImpl.java index 0b0ee3f4718..2df5b61306c 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/DrawerConfigurationImpl.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/DrawerConfigurationImpl.java @@ -15,15 +15,11 @@ package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.impl; import java.util.Collection; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; - import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.ChildConfiguration; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.DrawerConfiguration; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage; diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/ElementDescriptorImpl.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/ElementDescriptorImpl.java index a89b1e94d77..2912cd18874 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/ElementDescriptorImpl.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/ElementDescriptorImpl.java @@ -15,20 +15,14 @@ package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.impl; import java.util.Collection; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.EObjectImpl; - import org.eclipse.emf.ecore.util.EDataTypeUniqueEList; - import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.ElementDescriptor; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage; - import org.eclipse.papyrus.infra.types.ElementTypeConfiguration; /** diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/IconDescriptorImpl.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/IconDescriptorImpl.java index cd1c8286e5e..823224ec1d9 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/IconDescriptorImpl.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/IconDescriptorImpl.java @@ -13,12 +13,9 @@ package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.impl; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EClass; - import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.EObjectImpl; - import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.IconDescriptor; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage; diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/LeafConfigurationImpl.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/LeafConfigurationImpl.java index 4233bc9d43d..3c77111ac8b 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/LeafConfigurationImpl.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/LeafConfigurationImpl.java @@ -13,7 +13,6 @@ package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.impl; import org.eclipse.emf.ecore.EClass; - import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.LeafConfiguration; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage; diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/PaletteConfigurationImpl.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/PaletteConfigurationImpl.java index 7d4db0b67e7..234226bdedd 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/PaletteConfigurationImpl.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/PaletteConfigurationImpl.java @@ -15,16 +15,12 @@ package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.impl; import java.util.Collection; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.util.EDataTypeUniqueEList; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; - import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.DrawerConfiguration; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteConfiguration; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage; diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/PaletteconfigurationFactoryImpl.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/PaletteconfigurationFactoryImpl.java index 31f81076989..910d8f988de 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/PaletteconfigurationFactoryImpl.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/PaletteconfigurationFactoryImpl.java @@ -16,12 +16,18 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; - import org.eclipse.emf.ecore.impl.EFactoryImpl; - import org.eclipse.emf.ecore.plugin.EcorePlugin; - -import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.*; +import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.DrawerConfiguration; +import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.ElementDescriptor; +import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.IconDescriptor; +import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteConfiguration; +import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationFactory; +import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage; +import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.SeparatorConfiguration; +import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.StackConfiguration; +import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.ToolConfiguration; +import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.ToolKind; /** * <!-- begin-user-doc --> diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/PaletteconfigurationPackageImpl.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/PaletteconfigurationPackageImpl.java index 745ceb0cc77..21b183f82e0 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/PaletteconfigurationPackageImpl.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/PaletteconfigurationPackageImpl.java @@ -18,9 +18,7 @@ import org.eclipse.emf.ecore.EEnum; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.EcorePackage; - import org.eclipse.emf.ecore.impl.EPackageImpl; - import org.eclipse.papyrus.infra.filters.FiltersPackage; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.ChildConfiguration; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.Configuration; @@ -35,7 +33,6 @@ import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.SeparatorConfigura import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.StackConfiguration; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.ToolConfiguration; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.ToolKind; - import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage; import org.eclipse.uml2.types.TypesPackage; @@ -171,8 +168,8 @@ public class PaletteconfigurationPackageImpl extends EPackageImpl implements Pal // Initialize simple dependencies EcorePackage.eINSTANCE.eClass(); - FiltersPackage.eINSTANCE.eClass(); ElementTypesConfigurationsPackage.eINSTANCE.eClass(); + FiltersPackage.eINSTANCE.eClass(); TypesPackage.eINSTANCE.eClass(); // Create package meta-data objects @@ -267,15 +264,6 @@ public class PaletteconfigurationPackageImpl extends EPackageImpl implements Pal * <!-- end-user-doc --> * @generated */ - public EReference getConfiguration_Filters() { - return (EReference)configurationEClass.getEStructuralFeatures().get(4); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ public EClass getIconDescriptor() { return iconDescriptorEClass; } @@ -470,7 +458,6 @@ public class PaletteconfigurationPackageImpl extends EPackageImpl implements Pal createEAttribute(configurationEClass, CONFIGURATION__LABEL); createEAttribute(configurationEClass, CONFIGURATION__DESCRIPTION); createEReference(configurationEClass, CONFIGURATION__ICON); - createEReference(configurationEClass, CONFIGURATION__FILTERS); iconDescriptorEClass = createEClass(ICON_DESCRIPTOR); createEAttribute(iconDescriptorEClass, ICON_DESCRIPTOR__PLUGIN_ID); @@ -534,6 +521,7 @@ public class PaletteconfigurationPackageImpl extends EPackageImpl implements Pal // Add supertypes to classes paletteConfigurationEClass.getESuperTypes().add(this.getConfiguration()); + configurationEClass.getESuperTypes().add(theFiltersPackage.getFilteredElement()); drawerConfigurationEClass.getESuperTypes().add(this.getConfiguration()); childConfigurationEClass.getESuperTypes().add(this.getConfiguration()); toolConfigurationEClass.getESuperTypes().add(this.getLeafConfiguration()); @@ -551,7 +539,6 @@ public class PaletteconfigurationPackageImpl extends EPackageImpl implements Pal initEAttribute(getConfiguration_Label(), ecorePackage.getEString(), "label", null, 1, 1, Configuration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getConfiguration_Description(), ecorePackage.getEString(), "description", null, 0, 1, Configuration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getConfiguration_Icon(), this.getIconDescriptor(), null, "icon", null, 0, 1, Configuration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getConfiguration_Filters(), theFiltersPackage.getFilter(), null, "filters", null, 0, -1, Configuration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); initEClass(iconDescriptorEClass, IconDescriptor.class, "IconDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getIconDescriptor_PluginID(), ecorePackage.getEString(), "pluginID", null, 0, 1, IconDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/SeparatorConfigurationImpl.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/SeparatorConfigurationImpl.java index a6ec5b724a3..7c825506148 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/SeparatorConfigurationImpl.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/SeparatorConfigurationImpl.java @@ -13,7 +13,6 @@ package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.impl; import org.eclipse.emf.ecore.EClass; - import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.SeparatorConfiguration; diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/StackConfigurationImpl.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/StackConfigurationImpl.java index 6e4deee2608..f7ec51653a7 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/StackConfigurationImpl.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/StackConfigurationImpl.java @@ -15,15 +15,11 @@ package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.impl; import java.util.Collection; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; - import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.LeafConfiguration; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.StackConfiguration; diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/ToolConfigurationImpl.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/ToolConfigurationImpl.java index df2dc25a8ed..b190d45ac7f 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/ToolConfigurationImpl.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/impl/ToolConfigurationImpl.java @@ -16,17 +16,12 @@ import java.util.Collection; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; - import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.ElementDescriptor; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.ToolConfiguration; diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/util/PaletteconfigurationAdapterFactory.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/util/PaletteconfigurationAdapterFactory.java index 658ee6dce38..9c6c55fc0b7 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/util/PaletteconfigurationAdapterFactory.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/util/PaletteconfigurationAdapterFactory.java @@ -14,12 +14,20 @@ package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.util; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; - import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; - import org.eclipse.emf.ecore.EObject; - -import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.*; +import org.eclipse.papyrus.infra.filters.FilteredElement; +import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.ChildConfiguration; +import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.Configuration; +import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.DrawerConfiguration; +import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.ElementDescriptor; +import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.IconDescriptor; +import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.LeafConfiguration; +import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteConfiguration; +import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage; +import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.SeparatorConfiguration; +import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.StackConfiguration; +import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.ToolConfiguration; /** * <!-- begin-user-doc --> @@ -118,6 +126,10 @@ public class PaletteconfigurationAdapterFactory extends AdapterFactoryImpl { return createSeparatorConfigurationAdapter(); } @Override + public Adapter caseFilteredElement(FilteredElement object) { + return createFilteredElementAdapter(); + } + @Override public Adapter defaultCase(EObject object) { return createEObjectAdapter(); } @@ -278,6 +290,20 @@ public class PaletteconfigurationAdapterFactory extends AdapterFactoryImpl { } /** + * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.filters.FilteredElement <em>Filtered Element</em>}'. + * <!-- begin-user-doc --> + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * <!-- end-user-doc --> + * @return the new adapter. + * @see org.eclipse.papyrus.infra.filters.FilteredElement + * @generated + */ + public Adapter createFilteredElementAdapter() { + return null; + } + + /** * Creates a new adapter for the default case. * <!-- begin-user-doc --> * This default implementation returns null. diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/util/PaletteconfigurationResourceFactoryImpl.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/util/PaletteconfigurationResourceFactoryImpl.java index f5e70fcca00..fc73af7ea12 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/util/PaletteconfigurationResourceFactoryImpl.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/util/PaletteconfigurationResourceFactoryImpl.java @@ -13,11 +13,8 @@ package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.util; import org.eclipse.emf.common.util.URI; - import org.eclipse.emf.ecore.resource.Resource; - import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl; - import org.eclipse.emf.ecore.xmi.XMLResource; /** diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/util/PaletteconfigurationResourceImpl.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/util/PaletteconfigurationResourceImpl.java index 411525ab74f..55a9aed9892 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/util/PaletteconfigurationResourceImpl.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/util/PaletteconfigurationResourceImpl.java @@ -13,7 +13,6 @@ package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.util; import org.eclipse.emf.common.util.URI; - import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl; /** diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/util/PaletteconfigurationSwitch.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/util/PaletteconfigurationSwitch.java index 28b627d5152..39e2f085468 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/util/PaletteconfigurationSwitch.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src-gen/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/util/PaletteconfigurationSwitch.java @@ -14,10 +14,19 @@ package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.util; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; - import org.eclipse.emf.ecore.util.Switch; - -import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.*; +import org.eclipse.papyrus.infra.filters.FilteredElement; +import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.ChildConfiguration; +import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.Configuration; +import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.DrawerConfiguration; +import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.ElementDescriptor; +import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.IconDescriptor; +import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.LeafConfiguration; +import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteConfiguration; +import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage; +import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.SeparatorConfiguration; +import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.StackConfiguration; +import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.ToolConfiguration; /** * <!-- begin-user-doc --> @@ -80,12 +89,14 @@ public class PaletteconfigurationSwitch<T> extends Switch<T> { PaletteConfiguration paletteConfiguration = (PaletteConfiguration)theEObject; T result = casePaletteConfiguration(paletteConfiguration); if (result == null) result = caseConfiguration(paletteConfiguration); + if (result == null) result = caseFilteredElement(paletteConfiguration); if (result == null) result = defaultCase(theEObject); return result; } case PaletteconfigurationPackage.CONFIGURATION: { Configuration configuration = (Configuration)theEObject; T result = caseConfiguration(configuration); + if (result == null) result = caseFilteredElement(configuration); if (result == null) result = defaultCase(theEObject); return result; } @@ -99,6 +110,7 @@ public class PaletteconfigurationSwitch<T> extends Switch<T> { DrawerConfiguration drawerConfiguration = (DrawerConfiguration)theEObject; T result = caseDrawerConfiguration(drawerConfiguration); if (result == null) result = caseConfiguration(drawerConfiguration); + if (result == null) result = caseFilteredElement(drawerConfiguration); if (result == null) result = defaultCase(theEObject); return result; } @@ -106,6 +118,7 @@ public class PaletteconfigurationSwitch<T> extends Switch<T> { ChildConfiguration childConfiguration = (ChildConfiguration)theEObject; T result = caseChildConfiguration(childConfiguration); if (result == null) result = caseConfiguration(childConfiguration); + if (result == null) result = caseFilteredElement(childConfiguration); if (result == null) result = defaultCase(theEObject); return result; } @@ -115,6 +128,7 @@ public class PaletteconfigurationSwitch<T> extends Switch<T> { if (result == null) result = caseLeafConfiguration(toolConfiguration); if (result == null) result = caseChildConfiguration(toolConfiguration); if (result == null) result = caseConfiguration(toolConfiguration); + if (result == null) result = caseFilteredElement(toolConfiguration); if (result == null) result = defaultCase(theEObject); return result; } @@ -123,6 +137,7 @@ public class PaletteconfigurationSwitch<T> extends Switch<T> { T result = caseLeafConfiguration(leafConfiguration); if (result == null) result = caseChildConfiguration(leafConfiguration); if (result == null) result = caseConfiguration(leafConfiguration); + if (result == null) result = caseFilteredElement(leafConfiguration); if (result == null) result = defaultCase(theEObject); return result; } @@ -137,6 +152,7 @@ public class PaletteconfigurationSwitch<T> extends Switch<T> { T result = caseStackConfiguration(stackConfiguration); if (result == null) result = caseChildConfiguration(stackConfiguration); if (result == null) result = caseConfiguration(stackConfiguration); + if (result == null) result = caseFilteredElement(stackConfiguration); if (result == null) result = defaultCase(theEObject); return result; } @@ -146,6 +162,7 @@ public class PaletteconfigurationSwitch<T> extends Switch<T> { if (result == null) result = caseLeafConfiguration(separatorConfiguration); if (result == null) result = caseChildConfiguration(separatorConfiguration); if (result == null) result = caseConfiguration(separatorConfiguration); + if (result == null) result = caseFilteredElement(separatorConfiguration); if (result == null) result = defaultCase(theEObject); return result; } @@ -304,6 +321,21 @@ public class PaletteconfigurationSwitch<T> extends Switch<T> { } /** + * Returns the result of interpreting the object as an instance of '<em>Filtered Element</em>'. + * <!-- begin-user-doc --> + * This implementation returns null; + * returning a non-null result will terminate the switch. + * <!-- end-user-doc --> + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of '<em>Filtered Element</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseFilteredElement(FilteredElement object) { + return null; + } + + /** * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. * <!-- begin-user-doc --> * This implementation returns null; diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ElementTypeSetConfigurationContentProvider.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ElementTypeSetConfigurationContentProvider.java index 65de6edcc3c..9a107b6cd38 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ElementTypeSetConfigurationContentProvider.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ElementTypeSetConfigurationContentProvider.java @@ -7,7 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation
+ * Micka�l ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation
*****************************************************************************/
package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider;
@@ -37,11 +37,11 @@ public class ElementTypeSetConfigurationContentProvider implements IStaticConten public Object[] getElements(final Object inputElement) {
List<ElementTypeSetConfiguration> els = new ArrayList<ElementTypeSetConfiguration>();
Collection<Map<String, ElementTypeSetConfiguration>> values = ElementTypeSetConfigurationRegistry.getInstance().getElementTypeSetConfigurations().values();
- for (Iterator iterator = values.iterator(); iterator.hasNext();) {
- Map<String, ElementTypeSetConfiguration> map = (Map<String, ElementTypeSetConfiguration>) iterator.next();
+ for (Iterator<Map<String, ElementTypeSetConfiguration>> iterator = values.iterator(); iterator.hasNext();) {
+ Map<String, ElementTypeSetConfiguration> map = iterator.next();
Collection<ElementTypeSetConfiguration> values2 = map.values();
- for (Iterator iterator2 = values2.iterator(); iterator2.hasNext();) {
- ElementTypeSetConfiguration elementTypeSetConfiguration = (ElementTypeSetConfiguration) iterator2.next();
+ for (Iterator<ElementTypeSetConfiguration> iterator2 = values2.iterator(); iterator2.hasNext();) {
+ ElementTypeSetConfiguration elementTypeSetConfiguration = iterator2.next();
if (!elementTypeSetConfiguration.getElementTypeConfigurations().isEmpty()) {
els.add(elementTypeSetConfiguration);
}
diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ExtendedConnectionToolEntry.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ExtendedConnectionToolEntry.java index ee0f399f774..c474b997820 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ExtendedConnectionToolEntry.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ExtendedConnectionToolEntry.java @@ -9,7 +9,7 @@ *
* Contributors:
* Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- * Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 512110
+ * Micka�l ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 512110
*****************************************************************************/
package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider;
@@ -27,6 +27,7 @@ import org.eclipse.papyrus.infra.types.ElementTypeConfiguration; /**
* Extended connection Tool Entry
*/
+@SuppressWarnings("restriction")
public class ExtendedConnectionToolEntry extends PaletteToolEntry implements IElementTypesBasedTool, IClassBasedTool {
/** list of element types created by this tool */
diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ExtendedCreationToolEntry.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ExtendedCreationToolEntry.java index 7a67d6d32a1..712baeaac69 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ExtendedCreationToolEntry.java +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ExtendedCreationToolEntry.java @@ -28,6 +28,7 @@ import org.eclipse.papyrus.infra.types.ElementTypeConfiguration; /**
* Extended version of the {@link CombinedTemplateCreationEntry}.
*/
+@SuppressWarnings("restriction")
public class ExtendedCreationToolEntry extends PaletteToolEntry implements IElementTypesBasedTool, IClassBasedTool {
/** list of element types created by this tool */
diff --git a/plugins/uml/org.eclipse.papyrus.uml.filters.edit/src-gen/org/eclipse/papyrus/uml/filters/provider/ProfileAppliedItemProvider.java b/plugins/uml/org.eclipse.papyrus.uml.filters.edit/src-gen/org/eclipse/papyrus/uml/filters/provider/ProfileAppliedItemProvider.java index 54c2b62544b..f63cbe3c82a 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.filters.edit/src-gen/org/eclipse/papyrus/uml/filters/provider/ProfileAppliedItemProvider.java +++ b/plugins/uml/org.eclipse.papyrus.uml.filters.edit/src-gen/org/eclipse/papyrus/uml/filters/provider/ProfileAppliedItemProvider.java @@ -66,8 +66,7 @@ public class ProfileAppliedItemProvider extends ItemProviderAdapter implements I */ @Override public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) - { + if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); addNamePropertyDescriptor(object); @@ -85,19 +84,17 @@ public class ProfileAppliedItemProvider extends ItemProviderAdapter implements I * @generated */ protected void addNamePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Filter_name_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_Filter_name_feature", "_UI_Filter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - FiltersPackage.Literals.FILTER__NAME, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Filter_name_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_Filter_name_feature", "_UI_Filter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + FiltersPackage.Literals.FILTER__NAME, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); } /** @@ -108,19 +105,17 @@ public class ProfileAppliedItemProvider extends ItemProviderAdapter implements I * @generated */ protected void addProfileQualifiedNamePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ProfileApplied_profileQualifiedName_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ProfileApplied_profileQualifiedName_feature", "_UI_ProfileApplied_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - UMLFiltersPackage.Literals.PROFILE_APPLIED__PROFILE_QUALIFIED_NAME, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_ProfileApplied_profileQualifiedName_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_ProfileApplied_profileQualifiedName_feature", "_UI_ProfileApplied_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + UMLFiltersPackage.Literals.PROFILE_APPLIED__PROFILE_QUALIFIED_NAME, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); } /** @@ -130,21 +125,18 @@ public class ProfileAppliedItemProvider extends ItemProviderAdapter implements I * * @generated */ - protected void addProfileURIPropertyDescriptor(Object object) - { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ProfileApplied_profileURI_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ProfileApplied_profileURI_feature", "_UI_ProfileApplied_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - UMLFiltersPackage.Literals.PROFILE_APPLIED__PROFILE_URI, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); + protected void addProfileURIPropertyDescriptor(Object object) { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_ProfileApplied_profileURI_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_ProfileApplied_profileURI_feature", "_UI_ProfileApplied_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + UMLFiltersPackage.Literals.PROFILE_APPLIED__PROFILE_URI, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); } /** @@ -180,8 +172,7 @@ public class ProfileAppliedItemProvider extends ItemProviderAdapter implements I @Override public String getText(Object object) { String label = ((ProfileApplied) object).getName(); - return label == null || label.length() == 0 ? - getString("_UI_ProfileApplied_type") : //$NON-NLS-1$ + return label == null || label.length() == 0 ? getString("_UI_ProfileApplied_type") : //$NON-NLS-1$ getString("_UI_ProfileApplied_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ } @@ -198,8 +189,7 @@ public class ProfileAppliedItemProvider extends ItemProviderAdapter implements I public void notifyChanged(Notification notification) { updateChildren(notification); - switch (notification.getFeatureID(ProfileApplied.class)) - { + switch (notification.getFeatureID(ProfileApplied.class)) { case UMLFiltersPackage.PROFILE_APPLIED__NAME: case UMLFiltersPackage.PROFILE_APPLIED__PROFILE_QUALIFIED_NAME: case UMLFiltersPackage.PROFILE_APPLIED__PROFILE_URI: diff --git a/plugins/uml/org.eclipse.papyrus.uml.filters.edit/src-gen/org/eclipse/papyrus/uml/filters/provider/UMLFiltersEditPlugin.java b/plugins/uml/org.eclipse.papyrus.uml.filters.edit/src-gen/org/eclipse/papyrus/uml/filters/provider/UMLFiltersEditPlugin.java index 06264e07c8e..3f97991acbe 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.filters.edit/src-gen/org/eclipse/papyrus/uml/filters/provider/UMLFiltersEditPlugin.java +++ b/plugins/uml/org.eclipse.papyrus.uml.filters.edit/src-gen/org/eclipse/papyrus/uml/filters/provider/UMLFiltersEditPlugin.java @@ -56,8 +56,7 @@ public final class UMLFiltersEditPlugin extends EMFPlugin { * @generated */ public UMLFiltersEditPlugin() { - super(new ResourceLocator[] - { + super(new ResourceLocator[] { EcoreEditPlugin.INSTANCE, FiltersEditPlugin.INSTANCE, UMLEditPlugin.INSTANCE, diff --git a/plugins/uml/org.eclipse.papyrus.uml.filters.edit/src-gen/org/eclipse/papyrus/uml/filters/provider/UMLFiltersItemProviderAdapterFactory.java b/plugins/uml/org.eclipse.papyrus.uml.filters.edit/src-gen/org/eclipse/papyrus/uml/filters/provider/UMLFiltersItemProviderAdapterFactory.java index 170c4dda40c..40bb81031a7 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.filters.edit/src-gen/org/eclipse/papyrus/uml/filters/provider/UMLFiltersItemProviderAdapterFactory.java +++ b/plugins/uml/org.eclipse.papyrus.uml.filters.edit/src-gen/org/eclipse/papyrus/uml/filters/provider/UMLFiltersItemProviderAdapterFactory.java @@ -42,6 +42,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.papyrus.infra.filters.CompoundFilter; +import org.eclipse.papyrus.infra.filters.FilteredElement; import org.eclipse.papyrus.infra.filters.FiltersPackage; import org.eclipse.papyrus.infra.filters.util.FiltersSwitch; @@ -97,7 +98,7 @@ public class UMLFiltersItemProviderAdapterFactory extends UMLFiltersAdapterFacto * * @generated */ - protected Collection<Object> supportedTypes = new ArrayList<Object>(); + protected Collection<Object> supportedTypes = new ArrayList<>(); /** * This constructs an instance. @@ -132,8 +133,7 @@ public class UMLFiltersItemProviderAdapterFactory extends UMLFiltersAdapterFacto */ @Override public Adapter createProfileAppliedAdapter() { - if (profileAppliedItemProvider == null) - { + if (profileAppliedItemProvider == null) { profileAppliedItemProvider = new ProfileAppliedItemProvider(this); } @@ -195,11 +195,9 @@ public class UMLFiltersItemProviderAdapterFactory extends UMLFiltersAdapterFacto */ @Override public Object adapt(Object object, Object type) { - if (isFactoryForType(type)) - { + if (isFactoryForType(type)) { Object adapter = super.adapt(object, type); - if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) - { + if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) { return adapter; } } @@ -274,8 +272,7 @@ public class UMLFiltersItemProviderAdapterFactory extends UMLFiltersAdapterFacto public void fireNotifyChanged(Notification notification) { changeNotifier.fireNotifyChanged(notification); - if (parentAdapterFactory != null) - { + if (parentAdapterFactory != null) { parentAdapterFactory.fireNotifyChanged(notification); } } @@ -350,10 +347,22 @@ public class UMLFiltersItemProviderAdapterFactory extends UMLFiltersAdapterFacto */ @Override public Object caseCompoundFilter(CompoundFilter object) { - newChildDescriptors.add - (createChildParameter - (FiltersPackage.Literals.COMPOUND_FILTER__OWNED_FILTER, - UMLFiltersFactory.eINSTANCE.createProfileApplied())); + newChildDescriptors.add(createChildParameter(FiltersPackage.Literals.COMPOUND_FILTER__OWNED_FILTER, + UMLFiltersFactory.eINSTANCE.createProfileApplied())); + + return null; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + public Object caseFilteredElement(FilteredElement object) { + newChildDescriptors.add(createChildParameter(FiltersPackage.Literals.FILTERED_ELEMENT__FILTER, + UMLFiltersFactory.eINSTANCE.createProfileApplied())); return null; } @@ -378,7 +387,7 @@ public class UMLFiltersItemProviderAdapterFactory extends UMLFiltersAdapterFacto */ @Override public Collection<Object> getNewChildDescriptors(Object object, EditingDomain editingDomain) { - ArrayList<Object> result = new ArrayList<Object>(); + ArrayList<Object> result = new ArrayList<>(); new CreationSwitch(result, editingDomain).doSwitch((EObject) object); return result; } diff --git a/plugins/uml/org.eclipse.papyrus.uml.filters/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.filters/META-INF/MANIFEST.MF index 509113a60ce..78b57da817c 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.filters/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.filters/META-INF/MANIFEST.MF @@ -1,5 +1,6 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, +Require-Bundle: org.eclipse.core.runtime, + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, org.eclipse.papyrus.infra.filters;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)";visibility:=reexport, diff --git a/plugins/uml/org.eclipse.papyrus.uml.filters/src-gen/org/eclipse/papyrus/uml/filters/ProfileApplied.java b/plugins/uml/org.eclipse.papyrus.uml.filters/src-gen/org/eclipse/papyrus/uml/filters/ProfileApplied.java index d4b2ca574ea..809f769b931 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.filters/src-gen/org/eclipse/papyrus/uml/filters/ProfileApplied.java +++ b/plugins/uml/org.eclipse.papyrus.uml.filters/src-gen/org/eclipse/papyrus/uml/filters/ProfileApplied.java @@ -21,18 +21,17 @@ import org.eclipse.uml2.uml.Profile; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.papyrus.uml.filters.ProfileApplied#getProfileQualifiedName <em>Profile Qualified Name</em>}</li> * <li>{@link org.eclipse.papyrus.uml.filters.ProfileApplied#getProfileURI <em>Profile URI</em>}</li> * </ul> - * </p> * * @see org.eclipse.papyrus.uml.filters.UMLFiltersPackage#getProfileApplied() * @model * @generated */ -public interface ProfileApplied extends Filter -{ +public interface ProfileApplied extends Filter { /** * Returns the value of the '<em><b>Profile Qualified Name</b></em>' attribute. * <!-- begin-user-doc --> diff --git a/plugins/uml/org.eclipse.papyrus.uml.filters/src-gen/org/eclipse/papyrus/uml/filters/UMLFiltersFactory.java b/plugins/uml/org.eclipse.papyrus.uml.filters/src-gen/org/eclipse/papyrus/uml/filters/UMLFiltersFactory.java index ff465613a22..82883e03e23 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.filters/src-gen/org/eclipse/papyrus/uml/filters/UMLFiltersFactory.java +++ b/plugins/uml/org.eclipse.papyrus.uml.filters/src-gen/org/eclipse/papyrus/uml/filters/UMLFiltersFactory.java @@ -22,8 +22,7 @@ import org.eclipse.emf.ecore.EFactory; * @see org.eclipse.papyrus.uml.filters.UMLFiltersPackage * @generated */ -public interface UMLFiltersFactory extends EFactory -{ +public interface UMLFiltersFactory extends EFactory { /** * The singleton instance of the factory. * <!-- begin-user-doc --> diff --git a/plugins/uml/org.eclipse.papyrus.uml.filters/src-gen/org/eclipse/papyrus/uml/filters/UMLFiltersPackage.java b/plugins/uml/org.eclipse.papyrus.uml.filters/src-gen/org/eclipse/papyrus/uml/filters/UMLFiltersPackage.java index 48522ba4f7b..6156fe235c3 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.filters/src-gen/org/eclipse/papyrus/uml/filters/UMLFiltersPackage.java +++ b/plugins/uml/org.eclipse.papyrus.uml.filters/src-gen/org/eclipse/papyrus/uml/filters/UMLFiltersPackage.java @@ -35,8 +35,7 @@ import org.eclipse.papyrus.infra.filters.FiltersPackage; * annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='umlfilters'" * @generated */ -public interface UMLFiltersPackage extends EPackage -{ +public interface UMLFiltersPackage extends EPackage { /** * The package name. * <!-- begin-user-doc --> @@ -225,8 +224,7 @@ public interface UMLFiltersPackage extends EPackage * * @generated */ - interface Literals - { + interface Literals { /** * The meta object literal for the '{@link org.eclipse.papyrus.uml.filters.impl.ProfileAppliedImpl <em>Profile Applied</em>}' class. * <!-- begin-user-doc --> diff --git a/plugins/uml/org.eclipse.papyrus.uml.filters/src-gen/org/eclipse/papyrus/uml/filters/impl/ProfileAppliedImpl.java b/plugins/uml/org.eclipse.papyrus.uml.filters/src-gen/org/eclipse/papyrus/uml/filters/impl/ProfileAppliedImpl.java index 28e554726cc..03b91d5e6f4 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.filters/src-gen/org/eclipse/papyrus/uml/filters/impl/ProfileAppliedImpl.java +++ b/plugins/uml/org.eclipse.papyrus.uml.filters/src-gen/org/eclipse/papyrus/uml/filters/impl/ProfileAppliedImpl.java @@ -30,17 +30,16 @@ import org.eclipse.uml2.uml.Profile; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.papyrus.uml.filters.impl.ProfileAppliedImpl#getName <em>Name</em>}</li> * <li>{@link org.eclipse.papyrus.uml.filters.impl.ProfileAppliedImpl#getProfileQualifiedName <em>Profile Qualified Name</em>}</li> * <li>{@link org.eclipse.papyrus.uml.filters.impl.ProfileAppliedImpl#getProfileURI <em>Profile URI</em>}</li> * </ul> - * </p> * * @generated */ -public class ProfileAppliedImpl extends MinimalEObjectImpl.Container implements ProfileApplied -{ +public class ProfileAppliedImpl extends MinimalEObjectImpl.Container implements ProfileApplied { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. * <!-- begin-user-doc --> @@ -113,8 +112,7 @@ public class ProfileAppliedImpl extends MinimalEObjectImpl.Container implements * * @generated */ - protected ProfileAppliedImpl() - { + protected ProfileAppliedImpl() { super(); } @@ -125,8 +123,7 @@ public class ProfileAppliedImpl extends MinimalEObjectImpl.Container implements * @generated */ @Override - protected EClass eStaticClass() - { + protected EClass eStaticClass() { return UMLFiltersPackage.Literals.PROFILE_APPLIED; } @@ -137,8 +134,7 @@ public class ProfileAppliedImpl extends MinimalEObjectImpl.Container implements * @generated */ @Override - public String getName() - { + public String getName() { return name; } @@ -149,8 +145,7 @@ public class ProfileAppliedImpl extends MinimalEObjectImpl.Container implements * @generated */ @Override - public void setName(String newName) - { + public void setName(String newName) { newName = newName == null ? NAME_EDEFAULT : newName; String oldName = name; name = newName; @@ -166,8 +161,7 @@ public class ProfileAppliedImpl extends MinimalEObjectImpl.Container implements * @generated */ @Override - public String getProfileQualifiedName() - { + public String getProfileQualifiedName() { return profileQualifiedName; } @@ -178,8 +172,7 @@ public class ProfileAppliedImpl extends MinimalEObjectImpl.Container implements * @generated */ @Override - public void setProfileQualifiedName(String newProfileQualifiedName) - { + public void setProfileQualifiedName(String newProfileQualifiedName) { newProfileQualifiedName = newProfileQualifiedName == null ? PROFILE_QUALIFIED_NAME_EDEFAULT : newProfileQualifiedName; String oldProfileQualifiedName = profileQualifiedName; profileQualifiedName = newProfileQualifiedName; @@ -195,8 +188,7 @@ public class ProfileAppliedImpl extends MinimalEObjectImpl.Container implements * @generated */ @Override - public String getProfileURI() - { + public String getProfileURI() { return profileURI; } @@ -207,8 +199,7 @@ public class ProfileAppliedImpl extends MinimalEObjectImpl.Container implements * @generated */ @Override - public void setProfileURI(String newProfileURI) - { + public void setProfileURI(String newProfileURI) { newProfileURI = newProfileURI == null ? PROFILE_URI_EDEFAULT : newProfileURI; String oldProfileURI = profileURI; profileURI = newProfileURI; @@ -224,8 +215,7 @@ public class ProfileAppliedImpl extends MinimalEObjectImpl.Container implements * @generated */ @Override - public boolean matches(Object input) - { + public boolean matches(Object input) { return ProfileAppliedOperations.matches(this, input); } @@ -236,8 +226,7 @@ public class ProfileAppliedImpl extends MinimalEObjectImpl.Container implements * @generated */ @Override - public Profile resolveProfile(Object context) - { + public Profile resolveProfile(Object context) { return ProfileAppliedOperations.resolveProfile(this, context); } @@ -248,10 +237,8 @@ public class ProfileAppliedImpl extends MinimalEObjectImpl.Container implements * @generated */ @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) - { - switch (featureID) - { + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { case UMLFiltersPackage.PROFILE_APPLIED__NAME: return getName(); case UMLFiltersPackage.PROFILE_APPLIED__PROFILE_QUALIFIED_NAME: @@ -269,10 +256,8 @@ public class ProfileAppliedImpl extends MinimalEObjectImpl.Container implements * @generated */ @Override - public void eSet(int featureID, Object newValue) - { - switch (featureID) - { + public void eSet(int featureID, Object newValue) { + switch (featureID) { case UMLFiltersPackage.PROFILE_APPLIED__NAME: setName((String) newValue); return; @@ -293,10 +278,8 @@ public class ProfileAppliedImpl extends MinimalEObjectImpl.Container implements * @generated */ @Override - public void eUnset(int featureID) - { - switch (featureID) - { + public void eUnset(int featureID) { + switch (featureID) { case UMLFiltersPackage.PROFILE_APPLIED__NAME: setName(NAME_EDEFAULT); return; @@ -317,10 +300,8 @@ public class ProfileAppliedImpl extends MinimalEObjectImpl.Container implements * @generated */ @Override - public boolean eIsSet(int featureID) - { - switch (featureID) - { + public boolean eIsSet(int featureID) { + switch (featureID) { case UMLFiltersPackage.PROFILE_APPLIED__NAME: return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); case UMLFiltersPackage.PROFILE_APPLIED__PROFILE_QUALIFIED_NAME: @@ -338,10 +319,8 @@ public class ProfileAppliedImpl extends MinimalEObjectImpl.Container implements * @generated */ @Override - public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException - { - switch (operationID) - { + public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException { + switch (operationID) { case UMLFiltersPackage.PROFILE_APPLIED___MATCHES__OBJECT: return matches(arguments.get(0)); case UMLFiltersPackage.PROFILE_APPLIED___RESOLVE_PROFILE__OBJECT: @@ -357,8 +336,7 @@ public class ProfileAppliedImpl extends MinimalEObjectImpl.Container implements * @generated */ @Override - public String toString() - { + public String toString() { if (eIsProxy()) { return super.toString(); } @@ -384,8 +362,7 @@ public class ProfileAppliedImpl extends MinimalEObjectImpl.Container implements * @return The new instance. * @generated */ - protected EObject create(EClass eClass) - { + protected EObject create(EClass eClass) { return EcoreUtil.create(eClass); } diff --git a/plugins/uml/org.eclipse.papyrus.uml.filters/src-gen/org/eclipse/papyrus/uml/filters/impl/UMLFiltersFactoryImpl.java b/plugins/uml/org.eclipse.papyrus.uml.filters/src-gen/org/eclipse/papyrus/uml/filters/impl/UMLFiltersFactoryImpl.java index 43dcbc9c10c..97acfb44cc4 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.filters/src-gen/org/eclipse/papyrus/uml/filters/impl/UMLFiltersFactoryImpl.java +++ b/plugins/uml/org.eclipse.papyrus.uml.filters/src-gen/org/eclipse/papyrus/uml/filters/impl/UMLFiltersFactoryImpl.java @@ -28,8 +28,7 @@ import org.eclipse.papyrus.uml.filters.*; * * @generated */ -public class UMLFiltersFactoryImpl extends EFactoryImpl implements UMLFiltersFactory -{ +public class UMLFiltersFactoryImpl extends EFactoryImpl implements UMLFiltersFactory { /** * Creates the default factory implementation. * <!-- begin-user-doc --> @@ -37,17 +36,13 @@ public class UMLFiltersFactoryImpl extends EFactoryImpl implements UMLFiltersFac * * @generated */ - public static UMLFiltersFactory init() - { - try - { + public static UMLFiltersFactory init() { + try { UMLFiltersFactory theUMLFiltersFactory = (UMLFiltersFactory) EPackage.Registry.INSTANCE.getEFactory(UMLFiltersPackage.eNS_URI); - if (theUMLFiltersFactory != null) - { + if (theUMLFiltersFactory != null) { return theUMLFiltersFactory; } - } catch (Exception exception) - { + } catch (Exception exception) { EcorePlugin.INSTANCE.log(exception); } return new UMLFiltersFactoryImpl(); @@ -60,8 +55,7 @@ public class UMLFiltersFactoryImpl extends EFactoryImpl implements UMLFiltersFac * * @generated */ - public UMLFiltersFactoryImpl() - { + public UMLFiltersFactoryImpl() { super(); } @@ -72,10 +66,8 @@ public class UMLFiltersFactoryImpl extends EFactoryImpl implements UMLFiltersFac * @generated */ @Override - public EObject create(EClass eClass) - { - switch (eClass.getClassifierID()) - { + public EObject create(EClass eClass) { + switch (eClass.getClassifierID()) { case UMLFiltersPackage.PROFILE_APPLIED: return createProfileApplied(); default: @@ -90,8 +82,7 @@ public class UMLFiltersFactoryImpl extends EFactoryImpl implements UMLFiltersFac * @generated */ @Override - public ProfileApplied createProfileApplied() - { + public ProfileApplied createProfileApplied() { ProfileAppliedImpl profileApplied = new ProfileAppliedImpl(); return profileApplied; } @@ -103,8 +94,7 @@ public class UMLFiltersFactoryImpl extends EFactoryImpl implements UMLFiltersFac * @generated */ @Override - public UMLFiltersPackage getUMLFiltersPackage() - { + public UMLFiltersPackage getUMLFiltersPackage() { return (UMLFiltersPackage) getEPackage(); } @@ -116,8 +106,7 @@ public class UMLFiltersFactoryImpl extends EFactoryImpl implements UMLFiltersFac * @generated */ @Deprecated - public static UMLFiltersPackage getPackage() - { + public static UMLFiltersPackage getPackage() { return UMLFiltersPackage.eINSTANCE; } diff --git a/plugins/uml/org.eclipse.papyrus.uml.filters/src-gen/org/eclipse/papyrus/uml/filters/impl/UMLFiltersPackageImpl.java b/plugins/uml/org.eclipse.papyrus.uml.filters/src-gen/org/eclipse/papyrus/uml/filters/impl/UMLFiltersPackageImpl.java index cf9f9ecdd0b..bda0a8ee632 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.filters/src-gen/org/eclipse/papyrus/uml/filters/impl/UMLFiltersPackageImpl.java +++ b/plugins/uml/org.eclipse.papyrus.uml.filters/src-gen/org/eclipse/papyrus/uml/filters/impl/UMLFiltersPackageImpl.java @@ -15,6 +15,7 @@ import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EOperation; import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.ecore.impl.EPackageImpl; import org.eclipse.papyrus.infra.filters.FiltersPackage; import org.eclipse.papyrus.uml.filters.ProfileApplied; @@ -30,8 +31,7 @@ import org.eclipse.uml2.uml.UMLPackage; * * @generated */ -public class UMLFiltersPackageImpl extends EPackageImpl implements UMLFiltersPackage -{ +public class UMLFiltersPackageImpl extends EPackageImpl implements UMLFiltersPackage { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -41,18 +41,22 @@ public class UMLFiltersPackageImpl extends EPackageImpl implements UMLFiltersPac private EClass profileAppliedEClass = null; /** - * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package + * Creates an instance of the model <b>Package</b>, registered with + * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package * package URI value. * <p> - * 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. <!-- begin-user-doc --> <!-- end-user-doc --> + * 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. + * <!-- begin-user-doc --> <!-- end-user-doc --> * * @see org.eclipse.emf.ecore.EPackage.Registry * @see org.eclipse.papyrus.uml.filters.UMLFiltersPackage#eNS_URI * @see #init() * @generated */ - private UMLFiltersPackageImpl() - { + private UMLFiltersPackageImpl() { super(eNS_URI, UMLFiltersFactory.eINSTANCE); } @@ -68,15 +72,16 @@ public class UMLFiltersPackageImpl extends EPackageImpl implements UMLFiltersPac * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends. * * <p> - * This method is used to initialize {@link UMLFiltersPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc --> + * This method is used to initialize {@link UMLFiltersPackage#eINSTANCE} when that field is accessed. + * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. + * <!-- begin-user-doc --> <!-- end-user-doc --> * * @see #eNS_URI * @see #createPackageContents() * @see #initializePackageContents() * @generated */ - public static UMLFiltersPackage init() - { + public static UMLFiltersPackage init() { if (isInited) { return (UMLFiltersPackage) EPackage.Registry.INSTANCE.getEPackage(UMLFiltersPackage.eNS_URI); } @@ -87,7 +92,9 @@ public class UMLFiltersPackageImpl extends EPackageImpl implements UMLFiltersPac isInited = true; // Initialize simple dependencies + EcorePackage.eINSTANCE.eClass(); FiltersPackage.eINSTANCE.eClass(); + TypesPackage.eINSTANCE.eClass(); UMLPackage.eINSTANCE.eClass(); // Create package meta-data objects @@ -112,8 +119,7 @@ public class UMLFiltersPackageImpl extends EPackageImpl implements UMLFiltersPac * @generated */ @Override - public EClass getProfileApplied() - { + public EClass getProfileApplied() { return profileAppliedEClass; } @@ -124,8 +130,7 @@ public class UMLFiltersPackageImpl extends EPackageImpl implements UMLFiltersPac * @generated */ @Override - public EAttribute getProfileApplied_ProfileQualifiedName() - { + public EAttribute getProfileApplied_ProfileQualifiedName() { return (EAttribute) profileAppliedEClass.getEStructuralFeatures().get(0); } @@ -136,8 +141,7 @@ public class UMLFiltersPackageImpl extends EPackageImpl implements UMLFiltersPac * @generated */ @Override - public EAttribute getProfileApplied_ProfileURI() - { + public EAttribute getProfileApplied_ProfileURI() { return (EAttribute) profileAppliedEClass.getEStructuralFeatures().get(1); } @@ -148,8 +152,7 @@ public class UMLFiltersPackageImpl extends EPackageImpl implements UMLFiltersPac * @generated */ @Override - public EOperation getProfileApplied__ResolveProfile__Object() - { + public EOperation getProfileApplied__ResolveProfile__Object() { return profileAppliedEClass.getEOperations().get(0); } @@ -160,8 +163,7 @@ public class UMLFiltersPackageImpl extends EPackageImpl implements UMLFiltersPac * @generated */ @Override - public UMLFiltersFactory getUMLFiltersFactory() - { + public UMLFiltersFactory getUMLFiltersFactory() { return (UMLFiltersFactory) getEFactoryInstance(); } @@ -181,8 +183,7 @@ public class UMLFiltersPackageImpl extends EPackageImpl implements UMLFiltersPac * * @generated */ - public void createPackageContents() - { + public void createPackageContents() { if (isCreated) { return; } @@ -211,8 +212,7 @@ public class UMLFiltersPackageImpl extends EPackageImpl implements UMLFiltersPac * * @generated */ - public void initializePackageContents() - { + public void initializePackageContents() { if (isInitialized) { return; } @@ -258,13 +258,12 @@ public class UMLFiltersPackageImpl extends EPackageImpl implements UMLFiltersPac * * @generated */ - protected void createUMLAnnotations() - { + protected void createUMLAnnotations() { String source = "http://www.eclipse.org/uml2/2.0.0/UML"; //$NON-NLS-1$ addAnnotation(this, source, - new String[] - { "originalName", "umlfilters" //$NON-NLS-1$ //$NON-NLS-2$ + new String[] { + "originalName", "umlfilters" //$NON-NLS-1$ //$NON-NLS-2$ }); } diff --git a/plugins/uml/org.eclipse.papyrus.uml.filters/src-gen/org/eclipse/papyrus/uml/filters/internal/operations/ProfileAppliedOperations.java b/plugins/uml/org.eclipse.papyrus.uml.filters/src-gen/org/eclipse/papyrus/uml/filters/internal/operations/ProfileAppliedOperations.java index fb35ce1c33b..d035ca9f716 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.filters/src-gen/org/eclipse/papyrus/uml/filters/internal/operations/ProfileAppliedOperations.java +++ b/plugins/uml/org.eclipse.papyrus.uml.filters/src-gen/org/eclipse/papyrus/uml/filters/internal/operations/ProfileAppliedOperations.java @@ -33,11 +33,11 @@ import com.google.common.base.Strings; * * <p> * The following operations are supported: + * </p> * <ul> * <li>{@link org.eclipse.papyrus.infra.filters.Filter#matches(java.lang.Object) <em>Matches</em>}</li> * <li>{@link org.eclipse.papyrus.uml.filters.ProfileApplied#resolveProfile(java.lang.Object) <em>Resolve Profile</em>}</li> * </ul> - * </p> * * @generated */ @@ -92,12 +92,12 @@ public class ProfileAppliedOperations { /** * Determines whether the first-level filter of a qualified profile name matches * an applied profile, enabling the second-level identity filter. - * + * * @param qualifiedName * the profile qualified name, or {@code null} if the filter has none * @param profile * an applied profile, which may be a {@linkplain EObject#eIsProxy() proxy} if not resolved - * + * * @return whether the {@code profile} matches the expected qualified name, or there is * no expected qualified name */ @@ -116,7 +116,7 @@ public class ProfileAppliedOperations { /** * Determines whether the second-level filter of a profile object URI matches an * applied profile. - * + * * @param expectedURI * the object URI of the profile that is expected to be applied * @param profile @@ -124,7 +124,7 @@ public class ProfileAppliedOperations { * but may be an {@linkplain EObject#eIsProxy() unresolved proxy} * @param context * the resource set context in which URIs are to be resolved - * + * * @return whether the applied {@code profile} actually is the expected one */ protected static boolean match(URI expectedURI, Profile profile, ResourceSet context) { diff --git a/plugins/uml/org.eclipse.papyrus.uml.filters/src-gen/org/eclipse/papyrus/uml/filters/util/UMLFiltersAdapterFactory.java b/plugins/uml/org.eclipse.papyrus.uml.filters/src-gen/org/eclipse/papyrus/uml/filters/util/UMLFiltersAdapterFactory.java index 4429bfb8572..493da9a5bd7 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.filters/src-gen/org/eclipse/papyrus/uml/filters/util/UMLFiltersAdapterFactory.java +++ b/plugins/uml/org.eclipse.papyrus.uml.filters/src-gen/org/eclipse/papyrus/uml/filters/util/UMLFiltersAdapterFactory.java @@ -30,8 +30,7 @@ import org.eclipse.papyrus.uml.filters.*; * @see org.eclipse.papyrus.uml.filters.UMLFiltersPackage * @generated */ -public class UMLFiltersAdapterFactory extends AdapterFactoryImpl -{ +public class UMLFiltersAdapterFactory extends AdapterFactoryImpl { /** * The cached model package. * <!-- begin-user-doc --> @@ -48,10 +47,8 @@ public class UMLFiltersAdapterFactory extends AdapterFactoryImpl * * @generated */ - public UMLFiltersAdapterFactory() - { - if (modelPackage == null) - { + public UMLFiltersAdapterFactory() { + if (modelPackage == null) { modelPackage = UMLFiltersPackage.eINSTANCE; } } @@ -66,14 +63,11 @@ public class UMLFiltersAdapterFactory extends AdapterFactoryImpl * @generated */ @Override - public boolean isFactoryForType(Object object) - { - if (object == modelPackage) - { + public boolean isFactoryForType(Object object) { + if (object == modelPackage) { return true; } - if (object instanceof EObject) - { + if (object instanceof EObject) { return ((EObject) object).eClass().getEPackage() == modelPackage; } return false; @@ -86,27 +80,22 @@ public class UMLFiltersAdapterFactory extends AdapterFactoryImpl * * @generated */ - protected UMLFiltersSwitch<Adapter> modelSwitch = - new UMLFiltersSwitch<Adapter>() - { - @Override - public Adapter caseProfileApplied(ProfileApplied object) - { - return createProfileAppliedAdapter(); - } - - @Override - public Adapter caseFilter(Filter object) - { - return createFilterAdapter(); - } - - @Override - public Adapter defaultCase(EObject object) - { - return createEObjectAdapter(); - } - }; + protected UMLFiltersSwitch<Adapter> modelSwitch = new UMLFiltersSwitch<Adapter>() { + @Override + public Adapter caseProfileApplied(ProfileApplied object) { + return createProfileAppliedAdapter(); + } + + @Override + public Adapter caseFilter(Filter object) { + return createFilterAdapter(); + } + + @Override + public Adapter defaultCase(EObject object) { + return createEObjectAdapter(); + } + }; /** * Creates an adapter for the <code>target</code>. @@ -119,8 +108,7 @@ public class UMLFiltersAdapterFactory extends AdapterFactoryImpl * @generated */ @Override - public Adapter createAdapter(Notifier target) - { + public Adapter createAdapter(Notifier target) { return modelSwitch.doSwitch((EObject) target); } @@ -136,8 +124,7 @@ public class UMLFiltersAdapterFactory extends AdapterFactoryImpl * @see org.eclipse.papyrus.uml.filters.ProfileApplied * @generated */ - public Adapter createProfileAppliedAdapter() - { + public Adapter createProfileAppliedAdapter() { return null; } @@ -152,8 +139,7 @@ public class UMLFiltersAdapterFactory extends AdapterFactoryImpl * @see org.eclipse.papyrus.infra.filters.Filter * @generated */ - public Adapter createFilterAdapter() - { + public Adapter createFilterAdapter() { return null; } @@ -166,8 +152,7 @@ public class UMLFiltersAdapterFactory extends AdapterFactoryImpl * @return the new adapter. * @generated */ - public Adapter createEObjectAdapter() - { + public Adapter createEObjectAdapter() { return null; } diff --git a/plugins/uml/org.eclipse.papyrus.uml.filters/src-gen/org/eclipse/papyrus/uml/filters/util/UMLFiltersSwitch.java b/plugins/uml/org.eclipse.papyrus.uml.filters/src-gen/org/eclipse/papyrus/uml/filters/util/UMLFiltersSwitch.java index 0034d80e9ac..2b3c69867b3 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.filters/src-gen/org/eclipse/papyrus/uml/filters/util/UMLFiltersSwitch.java +++ b/plugins/uml/org.eclipse.papyrus.uml.filters/src-gen/org/eclipse/papyrus/uml/filters/util/UMLFiltersSwitch.java @@ -32,8 +32,7 @@ import org.eclipse.papyrus.uml.filters.*; * @see org.eclipse.papyrus.uml.filters.UMLFiltersPackage * @generated */ -public class UMLFiltersSwitch<T> extends Switch<T> -{ +public class UMLFiltersSwitch<T> extends Switch<T> { /** * The cached model package * <!-- begin-user-doc --> @@ -50,10 +49,8 @@ public class UMLFiltersSwitch<T> extends Switch<T> * * @generated */ - public UMLFiltersSwitch() - { - if (modelPackage == null) - { + public UMLFiltersSwitch() { + if (modelPackage == null) { modelPackage = UMLFiltersPackage.eINSTANCE; } } @@ -63,13 +60,13 @@ public class UMLFiltersSwitch<T> extends Switch<T> * <!-- begin-user-doc --> * <!-- end-user-doc --> * - * @parameter ePackage the package in question. + * @param ePackage + * the package in question. * @return whether this is a switch for the given package. * @generated */ @Override - protected boolean isSwitchFor(EPackage ePackage) - { + protected boolean isSwitchFor(EPackage ePackage) { return ePackage == modelPackage; } @@ -82,10 +79,8 @@ public class UMLFiltersSwitch<T> extends Switch<T> * @generated */ @Override - protected T doSwitch(int classifierID, EObject theEObject) - { - switch (classifierID) - { + protected T doSwitch(int classifierID, EObject theEObject) { + switch (classifierID) { case UMLFiltersPackage.PROFILE_APPLIED: { ProfileApplied profileApplied = (ProfileApplied) theEObject; T result = caseProfileApplied(profileApplied); @@ -115,8 +110,7 @@ public class UMLFiltersSwitch<T> extends Switch<T> * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseProfileApplied(ProfileApplied object) - { + public T caseProfileApplied(ProfileApplied object) { return null; } @@ -133,8 +127,7 @@ public class UMLFiltersSwitch<T> extends Switch<T> * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseFilter(Filter object) - { + public T caseFilter(Filter object) { return null; } @@ -152,8 +145,7 @@ public class UMLFiltersSwitch<T> extends Switch<T> * @generated */ @Override - public T defaultCase(EObject object) - { + public T defaultCase(EObject object) { return null; } |
