Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Le Fevre2017-03-23 04:36:45 -0400
committerGerrit Code Review @ Eclipse.org2017-05-02 07:59:12 -0400
commit6d4dcd0016ef7c5a8bb719ab06577ee4dca152a1 (patch)
treee30338275a64d932f0bb4058a80515d7042fc67f /plugins/infra/newchild
parent6df4255b7e8f143986cfb3261fbf308140694c17 (diff)
downloadorg.eclipse.papyrus-6d4dcd0016ef7c5a8bb719ab06577ee4dca152a1.tar.gz
org.eclipse.papyrus-6d4dcd0016ef7c5a8bb719ab06577ee4dca152a1.tar.xz
org.eclipse.papyrus-6d4dcd0016ef7c5a8bb719ab06577ee4dca152a1.zip
Bug 514048 - [Toolsmiths][newchild] switch from string based model to
real ereference model based with uml and not ecore model Actions -creation of uml model from ecore -manually edition to add package to filters and elementtype -creation class diagram -modification of model to add an ereference -suppression of string reference -suppression the default element type function as deprecated -create a new one that took the CreationMenu as parameter -regenerate the model,edit and editor code -adapt the test models to the new model -migration of creationmenumodelS to the new version with an automatic dom tool -upgrade the plugin version Tests -run org.eclipse.papyrus.infra.newchild.tests -open the different touched creationmenumodel files Change-Id: Iab6808a34ba765e03371240ae72846ad0f223241 Signed-off-by: Francois Le Fevre <francois.le-fevre@cea.fr>
Diffstat (limited to 'plugins/infra/newchild')
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/META-INF/MANIFEST.MF10
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateFolder_menu_CreateElementMenu.gifbin223 -> 0 bytes
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateFolder_menu_CreationMenu.gifbin1004 -> 223 bytes
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateFolder_menu_Folder.gifbin565 -> 223 bytes
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateFolder_menu_Separator.gifbin124 -> 223 bytes
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/obj16/CreateElementMenu.gifbin129 -> 0 bytes
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/obj16/CreationMenu.gifbin1004 -> 129 bytes
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/obj16/Folder.gifbin565 -> 129 bytes
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/obj16/Separator.gifbin124 -> 129 bytes
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/plugin.properties1
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/pom.xml2
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/CreateRelationshipMenuItemProvider.java2
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/CreationMenuItemProvider.java19
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/ElementCreationMenuModelEditPlugin.java13
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/ElementCreationMenuModelItemProviderAdapterFactory.java16
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/FolderItemProvider.java13
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/MenuItemProvider.java31
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/SeparatorItemProvider.java2
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/META-INF/MANIFEST.MF8
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/plugin.properties6
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/plugin.xml1
-rwxr-xr-xplugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/pom.xml8
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/presentation/ElementCreationMenuModelActionBarContributor.java24
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/presentation/ElementCreationMenuModelEditor.java198
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/presentation/ElementCreationMenuModelEditorPlugin.java20
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/presentation/ElementCreationMenuModelModelWizard.java88
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/META-INF/MANIFEST.MF7
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/build.properties2
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/models/elementCreationMenuModel.di2
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/models/elementCreationMenuModel.ecore (renamed from plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/resource/elementCreationMenuModel.ecore)14
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/models/elementCreationMenuModel.genmodel59
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/models/elementCreationMenuModel.notation452
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/models/elementCreationMenuModel.uml80
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/plugin.xml4
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/pom.xml2
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/resource/elementCreationMenuModel.genmodel34
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/CreateRelationshipMenu.java2
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/CreationMenu.java27
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/ElementCreationMenuModelFactory.java10
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/ElementCreationMenuModelPackage.java51
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/Folder.java11
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/Menu.java17
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/Separator.java2
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/CreateRelationshipMenuImpl.java2
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/CreationMenuImpl.java72
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/ElementCreationMenuModelFactoryImpl.java13
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/ElementCreationMenuModelPackageImpl.java39
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/FolderImpl.java14
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/MenuImpl.java12
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/SeparatorImpl.java2
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelAdapterFactory.java15
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelResourceFactoryImpl.java16
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelResourceImpl.java11
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelSwitch.java15
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelXMLProcessor.java60
-rw-r--r--plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuFactory.java23
56 files changed, 1064 insertions, 468 deletions
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/META-INF/MANIFEST.MF b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/META-INF/MANIFEST.MF
index fb89fe4aa0b..54d9fb0afd8 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/META-INF/MANIFEST.MF
@@ -1,16 +1,20 @@
Manifest-Version: 1.0
Export-Package: org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.provider
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.papyrus.infra.newchild;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.newchild;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.uml2.common.edit;visibility:=reexport,
org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.types;visibility:=reexport,
+ org.eclipse.papyrus.infra.types.edit;visibility:=reexport,
org.eclipse.papyrus.infra.filters;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.filters.edit;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
+ org.eclipse.papyrus.infra.filters.edit;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.uml2.types;visibility:=reexport
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateFolder_menu_CreateElementMenu.gif b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateFolder_menu_CreateElementMenu.gif
deleted file mode 100644
index 8eb45613da2..00000000000
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateFolder_menu_CreateElementMenu.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateFolder_menu_CreationMenu.gif b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateFolder_menu_CreationMenu.gif
index 3842f57e6c6..5f8c2018a1c 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateFolder_menu_CreationMenu.gif
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateFolder_menu_CreationMenu.gif
Binary files differ
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateFolder_menu_Folder.gif b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateFolder_menu_Folder.gif
index 728e46a69ee..40ef6854209 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateFolder_menu_Folder.gif
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateFolder_menu_Folder.gif
Binary files differ
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateFolder_menu_Separator.gif b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateFolder_menu_Separator.gif
index cb415064e02..05fd372965d 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateFolder_menu_Separator.gif
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateFolder_menu_Separator.gif
Binary files differ
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/obj16/CreateElementMenu.gif b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/obj16/CreateElementMenu.gif
deleted file mode 100644
index ea58a657dc0..00000000000
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/obj16/CreateElementMenu.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/obj16/CreationMenu.gif b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/obj16/CreationMenu.gif
index 3842f57e6c6..e4b530eca17 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/obj16/CreationMenu.gif
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/obj16/CreationMenu.gif
Binary files differ
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/obj16/Folder.gif b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/obj16/Folder.gif
index 728e46a69ee..b1f8afa4766 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/obj16/Folder.gif
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/obj16/Folder.gif
Binary files differ
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/obj16/Separator.gif b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/obj16/Separator.gif
index cb415064e02..420eee17752 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/obj16/Separator.gif
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/obj16/Separator.gif
Binary files differ
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/plugin.properties b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/plugin.properties
index b09989c9822..bcb6ababc7e 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/plugin.properties
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/plugin.properties
@@ -43,3 +43,4 @@ pluginDescription=The pupose of this plugin is to offer the model and means to c
_UI_CreateRelationshipMenu_type = Create Relationship Menu
_UI_Menu_filter_feature = Filter
_UI_Separator_type = Separator
+_UI_CreationMenu_elementType_feature = Element Type
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/pom.xml b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/pom.xml
index 0f5a7dca600..36727c6b2e6 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/pom.xml
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/pom.xml
@@ -7,6 +7,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.newchild.edit</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/CreateRelationshipMenuItemProvider.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/CreateRelationshipMenuItemProvider.java
index 6b6e606929c..c757c5359bf 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/CreateRelationshipMenuItemProvider.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/CreateRelationshipMenuItemProvider.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2013 CEA LIST.
+ * Copyright (c) 2017 CEA LIST.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/CreationMenuItemProvider.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/CreationMenuItemProvider.java
index c064092fd27..410d9fbc679 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/CreationMenuItemProvider.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/CreationMenuItemProvider.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2013 CEA LIST.
+ * Copyright (c) 2017 CEA LIST.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -55,7 +55,7 @@ public class CreationMenuItemProvider extends MenuItemProvider {
if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
- addElementTypeIdRefPropertyDescriptor(object);
+ addElementTypePropertyDescriptor(object);
addRolePropertyDescriptor(object);
addDisplayAllRolesPropertyDescriptor(object);
}
@@ -63,23 +63,23 @@ public class CreationMenuItemProvider extends MenuItemProvider {
}
/**
- * This adds a property descriptor for the Element Type Id Ref feature.
+ * This adds a property descriptor for the Element Type feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- protected void addElementTypeIdRefPropertyDescriptor(Object object) {
+ protected void addElementTypePropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
- getString("_UI_CreationMenu_elementTypeIdRef_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_CreationMenu_elementTypeIdRef_feature", "_UI_CreationMenu_type"),
- ElementCreationMenuModelPackage.Literals.CREATION_MENU__ELEMENT_TYPE_ID_REF,
+ getString("_UI_CreationMenu_elementType_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_CreationMenu_elementType_feature", "_UI_CreationMenu_type"),
+ ElementCreationMenuModelPackage.Literals.CREATION_MENU__ELEMENT_TYPE,
true,
false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ true,
+ null,
null,
null));
}
@@ -166,7 +166,6 @@ public class CreationMenuItemProvider extends MenuItemProvider {
updateChildren(notification);
switch (notification.getFeatureID(CreationMenu.class)) {
- case ElementCreationMenuModelPackage.CREATION_MENU__ELEMENT_TYPE_ID_REF:
case ElementCreationMenuModelPackage.CREATION_MENU__ROLE:
case ElementCreationMenuModelPackage.CREATION_MENU__DISPLAY_ALL_ROLES:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/ElementCreationMenuModelEditPlugin.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/ElementCreationMenuModelEditPlugin.java
index 1b54401f176..d5afd663f8e 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/ElementCreationMenuModelEditPlugin.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/ElementCreationMenuModelEditPlugin.java
@@ -1,21 +1,20 @@
/**
- * Copyright (c) 2013 CEA LIST.
- *
+ * Copyright (c) 2017 CEA LIST.
+ *
* 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:
* CEA LIST - Initial API and implementation
- *
+ *
*/
package org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.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;
/**
* This is the central singleton for the ElementCreationMenuModel edit plugin.
@@ -49,8 +48,6 @@ public final class ElementCreationMenuModelEditPlugin extends EMFPlugin {
public ElementCreationMenuModelEditPlugin() {
super
(new ResourceLocator [] {
- EcoreEditPlugin.INSTANCE,
- FiltersEditPlugin.INSTANCE,
});
}
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/ElementCreationMenuModelItemProviderAdapterFactory.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/ElementCreationMenuModelItemProviderAdapterFactory.java
index 5a2af51c3be..d146fc86b08 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/ElementCreationMenuModelItemProviderAdapterFactory.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/ElementCreationMenuModelItemProviderAdapterFactory.java
@@ -1,14 +1,14 @@
/**
- * Copyright (c) 2013 CEA LIST.
- *
+ * Copyright (c) 2017 CEA LIST.
+ *
* 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:
* CEA LIST - Initial API and implementation
- *
+ *
*/
package org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.provider;
@@ -18,6 +18,7 @@ import java.util.Collection;
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.edit.provider.ChangeNotifier;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
@@ -29,6 +30,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.newchild.elementcreationmenumodel.util.ElementCreationMenuModelAdapterFactory;
/**
@@ -177,7 +179,6 @@ public class ElementCreationMenuModelItemProviderAdapterFactory extends ElementC
* <!-- end-user-doc -->
* @generated
*/
- @Override
public ComposeableAdapterFactory getRootAdapterFactory() {
return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
}
@@ -188,7 +189,6 @@ public class ElementCreationMenuModelItemProviderAdapterFactory extends ElementC
* <!-- end-user-doc -->
* @generated
*/
- @Override
public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
this.parentAdapterFactory = parentAdapterFactory;
}
@@ -237,7 +237,6 @@ public class ElementCreationMenuModelItemProviderAdapterFactory extends ElementC
* <!-- end-user-doc -->
* @generated
*/
- @Override
public void addListener(INotifyChangedListener notifyChangedListener) {
changeNotifier.addListener(notifyChangedListener);
}
@@ -248,7 +247,6 @@ public class ElementCreationMenuModelItemProviderAdapterFactory extends ElementC
* <!-- end-user-doc -->
* @generated
*/
- @Override
public void removeListener(INotifyChangedListener notifyChangedListener) {
changeNotifier.removeListener(notifyChangedListener);
}
@@ -259,7 +257,6 @@ public class ElementCreationMenuModelItemProviderAdapterFactory extends ElementC
* <!-- end-user-doc -->
* @generated
*/
- @Override
public void fireNotifyChanged(Notification notification) {
changeNotifier.fireNotifyChanged(notification);
@@ -274,7 +271,6 @@ public class ElementCreationMenuModelItemProviderAdapterFactory extends ElementC
* <!-- end-user-doc -->
* @generated
*/
- @Override
public void dispose() {
if (folderItemProvider != null) folderItemProvider.dispose();
if (creationMenuItemProvider != null) creationMenuItemProvider.dispose();
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/FolderItemProvider.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/FolderItemProvider.java
index d89d551499a..ffa2b25ce38 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/FolderItemProvider.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/FolderItemProvider.java
@@ -1,14 +1,14 @@
/**
- * Copyright (c) 2013 CEA LIST.
- *
+ * Copyright (c) 2017 CEA LIST.
+ *
* 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:
* CEA LIST - Initial API and implementation
- *
+ *
*/
package org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.provider;
@@ -18,9 +18,12 @@ 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.newchild.elementcreationmenumodel.ElementCreationMenuModelFactory;
import org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.ElementCreationMenuModelPackage;
import org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.Folder;
@@ -111,7 +114,7 @@ public class FolderItemProvider extends MenuItemProvider {
getString("_UI_Folder_type") :
getString("_UI_Folder_type") + " " + label;
}
-
+
/**
* This handles model notifications by calling {@link #updateChildren} to update any cached
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/MenuItemProvider.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/MenuItemProvider.java
index 09111b834b2..3d23c52243d 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/MenuItemProvider.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/MenuItemProvider.java
@@ -1,14 +1,14 @@
/**
- * Copyright (c) 2013 CEA LIST.
- *
+ * Copyright (c) 2017 CEA LIST.
+ *
* 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:
* CEA LIST - Initial API and implementation
- *
+ *
*/
package org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.provider;
@@ -18,8 +18,11 @@ 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;
@@ -30,7 +33,7 @@ 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.newchild.elementcreationmenumodel.ElementCreationMenuModelPackage;
import org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.Menu;
@@ -40,9 +43,9 @@ import org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.Menu;
* <!-- end-user-doc -->
* @generated
*/
-public class MenuItemProvider
- extends ItemProviderAdapter
- implements
+public class MenuItemProvider
+ extends ItemProviderAdapter
+ implements
IEditingDomainItemProvider,
IStructuredItemContentProvider,
ITreeItemContentProvider,
@@ -185,7 +188,7 @@ public class MenuItemProvider
getString("_UI_Menu_type") :
getString("_UI_Menu_type") + " " + label;
}
-
+
/**
* This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -221,16 +224,6 @@ public class MenuItemProvider
@Override
protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add
- (createChildParameter
- (ElementCreationMenuModelPackage.Literals.MENU__FILTER,
- FiltersFactory.eINSTANCE.createCompoundFilter()));
-
- newChildDescriptors.add
- (createChildParameter
- (ElementCreationMenuModelPackage.Literals.MENU__FILTER,
- FiltersFactory.eINSTANCE.createEquals()));
}
/**
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/SeparatorItemProvider.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/SeparatorItemProvider.java
index 7f3de1b5235..62e318cf2ec 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/SeparatorItemProvider.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/SeparatorItemProvider.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2013 CEA LIST.
+ * Copyright (c) 2017 CEA LIST.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/META-INF/MANIFEST.MF b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/META-INF/MANIFEST.MF
index 9c848594c58..52137de7b0c 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/META-INF/MANIFEST.MF
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/META-INF/MANIFEST.MF
@@ -2,16 +2,18 @@ Manifest-Version: 1.0
Export-Package: org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.presentation
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.newchild.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.newchild.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
org.eclipse.emf.ecore.xmi;visibility:=reexport,
+ org.eclipse.emf.common.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.edit.ui;visibility:=reexport,
org.eclipse.ui.ide;visibility:=reexport,
org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.papyrus.infra.filters.edit;visibility:=reexport;bundle-version="[1.2.0,2.0.0)"
+ org.eclipse.papyrus.infra.types.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.filters.edit;visibility:=reexport
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/plugin.properties b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/plugin.properties
index 3d516ea711c..4e4d7d3ffef 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/plugin.properties
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/plugin.properties
@@ -61,3 +61,9 @@ _UI_Wizard_initial_object_description = Select a model object to create
_UI_FileConflict_label = File Conflict
_WARN_FileConflict = There are unsaved changes that conflict with changes made outside the editor. Do you wish to discard this editor's changes?
+_UI_ElementcreationmenumodelEditor_menu = &Elementcreationmenumodel Editor
+_UI_ElementcreationmenumodelModelWizard_label = Elementcreationmenumodel Model
+_UI_ElementcreationmenumodelModelWizard_description = Create a new Elementcreationmenumodel model
+_UI_ElementcreationmenumodelEditor_label = Elementcreationmenumodel Model Editor
+_UI_ElementcreationmenumodelEditorFilenameDefaultBase = My
+_UI_ElementcreationmenumodelEditorFilenameExtensions = elementcreationmenumodel
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/plugin.xml b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/plugin.xml
index 3bab387cfaf..26a89fde080 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/plugin.xml
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/plugin.xml
@@ -43,5 +43,4 @@
contributorClass="org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.presentation.ElementCreationMenuModelActionBarContributor">
</editor>
</extension>
-
</plugin>
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/pom.xml b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/pom.xml
index 9c43ff9ae2f..eac18dd132b 100755
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/pom.xml
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/pom.xml
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.eclipse.papyrus.infra-newchild</artifactId>
@@ -6,6 +8,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.newchild.editor</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
-</project> \ No newline at end of file
+</project>
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/presentation/ElementCreationMenuModelActionBarContributor.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/presentation/ElementCreationMenuModelActionBarContributor.java
index bf6473cf915..ce229bfe4b8 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/presentation/ElementCreationMenuModelActionBarContributor.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/presentation/ElementCreationMenuModelActionBarContributor.java
@@ -1,14 +1,14 @@
/**
- * Copyright (c) 2013 CEA LIST.
- *
+ * Copyright (c) 2017 CEA LIST.
+ *
* 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:
* CEA LIST - Initial API and implementation
- *
+ *
*/
package org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.presentation;
@@ -16,14 +16,17 @@ import java.util.ArrayList;
import java.util.Collection;
import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+
import org.eclipse.emf.edit.ui.action.ControlAction;
import org.eclipse.emf.edit.ui.action.CreateChildAction;
import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
import org.eclipse.emf.edit.ui.action.LoadResourceAction;
import org.eclipse.emf.edit.ui.action.ValidateAction;
+
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.ActionContributionItem;
import org.eclipse.jface.action.IAction;
@@ -35,12 +38,14 @@ import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.action.SubContributionItem;
+
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.Viewer;
+
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PartInitException;
@@ -51,8 +56,8 @@ import org.eclipse.ui.PartInitException;
* @generated
*/
public class ElementCreationMenuModelActionBarContributor
- extends EditingDomainActionBarContributor
- implements ISelectionChangedListener {
+ extends EditingDomainActionBarContributor
+ implements ISelectionChangedListener {
/**
* This keeps track of the active editor.
* <!-- begin-user-doc -->
@@ -76,7 +81,7 @@ public class ElementCreationMenuModelActionBarContributor
* @generated
*/
protected IAction showPropertiesViewAction =
- new Action(ElementCreationMenuModelEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) {
+ new Action(ElementCreationMenuModelEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) {
@Override
public void run() {
try {
@@ -96,7 +101,7 @@ public class ElementCreationMenuModelActionBarContributor
* @generated
*/
protected IAction refreshViewerAction =
- new Action(ElementCreationMenuModelEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) {
+ new Action(ElementCreationMenuModelEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) {
@Override
public boolean isEnabled() {
return activeEditorPart instanceof IViewerProvider;
@@ -251,7 +256,6 @@ public class ElementCreationMenuModelActionBarContributor
* <!-- end-user-doc -->
* @generated
*/
- @Override
public void selectionChanged(SelectionChangedEvent event) {
// Remove any menu items for old selection.
//
@@ -347,7 +351,7 @@ public class ElementCreationMenuModelActionBarContributor
}
}
}
-
+
/**
* This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
* based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/presentation/ElementCreationMenuModelEditor.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/presentation/ElementCreationMenuModelEditor.java
index b9fd2186bf2..a691f88769f 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/presentation/ElementCreationMenuModelEditor.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/presentation/ElementCreationMenuModelEditor.java
@@ -1,20 +1,21 @@
/**
- * Copyright (c) 2013 CEA LIST.
- *
+ * Copyright (c) 2017 CEA LIST.
+ *
* 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:
* CEA LIST - Initial API and implementation
- *
+ *
*/
package org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.presentation;
import java.io.IOException;
import java.io.InputStream;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -33,56 +34,24 @@ import org.eclipse.core.resources.IResourceChangeListener;
import org.eclipse.core.resources.IResourceDelta;
import org.eclipse.core.resources.IResourceDeltaVisitor;
import org.eclipse.core.resources.ResourcesPlugin;
+
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
-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.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.ui.MarkerHelper;
-import org.eclipse.emf.common.ui.ViewerPane;
-import org.eclipse.emf.common.ui.editor.ProblemEditorPart;
-import org.eclipse.emf.common.ui.viewer.IViewerProvider;
-import org.eclipse.emf.common.util.BasicDiagnostic;
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
-import org.eclipse.papyrus.infra.filters.provider.FiltersItemProviderAdapterFactory;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EContentAdapter;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
-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.edit.ui.provider.UnwrappingSelectionProvider;
-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
-import org.eclipse.emf.edit.ui.util.EditUIUtil;
-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
+
import org.eclipse.jface.action.IMenuListener;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.IStatusLineManager;
import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator;
+
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+
import org.eclipse.jface.util.LocalSelectionTransfer;
+
import org.eclipse.jface.viewers.ColumnWeightData;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -96,22 +65,29 @@ import org.eclipse.jface.viewers.TableLayout;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.provider.ElementCreationMenuModelItemProviderAdapterFactory;
+
import org.eclipse.swt.SWT;
+
import org.eclipse.swt.custom.CTabFolder;
+
import org.eclipse.swt.dnd.DND;
import org.eclipse.swt.dnd.FileTransfer;
import org.eclipse.swt.dnd.Transfer;
+
import org.eclipse.swt.events.ControlAdapter;
import org.eclipse.swt.events.ControlEvent;
+
import org.eclipse.swt.graphics.Point;
+
import org.eclipse.swt.layout.FillLayout;
+
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeColumn;
+
import org.eclipse.ui.IActionBars;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
@@ -119,18 +95,79 @@ import org.eclipse.ui.IEditorSite;
import org.eclipse.ui.IPartListener;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
import org.eclipse.ui.dialogs.SaveAsDialog;
+
import org.eclipse.ui.ide.IGotoMarker;
+
import org.eclipse.ui.part.FileEditorInput;
import org.eclipse.ui.part.MultiPageEditorPart;
+
import org.eclipse.ui.views.contentoutline.ContentOutline;
import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+
import org.eclipse.ui.views.properties.IPropertySheetPage;
import org.eclipse.ui.views.properties.PropertySheet;
import org.eclipse.ui.views.properties.PropertySheetPage;
+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.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.ui.MarkerHelper;
+import org.eclipse.emf.common.ui.ViewerPane;
+
+import org.eclipse.emf.common.ui.editor.ProblemEditorPart;
+
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+
+import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.URI;
+
+
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+
+import org.eclipse.emf.ecore.util.EContentAdapter;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+
+import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
+
+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
+
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+
+import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
+
+import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
+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.edit.ui.provider.UnwrappingSelectionProvider;
+
+import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
+import org.eclipse.emf.edit.ui.util.EditUIUtil;
+
+import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
+
+import org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.provider.ElementCreationMenuModelItemProviderAdapterFactory;
+
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
/**
* This is an example of a ElementCreationMenuModel model editor.
@@ -139,8 +176,8 @@ import org.eclipse.ui.views.properties.PropertySheetPage;
* @generated
*/
public class ElementCreationMenuModelEditor
- extends MultiPageEditorPart
- implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
+ extends MultiPageEditorPart
+ implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
/**
* This keeps track of the editing domain that is used to track all changes to the model.
* <!-- begin-user-doc -->
@@ -296,7 +333,7 @@ public class ElementCreationMenuModelEditor
* @generated
*/
protected IPartListener partListener =
- new IPartListener() {
+ new IPartListener() {
public void partActivated(IWorkbenchPart p) {
if (p instanceof ContentOutline) {
if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {
@@ -376,7 +413,9 @@ public class ElementCreationMenuModelEditor
* @generated
*/
protected EContentAdapter problemIndicationAdapter =
- new EContentAdapter() {
+ new EContentAdapter() {
+ protected boolean dispatching;
+
@Override
public void notifyChanged(Notification notification) {
if (notification.getNotifier() instanceof Resource) {
@@ -392,15 +431,7 @@ public class ElementCreationMenuModelEditor
else {
resourceToDiagnosticMap.remove(resource);
}
-
- if (updateProblemIndication) {
- getSite().getShell().getDisplay().asyncExec
- (new Runnable() {
- public void run() {
- updateProblemIndication();
- }
- });
- }
+ dispatchUpdateProblemIndication();
break;
}
}
@@ -410,6 +441,19 @@ public class ElementCreationMenuModelEditor
}
}
+ protected void dispatchUpdateProblemIndication() {
+ if (updateProblemIndication && !dispatching) {
+ dispatching = true;
+ getSite().getShell().getDisplay().asyncExec
+ (new Runnable() {
+ public void run() {
+ dispatching = false;
+ updateProblemIndication();
+ }
+ });
+ }
+ }
+
@Override
protected void setTarget(Resource target) {
basicSetTarget(target);
@@ -419,14 +463,7 @@ public class ElementCreationMenuModelEditor
protected void unsetTarget(Resource target) {
basicUnsetTarget(target);
resourceToDiagnosticMap.remove(target);
- if (updateProblemIndication) {
- getSite().getShell().getDisplay().asyncExec
- (new Runnable() {
- public void run() {
- updateProblemIndication();
- }
- });
- }
+ dispatchUpdateProblemIndication();
}
};
@@ -437,7 +474,7 @@ public class ElementCreationMenuModelEditor
* @generated
*/
protected IResourceChangeListener resourceChangeListener =
- new IResourceChangeListener() {
+ new IResourceChangeListener() {
public void resourceChanged(IResourceChangeEvent event) {
IResourceDelta delta = event.getDelta();
try {
@@ -624,14 +661,11 @@ public class ElementCreationMenuModelEditor
}
if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {
- markerHelper.deleteMarkers(editingDomain.getResourceSet());
- if (diagnostic.getSeverity() != Diagnostic.OK) {
- try {
- markerHelper.createMarkers(diagnostic);
- }
- catch (CoreException exception) {
- ElementCreationMenuModelEditorPlugin.INSTANCE.log(exception);
- }
+ try {
+ markerHelper.updateMarkers(diagnostic);
+ }
+ catch (CoreException exception) {
+ ElementCreationMenuModelEditorPlugin.INSTANCE.log(exception);
}
}
}
@@ -675,8 +709,6 @@ public class ElementCreationMenuModelEditor
adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new ElementCreationMenuModelItemProviderAdapterFactory());
- adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
- adapterFactory.addAdapterFactory(new FiltersItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
// Create the command stack that will notify this editor as commands are executed.
@@ -724,7 +756,7 @@ public class ElementCreationMenuModelEditor
* <!-- end-user-doc -->
* @generated
*/
- @Override
+ @Override
protected void firePropertyChange(int action) {
super.firePropertyChange(action);
}
@@ -762,7 +794,6 @@ public class ElementCreationMenuModelEditor
* <!-- end-user-doc -->
* @generated
*/
- @Override
public EditingDomain getEditingDomain() {
return editingDomain;
}
@@ -893,7 +924,6 @@ public class ElementCreationMenuModelEditor
* <!-- end-user-doc -->
* @generated
*/
- @Override
public Viewer getViewer() {
return currentViewer;
}
@@ -1016,6 +1046,7 @@ public class ElementCreationMenuModelEditor
selectionViewer = (TreeViewer)viewerPane.getViewer();
selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+ selectionViewer.setUseHashlookup(true);
selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
selectionViewer.setInput(editingDomain.getResourceSet());
@@ -1321,6 +1352,7 @@ public class ElementCreationMenuModelEditor
// Set up the tree viewer.
//
+ contentOutlineViewer.setUseHashlookup(true);
contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
contentOutlineViewer.setInput(editingDomain.getResourceSet());
@@ -1468,7 +1500,9 @@ public class ElementCreationMenuModelEditor
// Save the resources to the file system.
//
boolean first = true;
- for (Resource resource : editingDomain.getResourceSet().getResources()) {
+ List<Resource> resources = editingDomain.getResourceSet().getResources();
+ for (int i = 0; i < resources.size(); ++i) {
+ Resource resource = resources.get(i);
if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {
try {
long timeStamp = resource.getTimeStamp();
@@ -1579,7 +1613,6 @@ public class ElementCreationMenuModelEditor
* <!-- end-user-doc -->
* @generated
*/
- @Override
public void gotoMarker(IMarker marker) {
List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);
if (!targetObjects.isEmpty()) {
@@ -1624,7 +1657,6 @@ public class ElementCreationMenuModelEditor
* <!-- end-user-doc -->
* @generated
*/
- @Override
public void addSelectionChangedListener(ISelectionChangedListener listener) {
selectionChangedListeners.add(listener);
}
@@ -1635,7 +1667,6 @@ public class ElementCreationMenuModelEditor
* <!-- end-user-doc -->
* @generated
*/
- @Override
public void removeSelectionChangedListener(ISelectionChangedListener listener) {
selectionChangedListeners.remove(listener);
}
@@ -1646,7 +1677,6 @@ public class ElementCreationMenuModelEditor
* <!-- end-user-doc -->
* @generated
*/
- @Override
public ISelection getSelection() {
return editorSelection;
}
@@ -1658,7 +1688,6 @@ public class ElementCreationMenuModelEditor
* <!-- end-user-doc -->
* @generated
*/
- @Override
public void setSelection(ISelection selection) {
editorSelection = selection;
@@ -1728,7 +1757,6 @@ public class ElementCreationMenuModelEditor
* <!-- end-user-doc -->
* @generated
*/
- @Override
public void menuAboutToShow(IMenuManager menuManager) {
((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);
}
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/presentation/ElementCreationMenuModelEditorPlugin.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/presentation/ElementCreationMenuModelEditorPlugin.java
index 749c772ef55..7346313a6b5 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/presentation/ElementCreationMenuModelEditorPlugin.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/presentation/ElementCreationMenuModelEditorPlugin.java
@@ -1,22 +1,22 @@
/**
- * Copyright (c) 2013 CEA LIST.
- *
+ * Copyright (c) 2017 CEA LIST.
+ *
* 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:
* CEA LIST - Initial API and implementation
- *
+ *
*/
package org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.presentation;
import org.eclipse.emf.common.EMFPlugin;
+
import org.eclipse.emf.common.ui.EclipseUIPlugin;
+
import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
-import org.eclipse.papyrus.infra.filters.provider.FiltersEditPlugin;
/**
* This is the central singleton for the ElementCreationMenuModel editor plugin.
@@ -32,7 +32,7 @@ public final class ElementCreationMenuModelEditorPlugin extends EMFPlugin {
* @generated
*/
public static final ElementCreationMenuModelEditorPlugin INSTANCE = new ElementCreationMenuModelEditorPlugin();
-
+
/**
* Keep track of the singleton.
* <!-- begin-user-doc -->
@@ -50,8 +50,6 @@ public final class ElementCreationMenuModelEditorPlugin extends EMFPlugin {
public ElementCreationMenuModelEditorPlugin() {
super
(new ResourceLocator [] {
- EcoreEditPlugin.INSTANCE,
- FiltersEditPlugin.INSTANCE,
});
}
@@ -66,7 +64,7 @@ public final class ElementCreationMenuModelEditorPlugin extends EMFPlugin {
public ResourceLocator getPluginResourceLocator() {
return plugin;
}
-
+
/**
* Returns the singleton instance of the Eclipse plugin.
* <!-- begin-user-doc -->
@@ -77,7 +75,7 @@ public final class ElementCreationMenuModelEditorPlugin extends EMFPlugin {
public static Implementation getPlugin() {
return plugin;
}
-
+
/**
* The actual implementation of the Eclipse <b>Plugin</b>.
* <!-- begin-user-doc -->
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/presentation/ElementCreationMenuModelModelWizard.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/presentation/ElementCreationMenuModelModelWizard.java
index 0fe37790ee6..da1de343953 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/presentation/ElementCreationMenuModelModelWizard.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/presentation/ElementCreationMenuModelModelWizard.java
@@ -1,14 +1,14 @@
/**
- * Copyright (c) 2013 CEA LIST.
- *
+ * Copyright (c) 2017 CEA LIST.
+ *
* 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:
* CEA LIST - Initial API and implementation
- *
+ *
*/
package org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.presentation;
@@ -23,52 +23,77 @@ import java.util.Map;
import java.util.MissingResourceException;
import java.util.StringTokenizer;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
import org.eclipse.emf.common.CommonPlugin;
+
import org.eclipse.emf.common.util.URI;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EObject;
+
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
+
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+
+import org.eclipse.emf.ecore.EObject;
+
import org.eclipse.emf.ecore.xmi.XMLResource;
+
import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+
import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
+
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
+
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.ElementCreationMenuModelFactory;
-import org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.ElementCreationMenuModelPackage;
-import org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.provider.ElementCreationMenuModelEditPlugin;
+
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
+
import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.ModifyEvent;
+
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
+
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
+
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
+
import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+
import org.eclipse.ui.part.FileEditorInput;
import org.eclipse.ui.part.ISetSelectionTarget;
+import org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.ElementCreationMenuModelFactory;
+import org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.ElementCreationMenuModelPackage;
+import org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.provider.ElementCreationMenuModelEditPlugin;
+
+
+import org.eclipse.core.runtime.Path;
+
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+
/**
* This is a simple wizard for creating a new model file.
@@ -84,7 +109,7 @@ public class ElementCreationMenuModelModelWizard extends Wizard implements INewW
* @generated
*/
public static final List<String> FILE_EXTENSIONS =
- Collections.unmodifiableList(Arrays.asList(ElementCreationMenuModelEditorPlugin.INSTANCE.getString("_UI_ElementCreationMenuModelEditorFilenameExtensions").split("\\s*,\\s*")));
+ Collections.unmodifiableList(Arrays.asList(ElementCreationMenuModelEditorPlugin.INSTANCE.getString("_UI_ElementCreationMenuModelEditorFilenameExtensions").split("\\s*,\\s*")));
/**
* A formatted list of supported file extensions, suitable for display.
@@ -93,7 +118,7 @@ public class ElementCreationMenuModelModelWizard extends Wizard implements INewW
* @generated
*/
public static final String FORMATTED_FILE_EXTENSIONS =
- ElementCreationMenuModelEditorPlugin.INSTANCE.getString("_UI_ElementCreationMenuModelEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");
+ ElementCreationMenuModelEditorPlugin.INSTANCE.getString("_UI_ElementCreationMenuModelEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");
/**
* This caches an instance of the model package.
@@ -157,7 +182,6 @@ public class ElementCreationMenuModelModelWizard extends Wizard implements INewW
* <!-- end-user-doc -->
* @generated
*/
- @Override
public void init(IWorkbench workbench, IStructuredSelection selection) {
this.workbench = workbench;
this.selection = selection;
@@ -353,8 +377,8 @@ public class ElementCreationMenuModelModelWizard extends Wizard implements INewW
/**
* @generated
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
*/
protected List<String> encodings;
@@ -380,9 +404,9 @@ public class ElementCreationMenuModelModelWizard extends Wizard implements INewW
* <!-- end-user-doc -->
* @generated
*/
- @Override
public void createControl(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE); {
+ Composite composite = new Composite(parent, SWT.NONE);
+ {
GridLayout layout = new GridLayout();
layout.numColumns = 1;
layout.verticalSpacing = 12;
@@ -454,7 +478,7 @@ public class ElementCreationMenuModelModelWizard extends Wizard implements INewW
* @generated
*/
protected ModifyListener validator =
- new ModifyListener() {
+ new ModifyListener() {
public void modifyText(ModifyEvent e) {
setPageComplete(validatePage());
}
@@ -552,7 +576,7 @@ public class ElementCreationMenuModelModelWizard extends Wizard implements INewW
* <!-- end-user-doc -->
* @generated
*/
- @Override
+ @Override
public void addPages() {
// Create a page, set the title, and the initial model file name.
//
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/META-INF/MANIFEST.MF b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/META-INF/MANIFEST.MF
index 497d3ed7e41..bae112d3f84 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/META-INF/MANIFEST.MF
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/META-INF/MANIFEST.MF
@@ -4,11 +4,14 @@ Export-Package: org.eclipse.papyrus.infra.newchild,
org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.impl,
org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.util,
org.eclipse.papyrus.infra.newchild.messages,
- org.eclipse.papyrus.infra.newchild.ui;x-friends:="org.eclipse.papyrus.infra.newchild.ui"
+ org.eclipse.papyrus.infra.newchild.ui;
+ x-friends:="org.eclipse.papyrus.infra.newchild.ui"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.types;visibility:=reexport,
org.eclipse.papyrus.infra.filters;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.uml2.types;visibility:=reexport,
org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
@@ -18,7 +21,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: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-ManifestVersion: 2
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/build.properties b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/build.properties
index ba36fa89f8c..844819f7278 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/build.properties
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/build.properties
@@ -7,7 +7,7 @@ bin.includes = META-INF/,\
plugin.properties,\
about.html,\
schema/,\
- resource/
+ models/
src.includes = about.html,\
schema/,\
docs/
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/models/elementCreationMenuModel.di b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/models/elementCreationMenuModel.di
new file mode 100644
index 00000000000..bf9abab340f
--- /dev/null
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/models/elementCreationMenuModel.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/resource/elementCreationMenuModel.ecore b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/models/elementCreationMenuModel.ecore
index a5723efbcd5..55e7851ba00 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/resource/elementCreationMenuModel.ecore
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/models/elementCreationMenuModel.ecore
@@ -8,19 +8,19 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Menu" abstract="true">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="label" ordered="false"
- lowerBound="1" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="icon" ordered="false" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+ lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="icon" ordered="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="visible" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
defaultValueLiteral="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="filter" eType="ecore:EClass platform:/plugin/org.eclipse.papyrus.infra.filters/model/filters.ecore#//Filter"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="filter" eType="ecore:EClass ../../org.eclipse.papyrus.infra.filters/model/filters.ecore#//Filter"
containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="CreationMenu" eSuperTypes="#//Menu">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="elementTypeIdRef" ordered="false"
- lowerBound="1" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="role" ordered="false" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="elementType" lowerBound="1"
+ eType="ecore:EClass ../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore#//ElementTypeConfiguration"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="role" ordered="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="displayAllRoles" ordered="false"
- lowerBound="1" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
+ lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
defaultValueLiteral="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="CreateRelationshipMenu" eSuperTypes="#//CreationMenu"/>
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/models/elementCreationMenuModel.genmodel b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/models/elementCreationMenuModel.genmodel
new file mode 100644
index 00000000000..8160f8ad66b
--- /dev/null
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/models/elementCreationMenuModel.genmodel
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel"
+ copyrightText="Copyright (c) 2017 CEA LIST.&#xD;&#xA; &#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA; &#xD;&#xA;Contributors:&#xD;&#xA;&#x9;CEA LIST - Initial API and implementation&#xD;&#xA;"
+ modelDirectory="/org.eclipse.papyrus.infra.newchild/src-gen" editDirectory="/org.eclipse.papyrus.infra.newchild.edit/src-gen"
+ editorDirectory="/org.eclipse.papyrus.infra.newchild.editor/src-gen" modelPluginID="org.eclipse.papyrus.infra.newchild"
+ modelName="ElementCreationMenuModel" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+ importerID="org.eclipse.uml2.uml.ecore.importer" complianceLevel="8.0" copyrightFields="false"
+ usedGenPackages="../../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"
+ operationReflection="true" importOrganizing="true">
+ <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"/>
+ <details key="ANNOTATION_DETAILS" value="PROCESS"/>
+ <details key="PROPERTY_DEFAULT_EXPRESSIONS" value="IGNORE"/>
+ <details key="DUPLICATE_FEATURE_INHERITANCE" value="DISCARD"/>
+ <details key="COMMENTS" value="PROCESS"/>
+ <details key="DERIVED_FEATURES" value="PROCESS"/>
+ <details key="SUPER_CLASS_ORDER" value="PROCESS"/>
+ <details key="DUPLICATE_OPERATION_INHERITANCE" value="DISCARD"/>
+ <details key="REDEFINING_OPERATIONS" value="REPORT"/>
+ <details key="INVARIANT_CONSTRAINTS" value="PROCESS"/>
+ <details key="UNION_PROPERTIES" value="REPORT"/>
+ <details key="DUPLICATE_OPERATIONS" value="DISCARD"/>
+ <details key="NON_API_INVARIANTS" value="IGNORE"/>
+ <details key="CAMEL_CASE_NAMES" value="IGNORE"/>
+ <details key="SUBSETTING_PROPERTIES" value="REPORT"/>
+ <details key="OPERATION_BODIES" value="IGNORE"/>
+ <details key="ECORE_TAGGED_VALUES" value="PROCESS"/>
+ <details key="UNTYPED_PROPERTIES" value="REPORT"/>
+ <details key="REDEFINING_PROPERTIES" value="REPORT"/>
+ <details key="INVOCATION_DELEGATES" value="IGNORE"/>
+ <details key="VALIDATION_DELEGATES" value="IGNORE"/>
+ </genAnnotations>
+ <foreignModel>elementCreationMenuModel.uml</foreignModel>
+ <genPackages xsi:type="genmodel:GenPackage" prefix="ElementCreationMenuModel" basePackage="org.eclipse.papyrus.infra.newchild"
+ resource="XMI" disposableProviderFactory="true" contentTypeIdentifier="" fileExtensions="creationmenumodel"
+ ecorePackage="elementCreationMenuModel.ecore#/">
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="elementCreationMenuModel.ecore#//Folder">
+ <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
+ createChild="true" ecoreFeature="ecore:EReference elementCreationMenuModel.ecore#//Folder/menu"/>
+ </genClasses>
+ <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="elementCreationMenuModel.ecore#//Menu">
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute elementCreationMenuModel.ecore#//Menu/label"/>
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute elementCreationMenuModel.ecore#//Menu/icon"/>
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute elementCreationMenuModel.ecore#//Menu/visible"/>
+ <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
+ createChild="true" ecoreFeature="ecore:EReference elementCreationMenuModel.ecore#//Menu/filter"/>
+ </genClasses>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="elementCreationMenuModel.ecore#//CreationMenu">
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference elementCreationMenuModel.ecore#//CreationMenu/elementType"/>
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute elementCreationMenuModel.ecore#//CreationMenu/role"/>
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute elementCreationMenuModel.ecore#//CreationMenu/displayAllRoles"/>
+ </genClasses>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="elementCreationMenuModel.ecore#//CreateRelationshipMenu"/>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="elementCreationMenuModel.ecore#//Separator"/>
+ </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/models/elementCreationMenuModel.notation b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/models/elementCreationMenuModel.notation
new file mode 100644
index 00000000000..319c0611ae6
--- /dev/null
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/models/elementCreationMenuModel.notation
@@ -0,0 +1,452 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:gmfdiagrepresentation="http://www.eclipse.org/papyrus/infra/gmfdiag/representation" 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" xmi:id="_x3LcYBUrEeee-IEe7L34yQ" type="PapyrusUMLClassDiagram" name="ElementCreationMenuModel" measurementUnit="Pixel">
+ <children xmi:type="notation:Shape" xmi:id="_zRihkBUrEeee-IEe7L34yQ" type="Class_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_zR01cBUrEeee-IEe7L34yQ" type="Class_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_zR01cRUrEeee-IEe7L34yQ" type="Class_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_zR01chUrEeee-IEe7L34yQ" y="15"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_zR1cgBUrEeee-IEe7L34yQ" type="Class_AttributeCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_zR1cgRUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_zR1cghUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_zR1cgxUrEeee-IEe7L34yQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zR1chBUrEeee-IEe7L34yQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_zR1chRUrEeee-IEe7L34yQ" type="Class_OperationCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_zR1chhUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_zR1chxUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_zR1ciBUrEeee-IEe7L34yQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zR1ciRUrEeee-IEe7L34yQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_zR1cihUrEeee-IEe7L34yQ" type="Class_NestedClassifierCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_zR1cixUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_zR1cjBUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_zR1cjRUrEeee-IEe7L34yQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zR1cjhUrEeee-IEe7L34yQ"/>
+ </children>
+ <element xmi:type="uml:Class" href="elementCreationMenuModel.uml#_gHZ5_xUpEeee-IEe7L34yQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zRihkRUrEeee-IEe7L34yQ" x="780" y="420"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_zURsgBUrEeee-IEe7L34yQ" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_zURsgRUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_zUSTkBUrEeee-IEe7L34yQ" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="elementCreationMenuModel.uml#_gHZ5_xUpEeee-IEe7L34yQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zURsghUrEeee-IEe7L34yQ" x="200"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_zU1tMBUrEeee-IEe7L34yQ" type="Class_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_zU2UQBUrEeee-IEe7L34yQ" type="Class_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_zU2UQRUrEeee-IEe7L34yQ" type="Class_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_zU2UQhUrEeee-IEe7L34yQ" y="15"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_zU2UQxUrEeee-IEe7L34yQ" type="Class_AttributeCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_zU2URBUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_zU2URRUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_zU2URhUrEeee-IEe7L34yQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zU2URxUrEeee-IEe7L34yQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_zU2USBUrEeee-IEe7L34yQ" type="Class_OperationCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_zU2USRUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_zU2UShUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_zU2USxUrEeee-IEe7L34yQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zU2UTBUrEeee-IEe7L34yQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_zU2UTRUrEeee-IEe7L34yQ" type="Class_NestedClassifierCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_zU27UBUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_zU27URUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_zU27UhUrEeee-IEe7L34yQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zU27UxUrEeee-IEe7L34yQ"/>
+ </children>
+ <element xmi:type="uml:Class" href="elementCreationMenuModel.uml#_gHZ58xUpEeee-IEe7L34yQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zU1tMRUrEeee-IEe7L34yQ" x="800" y="240"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_zVGy8BUrEeee-IEe7L34yQ" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_zVGy8RUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_zVGy8xUrEeee-IEe7L34yQ" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="elementCreationMenuModel.uml#_gHZ58xUpEeee-IEe7L34yQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zVGy8hUrEeee-IEe7L34yQ" x="200"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_zViQwBUrEeee-IEe7L34yQ" type="Class_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_zVi30BUrEeee-IEe7L34yQ" type="Class_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_zVi30RUrEeee-IEe7L34yQ" type="Class_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_zVi30hUrEeee-IEe7L34yQ" y="15"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_zVi30xUrEeee-IEe7L34yQ" type="Class_AttributeCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_zVi31BUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_zVi31RUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_zVi31hUrEeee-IEe7L34yQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zVi31xUrEeee-IEe7L34yQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_zVi32BUrEeee-IEe7L34yQ" type="Class_OperationCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_zVi32RUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_zVi32hUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_zVi32xUrEeee-IEe7L34yQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zVi33BUrEeee-IEe7L34yQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_zVi33RUrEeee-IEe7L34yQ" type="Class_NestedClassifierCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_zVi33hUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_zVi33xUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_zVi34BUrEeee-IEe7L34yQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zVi34RUrEeee-IEe7L34yQ"/>
+ </children>
+ <element xmi:type="uml:Class" href="elementCreationMenuModel.uml#_gHZ54RUpEeee-IEe7L34yQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zViQwRUrEeee-IEe7L34yQ" x="460" y="240"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_zVwTMxUrEeee-IEe7L34yQ" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_zVwTNBUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_zVw6QBUrEeee-IEe7L34yQ" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="elementCreationMenuModel.uml#_gHZ54RUpEeee-IEe7L34yQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zVwTNRUrEeee-IEe7L34yQ" x="200"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_zWLxABUrEeee-IEe7L34yQ" type="Class_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_zWMYEBUrEeee-IEe7L34yQ" type="Class_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_zWMYERUrEeee-IEe7L34yQ" type="Class_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_zWMYEhUrEeee-IEe7L34yQ" y="15"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_zWMYExUrEeee-IEe7L34yQ" type="Class_AttributeCompartment">
+ <children xmi:type="notation:Shape" xmi:id="_3TYmYBUrEeee-IEe7L34yQ" type="Property_ClassAttributeLabel">
+ <element xmi:type="uml:Property" href="elementCreationMenuModel.uml#_gHZ55xUpEeee-IEe7L34yQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_3TYmYRUrEeee-IEe7L34yQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_3TZ0gBUrEeee-IEe7L34yQ" type="Property_ClassAttributeLabel">
+ <element xmi:type="uml:Property" href="elementCreationMenuModel.uml#_gHZ56BUpEeee-IEe7L34yQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_3TZ0gRUrEeee-IEe7L34yQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_3TabkBUrEeee-IEe7L34yQ" type="Property_ClassAttributeLabel">
+ <element xmi:type="uml:Property" href="elementCreationMenuModel.uml#_gHZ56hUpEeee-IEe7L34yQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_3TabkRUrEeee-IEe7L34yQ"/>
+ </children>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_zWMYFBUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_zWMYFRUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_zWMYFhUrEeee-IEe7L34yQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zWMYFxUrEeee-IEe7L34yQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_zWM_IBUrEeee-IEe7L34yQ" type="Class_OperationCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_zWM_IRUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_zWM_IhUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_zWM_IxUrEeee-IEe7L34yQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zWM_JBUrEeee-IEe7L34yQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_zWM_JRUrEeee-IEe7L34yQ" type="Class_NestedClassifierCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_zWM_JhUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_zWM_JxUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_zWM_KBUrEeee-IEe7L34yQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zWM_KRUrEeee-IEe7L34yQ"/>
+ </children>
+ <element xmi:type="uml:Class" href="elementCreationMenuModel.uml#_gHZ55hUpEeee-IEe7L34yQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zWLxARUrEeee-IEe7L34yQ" x="600" y="40"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_zWfTAxUrEeee-IEe7L34yQ" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_zWfTBBUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_zWf6EBUrEeee-IEe7L34yQ" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="elementCreationMenuModel.uml#_gHZ55hUpEeee-IEe7L34yQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zWfTBRUrEeee-IEe7L34yQ" x="200"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_zW3GcBUrEeee-IEe7L34yQ" type="Class_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_zW3tgBUrEeee-IEe7L34yQ" type="Class_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_zW3tgRUrEeee-IEe7L34yQ" type="Class_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_zW3tghUrEeee-IEe7L34yQ" y="15"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_zW3tgxUrEeee-IEe7L34yQ" type="Class_AttributeCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_zW3thBUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_zW3thRUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_zW3thhUrEeee-IEe7L34yQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zW3thxUrEeee-IEe7L34yQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_zW3tiBUrEeee-IEe7L34yQ" type="Class_OperationCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_zW3tiRUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_zW3tihUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_zW3tixUrEeee-IEe7L34yQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zW3tjBUrEeee-IEe7L34yQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_zW3tjRUrEeee-IEe7L34yQ" type="Class_NestedClassifierCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_zW3tjhUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_zW3tjxUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_zW3tkBUrEeee-IEe7L34yQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zW3tkRUrEeee-IEe7L34yQ"/>
+ </children>
+ <element xmi:type="uml:Class" href="elementCreationMenuModel.uml#_gHZ6ARUpEeee-IEe7L34yQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zW3GcRUrEeee-IEe7L34yQ" x="640" y="240"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_zXGXAxUrEeee-IEe7L34yQ" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_zXGXBBUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_zXGXBhUrEeee-IEe7L34yQ" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="elementCreationMenuModel.uml#_gHZ6ARUpEeee-IEe7L34yQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zXGXBRUrEeee-IEe7L34yQ" x="200"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_QITRgBUsEeee-IEe7L34yQ" type="Interface_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_QITRghUsEeee-IEe7L34yQ" type="Interface_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_QITRgxUsEeee-IEe7L34yQ" type="Interface_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_QITRhBUsEeee-IEe7L34yQ" y="15"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_QIT4kBUsEeee-IEe7L34yQ" type="Interface_AttributeCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_QIT4kRUsEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_QIT4khUsEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_QIT4kxUsEeee-IEe7L34yQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QIT4lBUsEeee-IEe7L34yQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_QIT4lRUsEeee-IEe7L34yQ" type="Interface_OperationCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_QIT4lhUsEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_QIT4lxUsEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_QIT4mBUsEeee-IEe7L34yQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QIT4mRUsEeee-IEe7L34yQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_QIT4mhUsEeee-IEe7L34yQ" type="Interface_NestedClassifierCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_QIT4mxUsEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_QIT4nBUsEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_QIT4nRUsEeee-IEe7L34yQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QIT4nhUsEeee-IEe7L34yQ"/>
+ </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="_QITRgRUsEeee-IEe7L34yQ" x="140" y="40"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_pf7BEBUsEeee-IEe7L34yQ" type="Class_Shape">
+ <children xmi:type="notation:DecorationNode" xmi:id="_pf7oIBUsEeee-IEe7L34yQ" type="Class_NameLabel"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_pf7oIRUsEeee-IEe7L34yQ" type="Class_FloatingNameLabel">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_pf7oIhUsEeee-IEe7L34yQ" y="15"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_pf8PMBUsEeee-IEe7L34yQ" type="Class_AttributeCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_pf8PMRUsEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_pf8PMhUsEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_pf8PMxUsEeee-IEe7L34yQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pf8PNBUsEeee-IEe7L34yQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_pf8PNRUsEeee-IEe7L34yQ" type="Class_OperationCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_pf8PNhUsEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_pf8PNxUsEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_pf8POBUsEeee-IEe7L34yQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pf8PORUsEeee-IEe7L34yQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_pf8POhUsEeee-IEe7L34yQ" type="Class_NestedClassifierCompartment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_pf8POxUsEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_pf8PPBUsEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_pf8PPRUsEeee-IEe7L34yQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pf8PPhUsEeee-IEe7L34yQ"/>
+ </children>
+ <element xmi:type="uml:Class" href="platform:/resource/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.uml#_VkhwQhLoEeeDV7UHoBIkeA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pf7BERUsEeee-IEe7L34yQ" x="1080" y="240"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_pgPxMxUsEeee-IEe7L34yQ" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_pgPxNBUsEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_pgPxNhUsEeee-IEe7L34yQ" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="platform:/resource/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.uml#_VkhwQhLoEeeDV7UHoBIkeA"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pgPxNRUsEeee-IEe7L34yQ" x="200"/>
+ </children>
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_x3LcYRUrEeee-IEe7L34yQ" name="diagram_compatibility_version" stringValue="1.3.0"/>
+ <styles xmi:type="notation:DiagramStyle" xmi:id="_x3LcYhUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_x3LcYxUrEeee-IEe7L34yQ">
+ <owner xmi:type="uml:Model" href="elementCreationMenuModel.uml#_gHZ54BUpEeee-IEe7L34yQ"/>
+ <diagramKind xmi:type="gmfdiagrepresentation:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_zzf4gHDtEeWh-MssWmCB_A"/>
+ </styles>
+ <element xmi:type="uml:Model" href="elementCreationMenuModel.uml#_gHZ54BUpEeee-IEe7L34yQ"/>
+ <edges xmi:type="notation:Connector" xmi:id="_zUS6oBUrEeee-IEe7L34yQ" type="StereotypeCommentLink" source="_zRihkBUrEeee-IEe7L34yQ" target="_zURsgBUrEeee-IEe7L34yQ">
+ <styles xmi:type="notation:FontStyle" xmi:id="_zUS6oRUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_zUThshUrEeee-IEe7L34yQ" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="elementCreationMenuModel.uml#_gHZ5_xUpEeee-IEe7L34yQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zUS6ohUrEeee-IEe7L34yQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zUThsBUrEeee-IEe7L34yQ"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zUThsRUrEeee-IEe7L34yQ"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_zVGy9BUrEeee-IEe7L34yQ" type="StereotypeCommentLink" source="_zU1tMBUrEeee-IEe7L34yQ" target="_zVGy8BUrEeee-IEe7L34yQ">
+ <styles xmi:type="notation:FontStyle" xmi:id="_zVGy9RUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_zVGy-RUrEeee-IEe7L34yQ" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="elementCreationMenuModel.uml#_gHZ58xUpEeee-IEe7L34yQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zVGy9hUrEeee-IEe7L34yQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zVGy9xUrEeee-IEe7L34yQ"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zVGy-BUrEeee-IEe7L34yQ"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_zVw6QRUrEeee-IEe7L34yQ" type="StereotypeCommentLink" source="_zViQwBUrEeee-IEe7L34yQ" target="_zVwTMxUrEeee-IEe7L34yQ">
+ <styles xmi:type="notation:FontStyle" xmi:id="_zVw6QhUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_zVw6RhUrEeee-IEe7L34yQ" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="elementCreationMenuModel.uml#_gHZ54RUpEeee-IEe7L34yQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zVw6QxUrEeee-IEe7L34yQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zVw6RBUrEeee-IEe7L34yQ"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zVw6RRUrEeee-IEe7L34yQ"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_zWf6ERUrEeee-IEe7L34yQ" type="StereotypeCommentLink" source="_zWLxABUrEeee-IEe7L34yQ" target="_zWfTAxUrEeee-IEe7L34yQ">
+ <styles xmi:type="notation:FontStyle" xmi:id="_zWf6EhUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_zWghIBUrEeee-IEe7L34yQ" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="elementCreationMenuModel.uml#_gHZ55hUpEeee-IEe7L34yQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zWf6ExUrEeee-IEe7L34yQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWf6FBUrEeee-IEe7L34yQ"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWf6FRUrEeee-IEe7L34yQ"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_zXGXBxUrEeee-IEe7L34yQ" type="StereotypeCommentLink" source="_zW3GcBUrEeee-IEe7L34yQ" target="_zXGXAxUrEeee-IEe7L34yQ">
+ <styles xmi:type="notation:FontStyle" xmi:id="_zXGXCBUrEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_zXGXDBUrEeee-IEe7L34yQ" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="elementCreationMenuModel.uml#_gHZ6ARUpEeee-IEe7L34yQ"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zXGXCRUrEeee-IEe7L34yQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zXGXChUrEeee-IEe7L34yQ"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zXGXCxUrEeee-IEe7L34yQ"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_5ice8BUrEeee-IEe7L34yQ" type="Association_Edge" source="_zWLxABUrEeee-IEe7L34yQ" target="_zViQwBUrEeee-IEe7L34yQ">
+ <children xmi:type="notation:DecorationNode" xmi:id="_5idGABUrEeee-IEe7L34yQ" type="Association_StereotypeLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_6HiJABUrEeee-IEe7L34yQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_5idGARUrEeee-IEe7L34yQ" x="-1" y="-18"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_5idGAhUrEeee-IEe7L34yQ" type="Association_NameLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_6IBRMBUrEeee-IEe7L34yQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_5idGAxUrEeee-IEe7L34yQ" y="19"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_5idtEBUrEeee-IEe7L34yQ" type="Association_TargetRoleLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_6IcH8BUrEeee-IEe7L34yQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_5idtERUrEeee-IEe7L34yQ" y="-20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_5idtEhUrEeee-IEe7L34yQ" type="Association_SourceRoleLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_6IyGMBUrEeee-IEe7L34yQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_5idtExUrEeee-IEe7L34yQ" x="-80" y="27"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_5idtFBUrEeee-IEe7L34yQ" type="Association_SourceMultiplicityLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_6JIrgBUrEeee-IEe7L34yQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_5idtFRUrEeee-IEe7L34yQ" y="20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_5idtFhUrEeee-IEe7L34yQ" type="Association_TargetMultiplicityLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_6JhGABUrEeee-IEe7L34yQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_5idtFxUrEeee-IEe7L34yQ" y="-20"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_5ice8RUrEeee-IEe7L34yQ"/>
+ <element xmi:type="uml:Association" href="elementCreationMenuModel.uml#_gHZ58RUpEeee-IEe7L34yQ"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5ice8hUrEeee-IEe7L34yQ" points="[600, 140, -643984, -643984]$[400, 140, -643984, -643984]$[400, 300, -643984, -643984]$[460, 300, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6LT1wBUrEeee-IEe7L34yQ" id="(0.0,0.704225352112676)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6LUc0BUrEeee-IEe7L34yQ" id="(0.0,0.5825242718446602)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_5ijMoBUrEeee-IEe7L34yQ" type="Generalization_Edge" source="_zU1tMBUrEeee-IEe7L34yQ" target="_zWLxABUrEeee-IEe7L34yQ" routing="Tree">
+ <children xmi:type="notation:DecorationNode" xmi:id="_5ijzsBUrEeee-IEe7L34yQ" type="Generalization_StereotypeLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_6J78wBUrEeee-IEe7L34yQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_5ijzsRUrEeee-IEe7L34yQ" x="1" y="38"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_5ijMoRUrEeee-IEe7L34yQ"/>
+ <element xmi:type="uml:Generalization" href="elementCreationMenuModel.uml#_gHZ59BUpEeee-IEe7L34yQ"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5ijMohUrEeee-IEe7L34yQ" points="[860, 240, -643984, -643984]$[860, 220, -643984, -643984]$[700, 220, -643984, -643984]$[700, 182, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6LVD4BUrEeee-IEe7L34yQ" id="(0.5555555555555556,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6LVD4RUrEeee-IEe7L34yQ" id="(0.5263157894736842,1.0)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_5ilo4BUrEeee-IEe7L34yQ" type="Generalization_Edge" source="_zW3GcBUrEeee-IEe7L34yQ" target="_zWLxABUrEeee-IEe7L34yQ">
+ <children xmi:type="notation:DecorationNode" xmi:id="_5imP8BUrEeee-IEe7L34yQ" type="Generalization_StereotypeLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_5-ndkBUrEeee-IEe7L34yQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_5imP8RUrEeee-IEe7L34yQ" x="-2" y="37"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_5ilo4RUrEeee-IEe7L34yQ"/>
+ <element xmi:type="uml:Generalization" href="elementCreationMenuModel.uml#_gHZ6AhUpEeee-IEe7L34yQ"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5ilo4hUrEeee-IEe7L34yQ" points="[700, 240, -643984, -643984]$[700, 200, -643984, -643984]$[700, 182, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5_LeQBUrEeee-IEe7L34yQ" id="(0.6,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5_MFUBUrEeee-IEe7L34yQ" id="(0.5263157894736842,1.0)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_5ioFIBUrEeee-IEe7L34yQ" type="Generalization_Edge" source="_zViQwBUrEeee-IEe7L34yQ" target="_zWLxABUrEeee-IEe7L34yQ">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NfY5EBUtEeee-IEe7L34yQ" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NfY5ERUtEeee-IEe7L34yQ" key="routing" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_5ipTQBUrEeee-IEe7L34yQ" type="Generalization_StereotypeLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_6KmEEBUrEeee-IEe7L34yQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_5ipTQRUrEeee-IEe7L34yQ" x="1" y="39"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_5ioFIRUrEeee-IEe7L34yQ"/>
+ <element xmi:type="uml:Generalization" href="elementCreationMenuModel.uml#_gHZ54hUpEeee-IEe7L34yQ"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5ioFIhUrEeee-IEe7L34yQ" points="[520, 240, -643984, -643984]$[520, 220, -643984, -643984]$[700, 220, -643984, -643984]$[700, 182, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6LVD4hUrEeee-IEe7L34yQ" id="(0.6,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6LVq8BUrEeee-IEe7L34yQ" id="(0.5263157894736842,1.0)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_8UgW4BUrEeee-IEe7L34yQ" type="Generalization_Edge" source="_zRihkBUrEeee-IEe7L34yQ" target="_zU1tMBUrEeee-IEe7L34yQ">
+ <children xmi:type="notation:DecorationNode" xmi:id="_8UjaMBUrEeee-IEe7L34yQ" type="Generalization_StereotypeLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_-WcZcBUrEeee-IEe7L34yQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_8UjaMRUrEeee-IEe7L34yQ" y="40"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_8UgW4RUrEeee-IEe7L34yQ"/>
+ <element xmi:type="uml:Generalization" href="elementCreationMenuModel.uml#_gHZ6ABUpEeee-IEe7L34yQ"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8UgW4hUrEeee-IEe7L34yQ" points="[116, 133, -643984, -643984]$[116, 193, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-W4eUBUrEeee-IEe7L34yQ" id="(0.4624277456647399,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-W5FYBUrEeee-IEe7L34yQ" id="(0.5555555555555556,1.0)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_gFJvwBUsEeee-IEe7L34yQ" type="Association_Edge" source="_QITRgBUsEeee-IEe7L34yQ" target="_zWLxABUrEeee-IEe7L34yQ">
+ <children xmi:type="notation:DecorationNode" xmi:id="_gFKW0BUsEeee-IEe7L34yQ" type="Association_StereotypeLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gaoQgBUsEeee-IEe7L34yQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_gFKW0RUsEeee-IEe7L34yQ" x="-1" y="-18"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_gFKW0hUsEeee-IEe7L34yQ" type="Association_NameLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ga2S8BUsEeee-IEe7L34yQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_gFKW0xUsEeee-IEe7L34yQ" y="19"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_gFKW1BUsEeee-IEe7L34yQ" type="Association_TargetRoleLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gbCgMBUsEeee-IEe7L34yQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_gFKW1RUsEeee-IEe7L34yQ" x="38" y="-19"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_gFKW1hUsEeee-IEe7L34yQ" type="Association_SourceRoleLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gbRwwBUsEeee-IEe7L34yQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_gFKW1xUsEeee-IEe7L34yQ" x="-120" y="-33"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_gFK94BUsEeee-IEe7L34yQ" type="Association_SourceMultiplicityLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gbgaQBUsEeee-IEe7L34yQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_gFK94RUsEeee-IEe7L34yQ" x="38" y="18"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_gFK94hUsEeee-IEe7L34yQ" type="Association_TargetMultiplicityLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gbvDwBUsEeee-IEe7L34yQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_gFK94xUsEeee-IEe7L34yQ" x="-37" y="-19"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_gFJvwRUsEeee-IEe7L34yQ"/>
+ <element xmi:type="uml:Association" href="elementCreationMenuModel.uml#_gHZ57xUpEeee-IEe7L34yQ"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_gFJvwhUsEeee-IEe7L34yQ" points="[540, 448, -643984, -643984]$[290, 435, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gcAwkBUsEeee-IEe7L34yQ" id="(1.0,0.5825242718446602)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gcAwkRUsEeee-IEe7L34yQ" id="(0.0,0.4225352112676056)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_pgQYQBUsEeee-IEe7L34yQ" type="StereotypeCommentLink" source="_pf7BEBUsEeee-IEe7L34yQ" target="_pgPxMxUsEeee-IEe7L34yQ">
+ <styles xmi:type="notation:FontStyle" xmi:id="_pgQYQRUsEeee-IEe7L34yQ"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_pgQYRRUsEeee-IEe7L34yQ" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="platform:/resource/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.uml#_VkhwQhLoEeeDV7UHoBIkeA"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pgQYQhUsEeee-IEe7L34yQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pgQYQxUsEeee-IEe7L34yQ"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pgQYRBUsEeee-IEe7L34yQ"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_uv3QsBUsEeee-IEe7L34yQ" type="Association_Edge" source="_pf7BEBUsEeee-IEe7L34yQ" target="_zU1tMBUrEeee-IEe7L34yQ">
+ <children xmi:type="notation:DecorationNode" xmi:id="_uv3QsxUsEeee-IEe7L34yQ" type="Association_StereotypeLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_vzqQABUsEeee-IEe7L34yQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_uv3QtBUsEeee-IEe7L34yQ" x="-1" y="-18"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_uv3QtRUsEeee-IEe7L34yQ" type="Association_NameLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_vz6usBUsEeee-IEe7L34yQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_uv3QthUsEeee-IEe7L34yQ" x="-1" y="18"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_uv33wBUsEeee-IEe7L34yQ" type="Association_TargetRoleLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_v0NCkBUsEeee-IEe7L34yQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_uv33wRUsEeee-IEe7L34yQ" x="97" y="-19"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_uv33whUsEeee-IEe7L34yQ" type="Association_SourceRoleLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_v0dhQBUsEeee-IEe7L34yQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_uv33wxUsEeee-IEe7L34yQ" x="-12" y="53"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_uv33xBUsEeee-IEe7L34yQ" type="Association_SourceMultiplicityLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_v0xqUBUsEeee-IEe7L34yQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_uv33xRUsEeee-IEe7L34yQ" x="97" y="18"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_uv33xhUsEeee-IEe7L34yQ" type="Association_TargetMultiplicityLabel">
+ <styles xmi:type="notation:BooleanValueStyle" xmi:id="_v1HBgBUsEeee-IEe7L34yQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_uv33xxUsEeee-IEe7L34yQ" x="-96" y="-18"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_uv3QsRUsEeee-IEe7L34yQ"/>
+ <element xmi:type="uml:Association" href="elementCreationMenuModel.uml#_gHZ5_RUpEeee-IEe7L34yQ"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uv3QshUsEeee-IEe7L34yQ" points="[760, 409, -643984, -643984]$[128, 263, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_v1ifUBUsEeee-IEe7L34yQ" id="(0.0,0.5825242718446602)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_v1jGYBUsEeee-IEe7L34yQ" id="(1.0,0.5825242718446602)"/>
+ </edges>
+</notation:Diagram>
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/models/elementCreationMenuModel.uml b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/models/elementCreationMenuModel.uml
new file mode 100644
index 00000000000..a919113b9d1
--- /dev/null
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/models/elementCreationMenuModel.uml
@@ -0,0 +1,80 @@
+<?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="_gHZ54BUpEeee-IEe7L34yQ" name="elementcreationmenumodel" URI="http://www.eclipse.org/papyrus/infra/newchild/elementcreationmenumodel">
+ <packagedElement xmi:type="uml:Class" xmi:id="_gHZ54RUpEeee-IEe7L34yQ" name="Folder">
+ <generalization xmi:type="uml:Generalization" xmi:id="_gHZ54hUpEeee-IEe7L34yQ" general="_gHZ55hUpEeee-IEe7L34yQ"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_gHZ54xUpEeee-IEe7L34yQ" name="menu" type="_gHZ55hUpEeee-IEe7L34yQ" isOrdered="true" aggregation="composite" association="_gHZ58RUpEeee-IEe7L34yQ">
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gHZ55BUpEeee-IEe7L34yQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gHZ55RUpEeee-IEe7L34yQ" value="*"/>
+ </ownedAttribute>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Class" xmi:id="_gHZ55hUpEeee-IEe7L34yQ" name="Menu" isAbstract="true">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_gHZ55xUpEeee-IEe7L34yQ" name="label" visibility="public">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_gHZ56BUpEeee-IEe7L34yQ" name="icon" visibility="public">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gHZ56RUpEeee-IEe7L34yQ"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_gHZ56hUpEeee-IEe7L34yQ" name="visible" visibility="public" isOrdered="true">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EBoolean"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gHZ56xUpEeee-IEe7L34yQ"/>
+ <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_gHZ57BUpEeee-IEe7L34yQ" value="true">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EBoolean"/>
+ </defaultValue>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_gHZ57RUpEeee-IEe7L34yQ" name="filter" isOrdered="true" aggregation="composite" association="_gHZ57xUpEeee-IEe7L34yQ">
+ <type xmi:type="uml:Interface" href="../../org.eclipse.papyrus.infra.filters/model/filters.uml#_ftlkkHBIEeSbg_BqWNBy6A"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gHZ57hUpEeee-IEe7L34yQ"/>
+ </ownedAttribute>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Association" xmi:id="_gHZ57xUpEeee-IEe7L34yQ" memberEnd="_gHZ57RUpEeee-IEe7L34yQ _gHZ58BUpEeee-IEe7L34yQ">
+ <ownedEnd xmi:type="uml:Property" xmi:id="_gHZ58BUpEeee-IEe7L34yQ" type="_gHZ55hUpEeee-IEe7L34yQ" association="_gHZ57xUpEeee-IEe7L34yQ"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Association" xmi:id="_gHZ58RUpEeee-IEe7L34yQ" memberEnd="_gHZ54xUpEeee-IEe7L34yQ _gHZ58hUpEeee-IEe7L34yQ">
+ <ownedEnd xmi:type="uml:Property" xmi:id="_gHZ58hUpEeee-IEe7L34yQ" type="_gHZ54RUpEeee-IEe7L34yQ" association="_gHZ58RUpEeee-IEe7L34yQ"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Class" xmi:id="_gHZ58xUpEeee-IEe7L34yQ" name="CreationMenu">
+ <generalization xmi:type="uml:Generalization" xmi:id="_gHZ59BUpEeee-IEe7L34yQ" general="_gHZ55hUpEeee-IEe7L34yQ"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_gHZ59RUpEeee-IEe7L34yQ" name="elementType" isOrdered="true" association="_gHZ5_RUpEeee-IEe7L34yQ">
+ <type xmi:type="uml:Class" href="../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.uml#_VkhwQhLoEeeDV7UHoBIkeA"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gHZ59hUpEeee-IEe7L34yQ" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8lc-gCQ1EeefcpkEPbVePg" value="1"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_gHZ5-RUpEeee-IEe7L34yQ" name="role" visibility="public">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gHZ5-hUpEeee-IEe7L34yQ"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_gHZ5-xUpEeee-IEe7L34yQ" name="displayAllRoles" visibility="public">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EBoolean"/>
+ <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_gHZ5_BUpEeee-IEe7L34yQ" value="true">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EBoolean"/>
+ </defaultValue>
+ </ownedAttribute>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Association" xmi:id="_gHZ5_RUpEeee-IEe7L34yQ" memberEnd="_gHZ59RUpEeee-IEe7L34yQ _gHZ5_hUpEeee-IEe7L34yQ">
+ <ownedEnd xmi:type="uml:Property" xmi:id="_gHZ5_hUpEeee-IEe7L34yQ" type="_gHZ58xUpEeee-IEe7L34yQ" association="_gHZ5_RUpEeee-IEe7L34yQ"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Class" xmi:id="_gHZ5_xUpEeee-IEe7L34yQ" name="CreateRelationshipMenu">
+ <generalization xmi:type="uml:Generalization" xmi:id="_gHZ6ABUpEeee-IEe7L34yQ" general="_gHZ58xUpEeee-IEe7L34yQ"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Class" xmi:id="_gHZ6ARUpEeee-IEe7L34yQ" name="Separator">
+ <generalization xmi:type="uml:Generalization" xmi:id="_gHZ6AhUpEeee-IEe7L34yQ" general="_gHZ55hUpEeee-IEe7L34yQ"/>
+ </packagedElement>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_gHZ6AxUpEeee-IEe7L34yQ">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_gHZ6BBUpEeee-IEe7L34yQ" 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 xmi:type="uml:Profile" href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>
+ </profileApplication>
+ </uml:Model>
+ <Ecore:EPackage xmi:id="_gHZ6BRUpEeee-IEe7L34yQ" base_Package="_gHZ54BUpEeee-IEe7L34yQ" nsPrefix="ElementCreationMenuModel" basePackage="org.eclipse.papyrus.infra.newchild"/>
+ <Ecore:EClass xmi:id="_gHZ6BhUpEeee-IEe7L34yQ" base_Class="_gHZ54RUpEeee-IEe7L34yQ"/>
+ <Ecore:EReference xmi:id="_gHZ6BxUpEeee-IEe7L34yQ" base_Property="_gHZ54xUpEeee-IEe7L34yQ"/>
+ <Ecore:EClass xmi:id="_gHZ6CBUpEeee-IEe7L34yQ" base_Class="_gHZ55hUpEeee-IEe7L34yQ"/>
+ <Ecore:EReference xmi:id="_gHZ6CRUpEeee-IEe7L34yQ" base_Property="_gHZ57RUpEeee-IEe7L34yQ"/>
+ <Ecore:EClass xmi:id="_gHZ6ChUpEeee-IEe7L34yQ" base_Class="_gHZ58xUpEeee-IEe7L34yQ"/>
+ <Ecore:EReference xmi:id="_gHZ6CxUpEeee-IEe7L34yQ" base_Property="_gHZ59RUpEeee-IEe7L34yQ"/>
+ <Ecore:EClass xmi:id="_gHZ6DBUpEeee-IEe7L34yQ" base_Class="_gHZ5_xUpEeee-IEe7L34yQ"/>
+ <Ecore:EClass xmi:id="_gHZ6DRUpEeee-IEe7L34yQ" base_Class="_gHZ6ARUpEeee-IEe7L34yQ"/>
+</xmi:XMI>
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/plugin.xml b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/plugin.xml
index 78808c787f5..ed7caee9066 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/plugin.xml
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/plugin.xml
@@ -8,7 +8,7 @@
<package
uri="http://www.eclipse.org/papyrus/infra/newchild/elementcreationmenumodel"
class="org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.ElementCreationMenuModelPackage"
- genModel="resource/elementCreationMenuModel.genmodel"/>
+ genModel="models/elementCreationMenuModel.genmodel"/>
</extension>
<extension point="org.eclipse.emf.ecore.extension_parser">
@@ -23,7 +23,7 @@
<package
uri="http://ElementCreationMenuModel"
class="org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.ElementCreationMenuModelPackage"
- genModel="resource/elementCreationMenuModel.genmodel"/>
+ genModel="models/elementCreationMenuModel.genmodel"/>
</extension>
</plugin>
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/pom.xml b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/pom.xml
index 2cb66d3ccd4..3bfb4aaccb9 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/pom.xml
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/pom.xml
@@ -7,6 +7,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.newchild</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/resource/elementCreationMenuModel.genmodel b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/resource/elementCreationMenuModel.genmodel
deleted file mode 100644
index 485a5704a1f..00000000000
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/resource/elementCreationMenuModel.genmodel
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2013 CEA LIST.&#xD;&#xA; &#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA; &#xD;&#xA;Contributors:&#xD;&#xA;&#x9;CEA LIST - Initial API and implementation&#xD;&#xA;"
- modelDirectory="/org.eclipse.papyrus.infra.newchild/src-gen" editDirectory="/org.eclipse.papyrus.infra.newchild.edit/src-gen"
- editorDirectory="/org.eclipse.papyrus.infra.newchild.editor/src-gen" modelPluginID="org.eclipse.papyrus.infra.newchild"
- modelName="ElementCreationMenuModel" editPluginClass="org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.provider.ElementCreationMenuModelEditPlugin"
- editorPluginClass="org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.presentation.ElementCreationMenuModelEditorPlugin"
- rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory="/org.eclipse.papyrus.infra.newchild.tests/src-gen"
- testSuiteClass="org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.tests.ElementCreationMenuModelAllTests"
- importerID="org.eclipse.emf.importer.ecore" complianceLevel="7.0" copyrightFields="false"
- language="" usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.papyrus.infra.filters/model/filters.genmodel#//filters ../../org.eclipse.uml2.types/model/Types.genmodel#//types"
- operationReflection="true" importOrganizing="true">
- <foreignModel>elementCreationMenuModel.ecore</foreignModel>
- <genPackages prefix="ElementCreationMenuModel" basePackage="org.eclipse.papyrus.infra.newchild"
- resource="XMI" disposableProviderFactory="true" fileExtensions="creationmenumodel"
- ecorePackage="elementCreationMenuModel.ecore#/" publicationLocation="">
- <genClasses ecoreClass="elementCreationMenuModel.ecore#//Folder">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference elementCreationMenuModel.ecore#//Folder/menu"/>
- </genClasses>
- <genClasses image="false" ecoreClass="elementCreationMenuModel.ecore#//Menu">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute elementCreationMenuModel.ecore#//Menu/label"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute elementCreationMenuModel.ecore#//Menu/icon"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute elementCreationMenuModel.ecore#//Menu/visible"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference elementCreationMenuModel.ecore#//Menu/filter"/>
- </genClasses>
- <genClasses ecoreClass="elementCreationMenuModel.ecore#//CreationMenu">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute elementCreationMenuModel.ecore#//CreationMenu/elementTypeIdRef"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute elementCreationMenuModel.ecore#//CreationMenu/role"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute elementCreationMenuModel.ecore#//CreationMenu/displayAllRoles"/>
- </genClasses>
- <genClasses ecoreClass="elementCreationMenuModel.ecore#//CreateRelationshipMenu"/>
- <genClasses ecoreClass="elementCreationMenuModel.ecore#//Separator"/>
- </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/CreateRelationshipMenu.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/CreateRelationshipMenu.java
index db813e7631d..1b1af5d6e90 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/CreateRelationshipMenu.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/CreateRelationshipMenu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2013 CEA LIST.
+ * Copyright (c) 2017 CEA LIST.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/CreationMenu.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/CreationMenu.java
index ba6842d7afd..a1b60e5254a 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/CreationMenu.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/CreationMenu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2013 CEA LIST.
+ * Copyright (c) 2017 CEA LIST.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -12,6 +12,7 @@
*/
package org.eclipse.papyrus.infra.newchild.elementcreationmenumodel;
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
/**
* <!-- begin-user-doc -->
@@ -22,7 +23,7 @@ package org.eclipse.papyrus.infra.newchild.elementcreationmenumodel;
* The following features are supported:
* </p>
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.CreationMenu#getElementTypeIdRef <em>Element Type Id Ref</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.CreationMenu#getElementType <em>Element Type</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.CreationMenu#getRole <em>Role</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.CreationMenu#isDisplayAllRoles <em>Display All Roles</em>}</li>
* </ul>
@@ -33,30 +34,30 @@ package org.eclipse.papyrus.infra.newchild.elementcreationmenumodel;
*/
public interface CreationMenu extends Menu {
/**
- * Returns the value of the '<em><b>Element Type Id Ref</b></em>' attribute.
+ * Returns the value of the '<em><b>Element Type</b></em>' reference.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Element Type Id Ref</em>' attribute isn't clear,
+ * If the meaning of the '<em>Element Type</em>' reference isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Element Type Id Ref</em>' attribute.
- * @see #setElementTypeIdRef(String)
- * @see org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.ElementCreationMenuModelPackage#getCreationMenu_ElementTypeIdRef()
- * @model required="true" ordered="false"
+ * @return the value of the '<em>Element Type</em>' reference.
+ * @see #setElementType(ElementTypeConfiguration)
+ * @see org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.ElementCreationMenuModelPackage#getCreationMenu_ElementType()
+ * @model required="true"
* @generated
*/
- String getElementTypeIdRef();
+ ElementTypeConfiguration getElementType();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.CreationMenu#getElementTypeIdRef <em>Element Type Id Ref</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.CreationMenu#getElementType <em>Element Type</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Element Type Id Ref</em>' attribute.
- * @see #getElementTypeIdRef()
+ * @param value the new value of the '<em>Element Type</em>' reference.
+ * @see #getElementType()
* @generated
*/
- void setElementTypeIdRef(String value);
+ void setElementType(ElementTypeConfiguration value);
/**
* Returns the value of the '<em><b>Role</b></em>' attribute.
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/ElementCreationMenuModelFactory.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/ElementCreationMenuModelFactory.java
index b1e415671f9..902fb934439 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/ElementCreationMenuModelFactory.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/ElementCreationMenuModelFactory.java
@@ -1,14 +1,14 @@
/**
- * Copyright (c) 2013 CEA LIST.
- *
+ * Copyright (c) 2017 CEA LIST.
+ *
* 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:
* CEA LIST - Initial API and implementation
- *
+ *
*/
package org.eclipse.papyrus.infra.newchild.elementcreationmenumodel;
@@ -76,4 +76,4 @@ public interface ElementCreationMenuModelFactory extends EFactory {
*/
ElementCreationMenuModelPackage getElementCreationMenuModelPackage();
-} // ElementCreationMenuModelFactory
+} //ElementCreationMenuModelFactory
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/ElementCreationMenuModelPackage.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/ElementCreationMenuModelPackage.java
index 945bdbf79f3..30c864013f9 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/ElementCreationMenuModelPackage.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/ElementCreationMenuModelPackage.java
@@ -1,14 +1,14 @@
/**
- * Copyright (c) 2013 CEA LIST.
- *
+ * Copyright (c) 2017 CEA LIST.
+ *
* 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:
* CEA LIST - Initial API and implementation
- *
+ *
*/
package org.eclipse.papyrus.infra.newchild.elementcreationmenumodel;
@@ -22,11 +22,11 @@ import org.eclipse.emf.ecore.EReference;
* The <b>Package</b> for the model.
* It contains accessors for the meta objects to represent
* <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each operation of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each operation of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
* @see org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.ElementCreationMenuModelFactory
@@ -250,13 +250,13 @@ public interface ElementCreationMenuModelPackage extends EPackage {
int CREATION_MENU__FILTER = MENU__FILTER;
/**
- * The feature id for the '<em><b>Element Type Id Ref</b></em>' attribute.
+ * The feature id for the '<em><b>Element Type</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int CREATION_MENU__ELEMENT_TYPE_ID_REF = MENU_FEATURE_COUNT + 0;
+ int CREATION_MENU__ELEMENT_TYPE = MENU_FEATURE_COUNT + 0;
/**
* The feature id for the '<em><b>Role</b></em>' attribute.
@@ -341,13 +341,13 @@ public interface ElementCreationMenuModelPackage extends EPackage {
int CREATE_RELATIONSHIP_MENU__FILTER = CREATION_MENU__FILTER;
/**
- * The feature id for the '<em><b>Element Type Id Ref</b></em>' attribute.
+ * The feature id for the '<em><b>Element Type</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int CREATE_RELATIONSHIP_MENU__ELEMENT_TYPE_ID_REF = CREATION_MENU__ELEMENT_TYPE_ID_REF;
+ int CREATE_RELATIONSHIP_MENU__ELEMENT_TYPE = CREATION_MENU__ELEMENT_TYPE;
/**
* The feature id for the '<em><b>Role</b></em>' attribute.
@@ -449,6 +449,7 @@ public interface ElementCreationMenuModelPackage extends EPackage {
*/
int SEPARATOR_OPERATION_COUNT = MENU_OPERATION_COUNT + 0;
+
/**
* Returns the meta object for class '{@link org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.Folder <em>Folder</em>}'.
* <!-- begin-user-doc -->
@@ -535,15 +536,15 @@ public interface ElementCreationMenuModelPackage extends EPackage {
EClass getCreationMenu();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.CreationMenu#getElementTypeIdRef <em>Element Type Id Ref</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.CreationMenu#getElementType <em>Element Type</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Element Type Id Ref</em>'.
- * @see org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.CreationMenu#getElementTypeIdRef()
+ * @return the meta object for the reference '<em>Element Type</em>'.
+ * @see org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.CreationMenu#getElementType()
* @see #getCreationMenu()
* @generated
*/
- EAttribute getCreationMenu_ElementTypeIdRef();
+ EReference getCreationMenu_ElementType();
/**
* Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.CreationMenu#getRole <em>Role</em>}'.
@@ -600,11 +601,11 @@ public interface ElementCreationMenuModelPackage extends EPackage {
* <!-- begin-user-doc -->
* Defines literals for the meta objects that represent
* <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each operation of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each operation of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
* @generated
@@ -681,12 +682,12 @@ public interface ElementCreationMenuModelPackage extends EPackage {
EClass CREATION_MENU = eINSTANCE.getCreationMenu();
/**
- * The meta object literal for the '<em><b>Element Type Id Ref</b></em>' attribute feature.
+ * The meta object literal for the '<em><b>Element Type</b></em>' reference feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- EAttribute CREATION_MENU__ELEMENT_TYPE_ID_REF = eINSTANCE.getCreationMenu_ElementTypeIdRef();
+ EReference CREATION_MENU__ELEMENT_TYPE = eINSTANCE.getCreationMenu_ElementType();
/**
* The meta object literal for the '<em><b>Role</b></em>' attribute feature.
@@ -726,4 +727,4 @@ public interface ElementCreationMenuModelPackage extends EPackage {
}
-} // ElementCreationMenuModelPackage
+} //ElementCreationMenuModelPackage
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/Folder.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/Folder.java
index 1ecd7979991..dfb59a50712 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/Folder.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/Folder.java
@@ -1,14 +1,14 @@
/**
- * Copyright (c) 2013 CEA LIST.
- *
+ * Copyright (c) 2017 CEA LIST.
+ *
* 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:
* CEA LIST - Initial API and implementation
- *
+ *
*/
package org.eclipse.papyrus.infra.newchild.elementcreationmenumodel;
@@ -36,7 +36,8 @@ public interface Folder extends Menu {
* The list contents are of type {@link org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.Menu}.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Menu</em>' containment reference list isn't clear, there really should be more of a description here...
+ * If the meaning of the '<em>Menu</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>Menu</em>' containment reference list.
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/Menu.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/Menu.java
index e71fe059789..211c5296996 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/Menu.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/Menu.java
@@ -1,14 +1,14 @@
/**
- * Copyright (c) 2013 CEA LIST.
- *
+ * Copyright (c) 2017 CEA LIST.
+ *
* 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:
* CEA LIST - Initial API and implementation
- *
+ *
*/
package org.eclipse.papyrus.infra.newchild.elementcreationmenumodel;
@@ -39,7 +39,8 @@ public interface Menu extends EObject {
* Returns the value of the '<em><b>Label</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Label</em>' attribute isn't clear, there really should be more of a description here...
+ * If the meaning of the '<em>Label</em>' attribute isn't clear,
+ * there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Label</em>' attribute.
@@ -64,7 +65,8 @@ public interface Menu extends EObject {
* Returns the value of the '<em><b>Icon</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Icon</em>' attribute isn't clear, there really should be more of a description here...
+ * If the meaning of the '<em>Icon</em>' attribute isn't clear,
+ * there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Icon</em>' attribute.
@@ -90,7 +92,8 @@ public interface Menu extends EObject {
* The default value is <code>"true"</code>.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Visible</em>' attribute isn't clear, there really should be more of a description here...
+ * If the meaning of the '<em>Visible</em>' attribute isn't clear,
+ * there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Visible</em>' attribute.
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/Separator.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/Separator.java
index 8ed139b8ddf..192cc10cad4 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/Separator.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/Separator.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2013 CEA LIST.
+ * Copyright (c) 2017 CEA LIST.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/CreateRelationshipMenuImpl.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/CreateRelationshipMenuImpl.java
index ce410f3c31c..d3bf4210dac 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/CreateRelationshipMenuImpl.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/CreateRelationshipMenuImpl.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2013 CEA LIST.
+ * Copyright (c) 2017 CEA LIST.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/CreationMenuImpl.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/CreationMenuImpl.java
index 84811b4abb8..21acc4744e2 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/CreationMenuImpl.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/CreationMenuImpl.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2013 CEA LIST.
+ * Copyright (c) 2017 CEA LIST.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -15,11 +15,13 @@ package org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.impl;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.CreationMenu;
import org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.ElementCreationMenuModelPackage;
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
/**
* <!-- begin-user-doc -->
@@ -29,7 +31,7 @@ import org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.ElementCreati
* The following features are implemented:
* </p>
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.impl.CreationMenuImpl#getElementTypeIdRef <em>Element Type Id Ref</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.impl.CreationMenuImpl#getElementType <em>Element Type</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.impl.CreationMenuImpl#getRole <em>Role</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.impl.CreationMenuImpl#isDisplayAllRoles <em>Display All Roles</em>}</li>
* </ul>
@@ -38,24 +40,14 @@ import org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.ElementCreati
*/
public class CreationMenuImpl extends MenuImpl implements CreationMenu {
/**
- * The default value of the '{@link #getElementTypeIdRef() <em>Element Type Id Ref</em>}' attribute.
+ * The cached value of the '{@link #getElementType() <em>Element Type</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getElementTypeIdRef()
+ * @see #getElementType()
* @generated
* @ordered
*/
- protected static final String ELEMENT_TYPE_ID_REF_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getElementTypeIdRef() <em>Element Type Id Ref</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getElementTypeIdRef()
- * @generated
- * @ordered
- */
- protected String elementTypeIdRef = ELEMENT_TYPE_ID_REF_EDEFAULT;
+ protected ElementTypeConfiguration elementType;
/**
* The default value of the '{@link #getRole() <em>Role</em>}' attribute.
@@ -121,8 +113,25 @@ public class CreationMenuImpl extends MenuImpl implements CreationMenu {
* <!-- end-user-doc -->
* @generated
*/
- public String getElementTypeIdRef() {
- return elementTypeIdRef;
+ public ElementTypeConfiguration getElementType() {
+ if (elementType != null && elementType.eIsProxy()) {
+ InternalEObject oldElementType = (InternalEObject)elementType;
+ elementType = (ElementTypeConfiguration)eResolveProxy(oldElementType);
+ if (elementType != oldElementType) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, ElementCreationMenuModelPackage.CREATION_MENU__ELEMENT_TYPE, oldElementType, elementType));
+ }
+ }
+ return elementType;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ElementTypeConfiguration basicGetElementType() {
+ return elementType;
}
/**
@@ -130,11 +139,11 @@ public class CreationMenuImpl extends MenuImpl implements CreationMenu {
* <!-- end-user-doc -->
* @generated
*/
- public void setElementTypeIdRef(String newElementTypeIdRef) {
- String oldElementTypeIdRef = elementTypeIdRef;
- elementTypeIdRef = newElementTypeIdRef;
+ public void setElementType(ElementTypeConfiguration newElementType) {
+ ElementTypeConfiguration oldElementType = elementType;
+ elementType = newElementType;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ElementCreationMenuModelPackage.CREATION_MENU__ELEMENT_TYPE_ID_REF, oldElementTypeIdRef, elementTypeIdRef));
+ eNotify(new ENotificationImpl(this, Notification.SET, ElementCreationMenuModelPackage.CREATION_MENU__ELEMENT_TYPE, oldElementType, elementType));
}
/**
@@ -187,8 +196,9 @@ public class CreationMenuImpl extends MenuImpl implements CreationMenu {
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
- case ElementCreationMenuModelPackage.CREATION_MENU__ELEMENT_TYPE_ID_REF:
- return getElementTypeIdRef();
+ case ElementCreationMenuModelPackage.CREATION_MENU__ELEMENT_TYPE:
+ if (resolve) return getElementType();
+ return basicGetElementType();
case ElementCreationMenuModelPackage.CREATION_MENU__ROLE:
return getRole();
case ElementCreationMenuModelPackage.CREATION_MENU__DISPLAY_ALL_ROLES:
@@ -205,8 +215,8 @@ public class CreationMenuImpl extends MenuImpl implements CreationMenu {
@Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
- case ElementCreationMenuModelPackage.CREATION_MENU__ELEMENT_TYPE_ID_REF:
- setElementTypeIdRef((String)newValue);
+ case ElementCreationMenuModelPackage.CREATION_MENU__ELEMENT_TYPE:
+ setElementType((ElementTypeConfiguration)newValue);
return;
case ElementCreationMenuModelPackage.CREATION_MENU__ROLE:
setRole((String)newValue);
@@ -226,8 +236,8 @@ public class CreationMenuImpl extends MenuImpl implements CreationMenu {
@Override
public void eUnset(int featureID) {
switch (featureID) {
- case ElementCreationMenuModelPackage.CREATION_MENU__ELEMENT_TYPE_ID_REF:
- setElementTypeIdRef(ELEMENT_TYPE_ID_REF_EDEFAULT);
+ case ElementCreationMenuModelPackage.CREATION_MENU__ELEMENT_TYPE:
+ setElementType((ElementTypeConfiguration)null);
return;
case ElementCreationMenuModelPackage.CREATION_MENU__ROLE:
setRole(ROLE_EDEFAULT);
@@ -247,8 +257,8 @@ public class CreationMenuImpl extends MenuImpl implements CreationMenu {
@Override
public boolean eIsSet(int featureID) {
switch (featureID) {
- case ElementCreationMenuModelPackage.CREATION_MENU__ELEMENT_TYPE_ID_REF:
- return ELEMENT_TYPE_ID_REF_EDEFAULT == null ? elementTypeIdRef != null : !ELEMENT_TYPE_ID_REF_EDEFAULT.equals(elementTypeIdRef);
+ case ElementCreationMenuModelPackage.CREATION_MENU__ELEMENT_TYPE:
+ return elementType != null;
case ElementCreationMenuModelPackage.CREATION_MENU__ROLE:
return ROLE_EDEFAULT == null ? role != null : !ROLE_EDEFAULT.equals(role);
case ElementCreationMenuModelPackage.CREATION_MENU__DISPLAY_ALL_ROLES:
@@ -267,9 +277,7 @@ public class CreationMenuImpl extends MenuImpl implements CreationMenu {
if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString());
- result.append(" (elementTypeIdRef: ");
- result.append(elementTypeIdRef);
- result.append(", role: ");
+ result.append(" (role: ");
result.append(role);
result.append(", displayAllRoles: ");
result.append(displayAllRoles);
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/ElementCreationMenuModelFactoryImpl.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/ElementCreationMenuModelFactoryImpl.java
index 4b7164f0f22..5d13dfdc7b4 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/ElementCreationMenuModelFactoryImpl.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/ElementCreationMenuModelFactoryImpl.java
@@ -1,22 +1,25 @@
/**
- * Copyright (c) 2013 CEA LIST.
- *
+ * Copyright (c) 2017 CEA LIST.
+ *
* 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:
* CEA LIST - Initial API and implementation
- *
+ *
*/
package org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.impl;
import org.eclipse.emf.ecore.EClass;
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.newchild.elementcreationmenumodel.*;
/**
@@ -132,4 +135,4 @@ public class ElementCreationMenuModelFactoryImpl extends EFactoryImpl implements
return ElementCreationMenuModelPackage.eINSTANCE;
}
-} // ElementCreationMenuModelFactoryImpl
+} //ElementCreationMenuModelFactoryImpl
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/ElementCreationMenuModelPackageImpl.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/ElementCreationMenuModelPackageImpl.java
index bb897ad68da..81129b07e88 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/ElementCreationMenuModelPackageImpl.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/ElementCreationMenuModelPackageImpl.java
@@ -1,14 +1,14 @@
/**
- * Copyright (c) 2013 CEA LIST.
- *
+ * Copyright (c) 2017 CEA LIST.
+ *
* 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:
* CEA LIST - Initial API and implementation
- *
+ *
*/
package org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.impl;
@@ -26,6 +26,8 @@ import org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.ElementCreati
import org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.Folder;
import org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.Menu;
import org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.Separator;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+import org.eclipse.uml2.types.TypesPackage;
/**
* <!-- begin-user-doc -->
@@ -77,7 +79,8 @@ public class ElementCreationMenuModelPackageImpl extends EPackageImpl implements
* 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 -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @see org.eclipse.emf.ecore.EPackage.Registry
* @see org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.ElementCreationMenuModelPackage#eNS_URI
* @see #init()
@@ -99,8 +102,8 @@ public class ElementCreationMenuModelPackageImpl extends EPackageImpl implements
*
* <p>This method is used to initialize {@link ElementCreationMenuModelPackage#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 -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @see #eNS_URI
* @see #createPackageContents()
* @see #initializePackageContents()
@@ -116,7 +119,9 @@ public class ElementCreationMenuModelPackageImpl extends EPackageImpl implements
// Initialize simple dependencies
EcorePackage.eINSTANCE.eClass();
+ ElementTypesConfigurationsPackage.eINSTANCE.eClass();
FiltersPackage.eINSTANCE.eClass();
+ TypesPackage.eINSTANCE.eClass();
// Create package meta-data objects
theElementCreationMenuModelPackage.createPackageContents();
@@ -210,8 +215,8 @@ public class ElementCreationMenuModelPackageImpl extends EPackageImpl implements
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getCreationMenu_ElementTypeIdRef() {
- return (EAttribute)creationMenuEClass.getEStructuralFeatures().get(0);
+ public EReference getCreationMenu_ElementType() {
+ return (EReference)creationMenuEClass.getEStructuralFeatures().get(0);
}
/**
@@ -288,7 +293,7 @@ public class ElementCreationMenuModelPackageImpl extends EPackageImpl implements
createEReference(menuEClass, MENU__FILTER);
creationMenuEClass = createEClass(CREATION_MENU);
- createEAttribute(creationMenuEClass, CREATION_MENU__ELEMENT_TYPE_ID_REF);
+ createEReference(creationMenuEClass, CREATION_MENU__ELEMENT_TYPE);
createEAttribute(creationMenuEClass, CREATION_MENU__ROLE);
createEAttribute(creationMenuEClass, CREATION_MENU__DISPLAY_ALL_ROLES);
@@ -321,8 +326,8 @@ public class ElementCreationMenuModelPackageImpl extends EPackageImpl implements
setNsURI(eNS_URI);
// Obtain other dependent packages
- EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
FiltersPackage theFiltersPackage = (FiltersPackage)EPackage.Registry.INSTANCE.getEPackage(FiltersPackage.eNS_URI);
+ ElementTypesConfigurationsPackage theElementTypesConfigurationsPackage = (ElementTypesConfigurationsPackage)EPackage.Registry.INSTANCE.getEPackage(ElementTypesConfigurationsPackage.eNS_URI);
// Create type parameters
@@ -339,15 +344,15 @@ public class ElementCreationMenuModelPackageImpl extends EPackageImpl implements
initEReference(getFolder_Menu(), this.getMenu(), null, "menu", null, 0, -1, Folder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(menuEClass, Menu.class, "Menu", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getMenu_Label(), theEcorePackage.getEString(), "label", null, 1, 1, Menu.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
- initEAttribute(getMenu_Icon(), theEcorePackage.getEString(), "icon", null, 0, 1, Menu.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+ initEAttribute(getMenu_Label(), ecorePackage.getEString(), "label", null, 1, 1, Menu.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+ initEAttribute(getMenu_Icon(), ecorePackage.getEString(), "icon", null, 0, 1, Menu.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
initEAttribute(getMenu_Visible(), ecorePackage.getEBoolean(), "visible", "true", 0, 1, Menu.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getMenu_Filter(), theFiltersPackage.getFilter(), null, "filter", null, 0, 1, Menu.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(creationMenuEClass, CreationMenu.class, "CreationMenu", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getCreationMenu_ElementTypeIdRef(), theEcorePackage.getEString(), "elementTypeIdRef", null, 1, 1, CreationMenu.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
- initEAttribute(getCreationMenu_Role(), theEcorePackage.getEString(), "role", null, 0, 1, CreationMenu.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
- initEAttribute(getCreationMenu_DisplayAllRoles(), theEcorePackage.getEBoolean(), "displayAllRoles", "true", 1, 1, CreationMenu.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+ initEReference(getCreationMenu_ElementType(), theElementTypesConfigurationsPackage.getElementTypeConfiguration(), null, "elementType", null, 1, 1, CreationMenu.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getCreationMenu_Role(), ecorePackage.getEString(), "role", null, 0, 1, CreationMenu.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+ initEAttribute(getCreationMenu_DisplayAllRoles(), ecorePackage.getEBoolean(), "displayAllRoles", "true", 1, 1, CreationMenu.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
initEClass(createRelationshipMenuEClass, CreateRelationshipMenu.class, "CreateRelationshipMenu", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -357,4 +362,4 @@ public class ElementCreationMenuModelPackageImpl extends EPackageImpl implements
createResource(eNS_URI);
}
-} // ElementCreationMenuModelPackageImpl
+} //ElementCreationMenuModelPackageImpl
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/FolderImpl.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/FolderImpl.java
index ec01fef8f87..7108f5661f9 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/FolderImpl.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/FolderImpl.java
@@ -1,25 +1,29 @@
/**
- * Copyright (c) 2013 CEA LIST.
- *
+ * Copyright (c) 2017 CEA LIST.
+ *
* 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:
* CEA LIST - Initial API and implementation
- *
+ *
*/
package org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.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.newchild.elementcreationmenumodel.ElementCreationMenuModelPackage;
import org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.Folder;
import org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.Menu;
@@ -153,4 +157,4 @@ public class FolderImpl extends MenuImpl implements Folder {
return super.eIsSet(featureID);
}
-} // FolderImpl
+} //FolderImpl
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/MenuImpl.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/MenuImpl.java
index 42db1f7c0eb..5f374515052 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/MenuImpl.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/MenuImpl.java
@@ -1,21 +1,23 @@
/**
- * Copyright (c) 2013 CEA LIST.
- *
+ * Copyright (c) 2017 CEA LIST.
+ *
* 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:
* CEA LIST - Initial API and implementation
- *
+ *
*/
package org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.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.InternalEObject;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
import org.eclipse.papyrus.infra.filters.Filter;
@@ -356,4 +358,4 @@ public abstract class MenuImpl extends MinimalEObjectImpl.Container implements M
return result.toString();
}
-} // MenuImpl
+} //MenuImpl
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/SeparatorImpl.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/SeparatorImpl.java
index ba26430fc4f..7117175e601 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/SeparatorImpl.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/SeparatorImpl.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2013 CEA LIST.
+ * Copyright (c) 2017 CEA LIST.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelAdapterFactory.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelAdapterFactory.java
index becb049b50f..a0fd629ba99 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelAdapterFactory.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelAdapterFactory.java
@@ -1,21 +1,24 @@
/**
- * Copyright (c) 2013 CEA LIST.
- *
+ * Copyright (c) 2017 CEA LIST.
+ *
* 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:
* CEA LIST - Initial API and implementation
- *
+ *
*/
package org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.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.newchild.elementcreationmenumodel.*;
/**
@@ -73,7 +76,7 @@ public class ElementCreationMenuModelAdapterFactory extends AdapterFactoryImpl {
* @generated
*/
protected ElementCreationMenuModelSwitch<Adapter> modelSwitch =
- new ElementCreationMenuModelSwitch<Adapter>() {
+ new ElementCreationMenuModelSwitch<Adapter>() {
@Override
public Adapter caseFolder(Folder object) {
return createFolderAdapter();
@@ -196,4 +199,4 @@ public class ElementCreationMenuModelAdapterFactory extends AdapterFactoryImpl {
return null;
}
-} // ElementCreationMenuModelAdapterFactory
+} //ElementCreationMenuModelAdapterFactory
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelResourceFactoryImpl.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelResourceFactoryImpl.java
index 96a82ed16b7..556d42b1dd4 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelResourceFactoryImpl.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelResourceFactoryImpl.java
@@ -1,21 +1,25 @@
/**
- * Copyright (c) 2013 CEA LIST.
- *
+ * Copyright (c) 2017 CEA LIST.
+ *
* 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:
* CEA LIST - Initial API and implementation
- *
+ *
*/
package org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.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;
+
/**
* <!-- begin-user-doc -->
* The <b>Resource Factory</b> associated with the package.
@@ -42,8 +46,8 @@ public class ElementCreationMenuModelResourceFactoryImpl extends ResourceFactory
*/
@Override
public Resource createResource(URI uri) {
- Resource result = new ElementCreationMenuModelResourceImpl(uri);
+ XMLResource result = new ElementCreationMenuModelResourceImpl(uri);
return result;
}
-} // ElementCreationMenuModelResourceFactoryImpl
+} //ElementCreationMenuModelResourceFactoryImpl
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelResourceImpl.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelResourceImpl.java
index 71fa2107a43..71009ae241a 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelResourceImpl.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelResourceImpl.java
@@ -1,18 +1,19 @@
/**
- * Copyright (c) 2013 CEA LIST.
- *
+ * Copyright (c) 2017 CEA LIST.
+ *
* 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:
* CEA LIST - Initial API and implementation
- *
+ *
*/
package org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.util;
import org.eclipse.emf.common.util.URI;
+
import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
/**
@@ -34,4 +35,4 @@ public class ElementCreationMenuModelResourceImpl extends XMIResourceImpl {
super(uri);
}
-} // ElementCreationMenuModelResourceImpl
+} //ElementCreationMenuModelResourceImpl
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelSwitch.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelSwitch.java
index 0fc45111c7d..7deb66c40cb 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelSwitch.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelSwitch.java
@@ -1,26 +1,29 @@
/**
- * Copyright (c) 2013 CEA LIST.
- *
+ * Copyright (c) 2017 CEA LIST.
+ *
* 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:
* CEA LIST - Initial API and implementation
- *
+ *
*/
package org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.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.newchild.elementcreationmenumodel.*;
/**
* <!-- begin-user-doc -->
* The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * to invoke the <code>caseXXX</code> method for each class of the model,
* starting with the actual class of the object
* and proceeding up the inheritance hierarchy
* until a non-null result is returned,
@@ -203,4 +206,4 @@ public class ElementCreationMenuModelSwitch<T> extends Switch<T> {
return null;
}
-} // ElementCreationMenuModelSwitch
+} //ElementCreationMenuModelSwitch
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelXMLProcessor.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelXMLProcessor.java
deleted file mode 100644
index 5af50b5eb4d..00000000000
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelXMLProcessor.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * Copyright (c) 2013 CEA LIST.
- *
- * 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:
- * CEA LIST - Initial API and implementation
- *
- */
-package org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.util;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-import org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.ElementCreationMenuModelPackage;
-
-/**
- * This class contains helper methods to serialize and deserialize XML documents
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class ElementCreationMenuModelXMLProcessor extends XMLProcessor {
-
- /**
- * Public constructor to instantiate the helper.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public ElementCreationMenuModelXMLProcessor() {
- super((EPackage.Registry.INSTANCE));
- ElementCreationMenuModelPackage.eINSTANCE.eClass();
- }
-
- /**
- * Register for "*" and "xml" file extensions the ElementCreationMenuModelResourceFactoryImpl factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected Map<String, Resource.Factory> getRegistrations() {
- if (registrations == null) {
- super.getRegistrations();
- registrations.put(XML_EXTENSION, new ElementCreationMenuModelResourceFactoryImpl());
- registrations.put(STAR_EXTENSION, new ElementCreationMenuModelResourceFactoryImpl());
- }
- return registrations;
- }
-
-} // ElementCreationMenuModelXMLProcessor
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuFactory.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuFactory.java
index 6bb0aebb3a3..d95c14c52c6 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuFactory.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuFactory.java
@@ -58,6 +58,7 @@ import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
import org.eclipse.papyrus.infra.services.edit.utils.RequestCacheEntries;
import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
import org.eclipse.papyrus.infra.services.semantic.service.SemanticService;
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
import org.eclipse.papyrus.infra.ui.emf.providers.strategy.SemanticEMFContentProvider;
import org.eclipse.papyrus.infra.ui.providers.DelegatingPapyrusContentProvider;
import org.eclipse.papyrus.infra.ui.providers.ISemanticContentProviderFactory;
@@ -292,7 +293,7 @@ public class CreationMenuFactory {
if (eStructuralFeature instanceof EReference) {
EReference ref = (EReference) eStructuralFeature;
if (ref.isContainment()) {
- IElementType menuType = getElementType(currentCreationMenu.getElementTypeIdRef(), context);
+ IElementType menuType = getElementType(currentCreationMenu.getElementType(),context);
if (menuType != null && isSubClass(ref.getEType(), menuType.getEClass())) {
possibleEFeatures.add(eStructuralFeature);
}
@@ -331,7 +332,7 @@ public class CreationMenuFactory {
* the current menu
*/
protected void createIconFromElementType(CreationMenu currentCreationMenu, MenuItem item, IClientContext context) {
- IElementType elementType = getElementType(currentCreationMenu.getElementTypeIdRef(), context);
+ IElementType elementType = getElementType(currentCreationMenu.getElementType(),context);
if (elementType != null) {
URL iconURL = elementType.getIconURL();
if (iconURL != null) {
@@ -377,17 +378,17 @@ public class CreationMenuFactory {
}
return false;
}
-
+
/**
- * get the IelementType from a string
+ * get the IelementType from a EReference with context check
*
* @param elementType
* the string that represents the element type
* @return the element type or null
+ *
*/
- protected IElementType getElementType(String elementType, IClientContext context) {
-
- IElementType type = ElementTypeRegistry.getInstance().getType(elementType);
+ protected IElementType getElementType(ElementTypeConfiguration elementTypeConfiguration, IClientContext context) {
+ IElementType type = ElementTypeRegistry.getInstance().getType(elementTypeConfiguration.getIdentifier());
return (type != null && context.includes(type)) ? type : null;
@@ -412,7 +413,7 @@ public class CreationMenuFactory {
return UnexecutableCommand.INSTANCE;
}
- IElementType elementType = getElementType(creationMenu.getElementTypeIdRef(), context);
+ IElementType elementType = getElementType(creationMenu.getElementType(),context);
if (elementType == null) {
return UnexecutableCommand.INSTANCE;
}
@@ -451,8 +452,7 @@ public class CreationMenuFactory {
* the creation request to use in this handler
*/
protected CreateElementRequest buildRequest(EReference reference, EObject container, CreationMenu creationMenu, Map<?, ?> adviceCache, IClientContext context) {
- String elementTypeId = creationMenu.getElementTypeIdRef();
- IElementType elementtype = getElementType(elementTypeId, context);
+ IElementType elementtype = getElementType(creationMenu.getElementType(),context);
CreateElementRequest request = null;
if (reference == null) {
@@ -478,8 +478,7 @@ public class CreationMenuFactory {
* the creation request to use in this handler
*/
protected CreateElementRequest buildRequest(EReference reference, EObject container, CreationMenu creationMenu, IClientContext context) {
- String typeId = creationMenu.getElementTypeIdRef();
- IElementType elementtype = getElementType(typeId, context);
+ IElementType elementtype = getElementType(creationMenu.getElementType(),context);
if (elementtype != null) {
if (reference == null) {

Back to the top