Merged branch 0.7.X changes r3519:3548 into the trunk

489 files changed, 22081 insertions, 8542 deletions

diff --git a/features/org.eclipse.papyrus.backbone-feature/feature.xml b/features/org.eclipse.papyrus.backbone-feature/feature.xml
index f8082503cae..28bec74d858 100644
--- a/features/org.eclipse.papyrus.backbone-feature/feature.xml
+++ b/features/org.eclipse.papyrus.backbone-feature/feature.xml
@@ -155,7 +155,7 @@ http://www.eclipse.org/legal/epl-v10.html
          unpack="false"/>

 

    <plugin

-         id="org.eclipse.papyrus.controlmode"

+         id="org.eclipse.papyrus.validation"

          download-size="0"

          install-size="0"

          version="0.0.0"

diff --git a/plugins/core/org.eclipse.papyrus.modelexplorer/META-INF/MANIFEST.MF b/plugins/core/org.eclipse.papyrus.modelexplorer/META-INF/MANIFEST.MF
index 3af2e95114d..300874343af 100644
--- a/plugins/core/org.eclipse.papyrus.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/core/org.eclipse.papyrus.modelexplorer/META-INF/MANIFEST.MF
@@ -26,7 +26,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.workspace.ui;bundle-version="1.3.0",
  org.eclipse.core.expressions;bundle-version="3.4.200",
  org.eclipse.papyrus.service.edit;bundle-version="0.8.0",
- org.apache.commons.lang;bundle-version="2.3.0"
+ org.eclipse.gmt.modisco.infra.common.core;bundle-version="0.8.0",
+ org.eclipse.papyrus.validation;bundle-version="0.7.1"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: %providerName
diff --git a/plugins/core/org.eclipse.papyrus.modelexplorer/src/org/eclipse/papyrus/modelexplorer/MoDiscoLabelProvider.java b/plugins/core/org.eclipse.papyrus.modelexplorer/src/org/eclipse/papyrus/modelexplorer/MoDiscoLabelProvider.java
index 7be355297ac..8c6c4ba20f2 100644
--- a/plugins/core/org.eclipse.papyrus.modelexplorer/src/org/eclipse/papyrus/modelexplorer/MoDiscoLabelProvider.java
+++ b/plugins/core/org.eclipse.papyrus.modelexplorer/src/org/eclipse/papyrus/modelexplorer/MoDiscoLabelProvider.java
@@ -14,9 +14,7 @@
  *****************************************************************************/

 package org.eclipse.papyrus.modelexplorer;

 

-import org.apache.commons.lang.WordUtils;

 import org.eclipse.core.resources.IMarker;

-import org.eclipse.core.runtime.CoreException;

 import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.InternalEObject;

@@ -29,7 +27,7 @@ import org.eclipse.papyrus.core.editorsfactory.IPageIconsRegistry;
 import org.eclipse.papyrus.core.editorsfactory.PageIconsRegistry;

 import org.eclipse.papyrus.core.services.ServiceException;

 import org.eclipse.papyrus.core.utils.EditorUtils;

-import org.eclipse.papyrus.modelexplorer.validation.ValidationTool;

+import org.eclipse.papyrus.validation.ValidationTool;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.swt.graphics.Point;

 import org.eclipse.ui.ISharedImages;

@@ -51,45 +49,9 @@ public class MoDiscoLabelProvider extends CustomizableModelLabelProvider {
 	public String getMarkerMessage(Object element) {

 		

 		ValidationTool vt = new ValidationTool (element);

-		IMarker markers[] = vt.getMarkers();

-		if (markers != null) {

-			boolean examineChilds = true;

-			String message = "";

-			for (IMarker marker : markers) {

-				EObject eObjectOfMarker = vt.eObjectOfMarker(marker);

-				if (eObjectOfMarker == vt.getEObject()) {

-					if (message.length() > 0) {

-						message += "\n";

-					}

-					// vt.getWrappedMessage (marker);

-					try {

-						message += "- " + WordUtils.wrap ((String) marker.getAttribute(IMarker.MESSAGE), 100, "\n  ", true);

-					}

-					catch (CoreException e) {

-					}

-				}

-				if (examineChilds && (eObjectOfMarker != null)) {

-					eObjectOfMarker = eObjectOfMarker.eContainer();

-					while (eObjectOfMarker != null) {

-						if (eObjectOfMarker == vt.getEObject ()) {

-							if (message.length() > 0) {

-								message += "\n";

-							}

-							message += "- Problem marker in (at least) one of the children";

-							examineChilds = false;

-							break;

-						}

-						// navigate to parents, since parent folder is contaminated as well

-						eObjectOfMarker = eObjectOfMarker.eContainer();

-					}

-				}

-			}

-			return (message.length() > 0) ? message : null; 

-		}

-		return null;

+		return vt.getMarkerMessages();

 	}

 	

-	// A virer (??)

 	@Override

 	/**

 	 * return the image of an element in the model browser

@@ -99,27 +61,7 @@ public class MoDiscoLabelProvider extends CustomizableModelLabelProvider {
 	      

 		ValidationTool vt = new ValidationTool (element);

 		vt.tryChildIfEmpty();

-		int severity = 0;

-		IMarker markers[] = vt.getMarkers();

-		if (markers != null) {

-			for (IMarker marker : markers) {

-				EObject eObjectOfMarker = vt.eObjectOfMarker(marker);

-				while (eObjectOfMarker != null) {

-					if (eObjectOfMarker == vt.getEObject()) {

-						try {

-							Integer severityI = (Integer) marker.getAttribute(IMarker.SEVERITY);

-							if (severityI.intValue () > severity) {

-								severity = severityI.intValue();

-							}

-						}

-						catch (CoreException e) {

-						}

-					}

-					// navigate to parents, since parent folder is contaminated as well

-					eObjectOfMarker = eObjectOfMarker.eContainer();

-				}

-			}

-		}

+		int severity = vt.getSeverity();

 		if(element instanceof Diagram) {

 			return getDecoratedImage (getEditorRegistry().getEditorIcon(element), severity);

 		}

@@ -209,9 +151,9 @@ public class MoDiscoLabelProvider extends CustomizableModelLabelProvider {
 			text = diagram.getName();

 		} else if(element instanceof IAdaptable) {

 			EObject obj = (EObject)((IAdaptable)element).getAdapter(EObject.class);

-			if(obj.eIsProxy()) {

+			if(obj != null && obj.eIsProxy()) {

 				InternalEObject internal = (InternalEObject)obj;

-				text = "unreachable " + obj.getClass().getSimpleName() + " in " + internal.eProxyURI().trimFragment();;

+				text = "Unreachable " + obj.getClass().getSimpleName() + " in " + internal.eProxyURI().trimFragment();;

 			} else {

 				text = super.getText(element);

 			}

diff --git a/plugins/core/org.eclipse.papyrus.modelexplorer/src/org/eclipse/papyrus/modelexplorer/commands/AbstractValidateCommand.java b/plugins/core/org.eclipse.papyrus.modelexplorer/src/org/eclipse/papyrus/modelexplorer/commands/AbstractValidateCommand.java
index a18db6a40f5..84c503bacc8 100644
--- a/plugins/core/org.eclipse.papyrus.modelexplorer/src/org/eclipse/papyrus/modelexplorer/commands/AbstractValidateCommand.java
+++ b/plugins/core/org.eclipse.papyrus.modelexplorer/src/org/eclipse/papyrus/modelexplorer/commands/AbstractValidateCommand.java
@@ -36,7 +36,7 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.papyrus.modelexplorer.validation.ValidationTool;
+import org.eclipse.papyrus.validation.ValidationTool;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PlatformUI;
 
diff --git a/plugins/core/org.eclipse.papyrus.modelexplorer/src/org/eclipse/papyrus/modelexplorer/commands/ValidateDelMarkersFromSubtreeCommand.java b/plugins/core/org.eclipse.papyrus.modelexplorer/src/org/eclipse/papyrus/modelexplorer/commands/ValidateDelMarkersFromSubtreeCommand.java
index 4b4146a1214..d820f23bb55 100644
--- a/plugins/core/org.eclipse.papyrus.modelexplorer/src/org/eclipse/papyrus/modelexplorer/commands/ValidateDelMarkersFromSubtreeCommand.java
+++ b/plugins/core/org.eclipse.papyrus.modelexplorer/src/org/eclipse/papyrus/modelexplorer/commands/ValidateDelMarkersFromSubtreeCommand.java
@@ -20,7 +20,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.transaction.util.TransactionUtil;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.papyrus.modelexplorer.validation.ValidationTool;
+import org.eclipse.papyrus.validation.ValidationTool;
 
 
 public class ValidateDelMarkersFromSubtreeCommand extends AbstractValidateCommand {
diff --git a/plugins/core/org.eclipse.papyrus.modelexplorer/src/org/eclipse/papyrus/modelexplorer/handler/DeleteCommandHandler.java b/plugins/core/org.eclipse.papyrus.modelexplorer/src/org/eclipse/papyrus/modelexplorer/handler/DeleteCommandHandler.java
index f5f0af8d0fd..83e358e5e24 100644
--- a/plugins/core/org.eclipse.papyrus.modelexplorer/src/org/eclipse/papyrus/modelexplorer/handler/DeleteCommandHandler.java
+++ b/plugins/core/org.eclipse.papyrus.modelexplorer/src/org/eclipse/papyrus/modelexplorer/handler/DeleteCommandHandler.java
@@ -51,6 +51,10 @@ public class DeleteCommandHandler extends AbstractCommandHandler implements IHan
 		ICommand gmfCommand = null;
 		for(EObject selectedEObject : getSelectedElements()) {
 
+			if(selectedEObject == null) {
+				continue;
+			}
+
 			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
 			if(provider == null) {
 				continue;
diff --git a/plugins/core/org.eclipse.papyrus.modelexplorer/src/org/eclipse/papyrus/modelexplorer/validation/ValidationTool.java b/plugins/core/org.eclipse.papyrus.modelexplorer/src/org/eclipse/papyrus/modelexplorer/validation/ValidationTool.java
deleted file mode 100644
index be4662ae9be..00000000000
--- a/plugins/core/org.eclipse.papyrus.modelexplorer/src/org/eclipse/papyrus/modelexplorer/validation/ValidationTool.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 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:
- *  Ansgar Radermacher (CEA LIST) ansgar.radermacher@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.modelexplorer.validation;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EValidator;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.gmt.modisco.infra.browser.uicore.internal.model.LinkItem;
-import org.eclipse.papyrus.core.utils.ValidationUtils;
-
-public class ValidationTool {
-	
-	public ValidationTool (Object element) {
-		this.element = element;
-		eObject = (EObject) Platform.getAdapterManager().getAdapter(element, EObject.class);
-	}	
-
-	public ValidationTool (EObject eObject) {
-		this.eObject = eObject;
-	}	
-
-	public void tryChildIfEmpty() {
-		// element has no eObject. try parent
-		if (eObject == null) {
-			// TODO: is it possible to access the children in another way (without internal access?)
-			if (element instanceof LinkItem) {
-				List<Object> items = ((LinkItem) element).getChildrenElements();
-				if (items.size() > 0) {
-					// element = items[0];
-					if(items.get(0) instanceof EObject) {
-						eObject = (EObject)items.get(0);
-					}
-				}
-			}
-		}
-	}
-
-	public EObject getEObject () {
-		return eObject;
-	}
-	
-	public IMarker [] getMarkers () {
-		if (eObject != null) { 
-			if (eObject.eResource () != null) {
-				URI uri = eObject.eResource().getURI();
-				String platformResourceString = uri.toPlatformString(true);
-				IFile file = (platformResourceString != null ?
-				      ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(platformResourceString)) : null);
-				if (file != null) {
-					try {
-						// TODO: quite inefficient, since requested for each element (could cache markers, already done
-						// by findMarkers operation?)
-						return file.findMarkers(IMarker.PROBLEM, true, 0);
-					}
-					catch (CoreException e) {
-					}
-				}
-			}
-		}
-		return null;
-	}
-	
-	public EObject eObjectOfMarker (IMarker marker) {
-		if (eObject != null) {
-			domain = AdapterFactoryEditingDomain.getEditingDomainFor(eObject);
-			try {
-				if (marker.isSubtypeOf((EValidator.MARKER))) {
-					return ValidationUtils.eObjectFromMarkerOrMap (marker, null, domain);
-				}
-			}
-			catch (CoreException e) {
-				// only reason: marker does not exist
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * Delete all markers that refer to eObjects owned by the passed parentEObj
-	 * @param eObj
-	 */
-	public void deleteSubMarkers() {
-		for (IMarker marker : getMarkers ()) {
-			EObject eObjOfMarker = eObjectOfMarker (marker);
-			if (isContainedBy (eObjOfMarker, eObject)) {
-				try {
-					marker.delete ();
-				}
-				catch (CoreException e) {
-				}
-			}
-		}
-	}
-	
-	private boolean isContainedBy (EObject subEObj, EObject eObj) {
-		if (eObj == subEObj) return true;
-		else if (subEObj != null) {
-			return isContainedBy (subEObj.eContainer(), eObj);
-		}
-		// reached, if subEObj == null
-		return false;
-	}
-	
-	private Object element;
-	private EObject eObject;
-	private EditingDomain domain;
-}
diff --git a/plugins/core/org.eclipse.papyrus.properties.runtime/build.properties b/plugins/core/org.eclipse.papyrus.properties.runtime/build.properties
index 5bb608e35c8..89f8d0c0fb5 100644
--- a/plugins/core/org.eclipse.papyrus.properties.runtime/build.properties
+++ b/plugins/core/org.eclipse.papyrus.properties.runtime/build.properties
@@ -12,6 +12,4 @@ bin.includes = META-INF/,\
 src.includes = icons/,\

                schema/,\

                resources/,\

-               plugin.properties,\

-               plugin.xml,\

                about.html

diff --git a/plugins/core/org.eclipse.papyrus.properties.runtime/src/org/eclipse/papyrus/properties/runtime/controller/EMFTEReferenceController.java b/plugins/core/org.eclipse.papyrus.properties.runtime/src/org/eclipse/papyrus/properties/runtime/controller/EMFTEReferenceController.java
index 47c1a2f411d..2df3f5a3c97 100644
--- a/plugins/core/org.eclipse.papyrus.properties.runtime/src/org/eclipse/papyrus/properties/runtime/controller/EMFTEReferenceController.java
+++ b/plugins/core/org.eclipse.papyrus.properties.runtime/src/org/eclipse/papyrus/properties/runtime/controller/EMFTEReferenceController.java
@@ -13,7 +13,6 @@ package org.eclipse.papyrus.properties.runtime.controller;
 

 import java.util.ArrayList;

 import java.util.Arrays;

-import java.util.Collections;

 import java.util.List;

 

 import org.eclipse.core.commands.operations.IUndoableOperation;

@@ -34,7 +33,6 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalC
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

 import org.eclipse.jface.viewers.ILabelProvider;

 import org.eclipse.jface.viewers.IStructuredContentProvider;

 import org.eclipse.jface.viewers.Viewer;

@@ -284,7 +282,6 @@ public class EMFTEReferenceController extends EMFTStructuralFeatureController im
 		if(eClass == null || getObjectsToEdit() == null || getObjectsToEdit().size() == 0 || !(getModelHandler() instanceof EMFFeatureModelHandler)) {

 			return undoableOperation;

 		}

-		EObject eObject = getObjectsToEdit().get(0);

 		for(Object objectToDelete : objectsToDelete) {

 			if(objectToDelete instanceof EObject) {

 				DestroyElementRequest request = new DestroyElementRequest(getEditingDomain(), (EObject)objectToDelete, false);

diff --git a/plugins/core/org.eclipse.papyrus.properties.runtime/src/org/eclipse/papyrus/properties/runtime/controller/descriptor/EMFTPropertyEditorControllerDescriptorFactory.java b/plugins/core/org.eclipse.papyrus.properties.runtime/src/org/eclipse/papyrus/properties/runtime/controller/descriptor/EMFTPropertyEditorControllerDescriptorFactory.java
index 03cdc8ceec8..461a9f77a01 100644
--- a/plugins/core/org.eclipse.papyrus.properties.runtime/src/org/eclipse/papyrus/properties/runtime/controller/descriptor/EMFTPropertyEditorControllerDescriptorFactory.java
+++ b/plugins/core/org.eclipse.papyrus.properties.runtime/src/org/eclipse/papyrus/properties/runtime/controller/descriptor/EMFTPropertyEditorControllerDescriptorFactory.java
@@ -79,6 +79,9 @@ public class EMFTPropertyEditorControllerDescriptorFactory implements IPropertyE
 				if(child.hasAttributes()) {

 					Node editorIDNode = child.getAttributes().getNamedItem("id");

 					editorDescriptor = PropertyEditorService.getInstance().createPropertyEditorDescriptor(editorIDNode.getNodeValue(), child);

+					if(editorDescriptor == null) {

+						Activator.log.error("impossible to create editor descriptor", null);

+					}

 				}

 

 			} else if("constraints".equals(child.getNodeName())) {

@@ -88,7 +91,6 @@ public class EMFTPropertyEditorControllerDescriptorFactory implements IPropertyE
 

 		assert (modelHandler != null) : "impossible to find handler for controller " + controllerID;

 		assert (featureName != null && !"".equals(featureName)) : "impossible to find feature name for controller " + controllerID;

-		assert (editorDescriptor != null) : "impossible to create editor descriptor";

 		assert (constraints != null) : "Impossible to parse constraints";

 

 		return new EMFTPropertyEditorControllerDescriptor(controllerID, multiSelection, featureName, modelHandler, editorDescriptor, constraints);

diff --git a/plugins/core/org.eclipse.papyrus.properties.runtime/src/org/eclipse/papyrus/properties/runtime/propertyeditor/PropertyEditorService.java b/plugins/core/org.eclipse.papyrus.properties.runtime/src/org/eclipse/papyrus/properties/runtime/propertyeditor/PropertyEditorService.java
index 4dbb56bc5a4..ffef2d3eff1 100644
--- a/plugins/core/org.eclipse.papyrus.properties.runtime/src/org/eclipse/papyrus/properties/runtime/propertyeditor/PropertyEditorService.java
+++ b/plugins/core/org.eclipse.papyrus.properties.runtime/src/org/eclipse/papyrus/properties/runtime/propertyeditor/PropertyEditorService.java
@@ -11,6 +11,8 @@
  *****************************************************************************/

 package org.eclipse.papyrus.properties.runtime.propertyeditor;

 

+import java.util.List;

+

 import org.eclipse.core.runtime.IConfigurationElement;

 import org.eclipse.gmf.runtime.common.core.service.ExecutionStrategy;

 import org.eclipse.gmf.runtime.common.core.service.IOperation;

@@ -69,7 +71,12 @@ public class PropertyEditorService extends Service {
 	 * @return the created property editor

 	 */

 	public AbstractPropertyEditor createPropertyEditor(PropertyEditorController controller, String id, TabbedPropertySheetWidgetFactory widgetFactory) {

-		Object result = executeUnique(ExecutionStrategy.REVERSE, new CreatePropertyEditorOperation(controller, id));

+		List<Object> results = (List<Object>)execute(ExecutionStrategy.FORWARD, new CreatePropertyEditorOperation(controller, id));

+		if(results == null || results.size()==0) {

+			Activator.log.error("impossible to create the editor using id " + id, null);

+			return null;

+		}

+		Object result = results.get(0);

 		if(result instanceof AbstractPropertyEditor) {

 			((AbstractPropertyEditor)result).setWidgetFactory(widgetFactory);

 			return (AbstractPropertyEditor)result;

@@ -88,7 +95,13 @@ public class PropertyEditorService extends Service {
 	 * @return the configuration descriptor for the property editor

 	 */

 	public IPropertyEditorDescriptor createPropertyEditorDescriptor(String editorID, Node editorNode) {

-		return (IPropertyEditorDescriptor)executeUnique(ExecutionStrategy.REVERSE, new CreatePropertyEditorDescriptorOperation(editorID, editorNode));

+		List<IPropertyEditorDescriptor> results = (List<IPropertyEditorDescriptor>)execute(ExecutionStrategy.FORWARD, new CreatePropertyEditorDescriptorOperation(editorID, editorNode));

+		if(results == null || results.size()==0) {

+			throw new RuntimeException("Impossible to create this property editor: "+editorID);

+		} else {

+			IPropertyEditorDescriptor descriptor = results.get(0);

+			return results.get(0);

+		}

 	}

 

 	/**

diff --git a/plugins/core/org.eclipse.papyrus.properties.runtime/src/org/eclipse/papyrus/properties/runtime/propertyeditor/SimpleReferencePropertyEditor.java b/plugins/core/org.eclipse.papyrus.properties.runtime/src/org/eclipse/papyrus/properties/runtime/propertyeditor/SimpleReferencePropertyEditor.java
index 879345464b4..8b7980b521c 100644
--- a/plugins/core/org.eclipse.papyrus.properties.runtime/src/org/eclipse/papyrus/properties/runtime/propertyeditor/SimpleReferencePropertyEditor.java
+++ b/plugins/core/org.eclipse.papyrus.properties.runtime/src/org/eclipse/papyrus/properties/runtime/propertyeditor/SimpleReferencePropertyEditor.java
@@ -95,17 +95,7 @@ public class SimpleReferencePropertyEditor extends AbstractPropertyEditor {
 			}

 

 			public void mouseDoubleClick(MouseEvent e) {

-				// open property dialog on the current object

-				List<Object> objectsToEdit = Arrays.asList(getValue());

-

-				// find editor descriptor...

-				DialogDescriptor descriptor = PropertyViewService.getInstance().getDialogDescriptor(objectsToEdit);

-

-				if(descriptor != null) {

-					Shell parentShell = getShell();

-					PropertyDialog dialog = new PropertyDialog(parentShell, descriptor, objectsToEdit, getWidgetFactory());

-					dialog.open();

-				}

+				openPropertyDialog();

 			}

 		});

 		referenceArea.setToolTipText(getTooltipText());

@@ -120,14 +110,7 @@ public class SimpleReferencePropertyEditor extends AbstractPropertyEditor {
 			 * {@inheritDoc}

 			 */

 			public void mouseUp(MouseEvent e) {

-				// pops up a window to ask for a new reference

-				Shell currentShell = getShell();

-				ReferenceExplorerDialog dialog = new ReferenceExplorerDialog(currentShell, (IBoundedValuesController)getController(), false);

-				// should select the current value by default

-				if(Dialog.OK == dialog.open()) {

-					currentValue = dialog.getFirstResult();

-					getController().updateModel();

-				}

+				openReferenceDialog();

 			}

 

 			/**

@@ -154,9 +137,7 @@ public class SimpleReferencePropertyEditor extends AbstractPropertyEditor {
 			 * {@inheritDoc}

 			 */

 			public void mouseUp(MouseEvent e) {

-				// remove the reference of the element

-				currentValue = null;

-				getController().updateModel();

+				removeValueAction();

 			}

 

 			/**

@@ -183,6 +164,52 @@ public class SimpleReferencePropertyEditor extends AbstractPropertyEditor {
 	}

 

 	/**

+	 * Removes the current value.

+	 */

+	protected void removeValueAction() {

+		// remove the reference of the element

+		currentValue = null;

+		getController().updateModel();

+	}

+

+	/**

+	 * Opens the property dialog of current value and apply changes

+	 */

+	protected void openPropertyDialog() {

+

+		/*

+		 * deactivated part

+		 * // open property dialog on the current object

+		 * List<Object> objectsToEdit = Arrays.asList(getValue());

+		 * 

+		 * // find editor descriptor...

+		 * DialogDescriptor descriptor = PropertyViewService.getInstance().getDialogDescriptor(objectsToEdit);

+		 * 

+		 * if(descriptor != null) {

+		 * Shell parentShell = getShell();

+		 * PropertyDialog dialog = new PropertyDialog(parentShell, descriptor, objectsToEdit, getWidgetFactory());

+		 * dialog.open();

+		 * }

+		 * 

+		 * // end of deactivated

+		 */

+	}

+

+	/**

+	 * Opens the reference dialog and apply changes

+	 */

+	protected void openReferenceDialog() {

+		// pops up a window to ask for a new reference

+		Shell currentShell = getShell();

+		ReferenceExplorerDialog dialog = new ReferenceExplorerDialog(currentShell, (IBoundedValuesController)getController(), false);

+		// should select the current value by default

+		if(Dialog.OK == dialog.open()) {

+			currentValue = dialog.getFirstResult();

+			getController().updateModel();

+		}

+	}

+

+	/**

 	 * Returns a shell where dialogs can be displayed

 	 * 

 	 * @return a shell where dialogs can be displayed

diff --git a/plugins/core/org.eclipse.papyrus.validation/.classpath b/plugins/core/org.eclipse.papyrus.validation/.classpath
new file mode 100644
index 00000000000..9d5026e8ffd
--- /dev/null
+++ b/plugins/core/org.eclipse.papyrus.validation/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/plugins/core/org.eclipse.papyrus.validation/.project b/plugins/core/org.eclipse.papyrus.validation/.project
new file mode 100644
index 00000000000..c5c07e5792c
--- /dev/null
+++ b/plugins/core/org.eclipse.papyrus.validation/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.validation</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/core/org.eclipse.papyrus.validation/.settings/org.eclipse.jdt.core.prefs b/plugins/core/org.eclipse.papyrus.validation/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..16b5dc9fc1b
--- /dev/null
+++ b/plugins/core/org.eclipse.papyrus.validation/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#Wed Dec 15 19:11:36 CET 2010

+eclipse.preferences.version=1

+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

+org.eclipse.jdt.core.compiler.compliance=1.5

+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

+org.eclipse.jdt.core.compiler.source=1.5

diff --git a/plugins/core/org.eclipse.papyrus.validation/META-INF/MANIFEST.MF b/plugins/core/org.eclipse.papyrus.validation/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..a58c113f977
--- /dev/null
+++ b/plugins/core/org.eclipse.papyrus.validation/META-INF/MANIFEST.MF
@@ -0,0 +1,18 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.validation;singleton:=true
+Bundle-Version: 0.7.1.qualifier
+Bundle-Activator: org.eclipse.papyrus.validation.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.emf;bundle-version="2.6.0",
+ org.eclipse.emf.ecore;bundle-version="2.6.1",
+ org.eclipse.emf.edit;bundle-version="2.6.0",
+ org.eclipse.core.resources;bundle-version="3.6.0",
+ org.eclipse.gmt.modisco.infra.browser.uicore;bundle-version="0.8.0",
+ org.apache.commons.lang;bundle-version="2.3.0"
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Vendor: %pluginProvider
+Export-Package: org.eclipse.papyrus.validation
diff --git a/plugins/core/org.eclipse.papyrus.validation/about.html b/plugins/core/org.eclipse.papyrus.validation/about.html
new file mode 100644
index 00000000000..209103075a7
--- /dev/null
+++ b/plugins/core/org.eclipse.papyrus.validation/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

+<title>About</title>

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>November 14, 2008</p>	

+<h3>License</h3>

+

+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

+indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

+apply to your use of any object code in the Content.  Check the Redistributor's license that was 

+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

+indicated below, the terms and conditions of the EPL still apply to any source code in the Content

+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

+

+</body>

+</html>
\ No newline at end of file
diff --git a/plugins/core/org.eclipse.papyrus.validation/build.properties b/plugins/core/org.eclipse.papyrus.validation/build.properties
new file mode 100644
index 00000000000..d944674ba0b
--- /dev/null
+++ b/plugins/core/org.eclipse.papyrus.validation/build.properties
@@ -0,0 +1,6 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               about.html,\
+               plugin.properties
diff --git a/plugins/core/org.eclipse.papyrus.validation/plugin.properties b/plugins/core/org.eclipse.papyrus.validation/plugin.properties
new file mode 100644
index 00000000000..ea04e256463
--- /dev/null
+++ b/plugins/core/org.eclipse.papyrus.validation/plugin.properties
@@ -0,0 +1,12 @@
+###############################################################################

+# Copyright (c) 2010 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

+###############################################################################

+pluginName=Papyrus Validation Integration (Incubation)

+pluginProvider=Eclipse Modeling Project

diff --git a/plugins/core/org.eclipse.papyrus.validation/src/org/eclipse/papyrus/validation/Activator.java b/plugins/core/org.eclipse.papyrus.validation/src/org/eclipse/papyrus/validation/Activator.java
new file mode 100644
index 00000000000..7223a1c284f
--- /dev/null
+++ b/plugins/core/org.eclipse.papyrus.validation/src/org/eclipse/papyrus/validation/Activator.java
@@ -0,0 +1,50 @@
+package org.eclipse.papyrus.validation;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.validation"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+	
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/plugins/core/org.eclipse.papyrus.validation/src/org/eclipse/papyrus/validation/ValidationTool.java b/plugins/core/org.eclipse.papyrus.validation/src/org/eclipse/papyrus/validation/ValidationTool.java
new file mode 100644
index 00000000000..eb4389b2b00
--- /dev/null
+++ b/plugins/core/org.eclipse.papyrus.validation/src/org/eclipse/papyrus/validation/ValidationTool.java
@@ -0,0 +1,239 @@
+/*****************************************************************************
+ * Copyright (c) 2010 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:
+ *  Ansgar Radermacher (CEA LIST) ansgar.radermacher@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.validation;
+
+import java.util.List;
+
+import org.apache.commons.lang.WordUtils;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EValidator;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.gmt.modisco.infra.browser.uicore.internal.model.LinkItem;
+
+public class ValidationTool {
+
+	/** Current element */
+	private Object element;
+
+	/** current eobject */
+	private EObject eObject;
+
+	/** current editing domain */
+	private EditingDomain domain;
+
+
+	/**
+	 * Constructor:
+	 * create a new instance of the validation tool for a specific model element
+	 *
+	 * @param element a model element
+	 */
+	public ValidationTool (Object element) {
+		this.element = element;
+		setEObject((EObject)Platform.getAdapterManager().getAdapter(element, EObject.class));
+	}	
+
+	/**
+	 * Constructor:
+	 * create a new instance of the validation tool for a specific model element
+	 * 
+	 * @param eObject
+	 *        a model element
+	 */
+	public ValidationTool (EObject eObject) {
+		setEObject(eObject);
+	}	
+
+
+	public void tryChildIfEmpty() {
+		// element has no eObject. try parent
+		if(getEObject() == null) {
+			// TODO: is it possible to access the children in another way (without internal access?)
+			if (element instanceof LinkItem) {
+				List<?> items = ((LinkItem)element).getChildrenElements();
+				if(items.size() > 0 && items.get(0) instanceof EObject) {
+					// element = items[0];
+					setEObject((EObject)items.get(0));
+				}
+			}
+		}
+	}
+
+	/**
+	 * Returns the current EObject
+	 * 
+	 * @return the current EObject
+	 */
+	public EObject getEObject() {
+		return eObject;
+	}
+	
+
+	/**
+	 * sets the current EObject
+	 * 
+	 * eObject the current EObject
+	 */
+	public void setEObject(EObject eObject) {
+		this.eObject = eObject;
+	}
+
+	public IMarker [] getMarkers () {
+		if(getEObject() != null) {
+			if(getEObject().eResource() != null) {
+				URI uri = getEObject().eResource().getURI();
+				String platformResourceString = uri.toPlatformString(true);
+				IFile file = (platformResourceString != null ?
+				      ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(platformResourceString)) : null);
+				if (file != null) {
+					try {
+						// TODO: quite inefficient, since requested for each element (could cache markers, already done
+						// by findMarkers operation?)
+						return file.findMarkers(IMarker.PROBLEM, true, 0);
+					}
+					catch (CoreException e) {
+					}
+				}
+			}
+		}
+		return null;
+	}
+	
+	/**
+	 * 
+	 * @param marker
+	 * @return
+	 */
+	public EObject eObjectOfMarker (IMarker marker) {
+		if(getEObject() != null) {
+			domain = AdapterFactoryEditingDomain.getEditingDomainFor(getEObject());
+			try {
+				if (marker.isSubtypeOf((EValidator.MARKER))) {
+					return ValidationUtils.eObjectFromMarkerOrMap (marker, null, domain);
+				}
+			}
+			catch (CoreException e) {
+				// only reason: marker does not exist
+			}
+		}
+		return null;
+	}
+	
+	/**
+	 * Delete all markers that refer to eObjects owned by the passed parentEObj
+	 */
+	public void deleteSubMarkers() {
+		for (IMarker marker : getMarkers ()) {
+			EObject eObjOfMarker = eObjectOfMarker (marker);
+			if(isContainedBy(eObjOfMarker, getEObject())) {
+				try {
+					marker.delete ();
+				}
+				catch (CoreException e) {
+				}
+			}
+		}
+	}
+	
+	/**
+	 * @return the maximum severity of markers associated with the model element
+	 * (constructor parameter of validation tool)
+	 */
+	public int getSeverity() {
+		IMarker markers[] = getMarkers();
+		int severity = 0;
+		if (markers != null) {
+			for (IMarker marker : markers) {
+				EObject eObjectOfMarker = eObjectOfMarker(marker);
+				while (eObjectOfMarker != null) {
+					if (eObjectOfMarker == getEObject()) {
+						try {
+							Integer severityI = (Integer) marker.getAttribute(IMarker.SEVERITY);
+							if (severityI.intValue () > severity) {
+								severity = severityI.intValue();
+							}
+						}
+						catch (CoreException e) {
+						}
+					}
+					// navigate to parents, since parent folder is contaminated as well
+					eObjectOfMarker = eObjectOfMarker.eContainer();
+				}
+			}
+		}
+		return severity;
+	}
+	
+	/**
+	 * @return A set of messages associated with the markers for the model element
+	 * (constructor parameter of validation tool)
+	 */
+	public String getMarkerMessages() {
+		IMarker markers[] = getMarkers();
+		if (markers != null) {
+			boolean examineChilds = true;
+			String message = "";
+			for (IMarker marker : markers) {
+				EObject eObjectOfMarker = eObjectOfMarker(marker);
+				if (eObjectOfMarker == getEObject()) {
+					if (message.length() > 0) {
+						message += "\n";
+					}
+					// vt.getWrappedMessage (marker);
+					try {
+						message += "- " + WordUtils.wrap ((String) marker.getAttribute(IMarker.MESSAGE), 100, "\n  ", true);
+					}
+					catch (CoreException e) {
+					}
+				}
+				if (examineChilds && (eObjectOfMarker != null)) {
+					eObjectOfMarker = eObjectOfMarker.eContainer();
+					while (eObjectOfMarker != null) {
+						if (eObjectOfMarker == getEObject ()) {
+							if (message.length() > 0) {
+								message += "\n";
+							}
+							message += "- Problem marker in (at least) one of the children";
+							examineChilds = false;
+							break;
+						}
+						// navigate to parents, since parent folder is contaminated as well
+						eObjectOfMarker = eObjectOfMarker.eContainer();
+					}
+				}
+			}
+			return (message.length() > 0) ? message : null; 
+		}
+		return null;
+	}
+	
+	private boolean isContainedBy (EObject subEObj, EObject eObj) {
+		if (eObj == subEObj) return true;
+		else if (subEObj != null) {
+			return isContainedBy (subEObj.eContainer(), eObj);
+		}
+		// reached, if subEObj == null
+		return false;
+	}
+	
+}
diff --git a/plugins/core/org.eclipse.papyrus.core/src/org/eclipse/papyrus/core/utils/ValidationUtils.java b/plugins/core/org.eclipse.papyrus.validation/src/org/eclipse/papyrus/validation/ValidationUtils.java
index 39416d4876e..504316b8b73 100644
--- a/plugins/core/org.eclipse.papyrus.core/src/org/eclipse/papyrus/core/utils/ValidationUtils.java
+++ b/plugins/core/org.eclipse.papyrus.validation/src/org/eclipse/papyrus/validation/ValidationUtils.java
@@ -1,4 +1,18 @@
-package org.eclipse.papyrus.core.utils;
+/*****************************************************************************
+ * Copyright (c) 2010 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:
+ *  Ansgar Radermacher (CEA LIST) ansgar.radermacher@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.validation;
 
 import java.util.Map;
 import java.util.MissingResourceException;
diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/.classpath b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/.classpath
index 2d1a4302f04..45f024e850e 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/.classpath
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

+	<classpathentry kind="src" path="src"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

 	<classpathentry kind="output" path="bin"/>

 </classpath>

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/ctool16/CreateCommandDeclaration_commands_Command.gif b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/ctool16/CreateCommandDeclaration_commands_Command.gif
new file mode 100644
index 00000000000..1b2d814f92e
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/ctool16/CreateCommandDeclaration_commands_Command.gif
diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/ctool16/CreateDomainContext_advices_Advice.gif b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/ctool16/CreateDomainContext_advices_Advice.gif
new file mode 100644
index 00000000000..55ee60b02ec
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/ctool16/CreateDomainContext_advices_Advice.gif
diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/ctool16/CreateDomainContext_bindings_ElementTypeBindings.gif b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/ctool16/CreateDomainContext_bindings_ElementTypeBindings.gif
new file mode 100644
index 00000000000..2a3bcb38980
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/ctool16/CreateDomainContext_bindings_ElementTypeBindings.gif
diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/ctool16/CreateDomainContext_command_CommandDeclaration.gif b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/ctool16/CreateDomainContext_command_CommandDeclaration.gif
new file mode 100644
index 00000000000..be37fbc7077
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/ctool16/CreateDomainContext_command_CommandDeclaration.gif
diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/ctool16/CreateDomainContext_menu_MenuDeclaration.gif b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/ctool16/CreateDomainContext_menu_MenuDeclaration.gif
new file mode 100644
index 00000000000..91619bc626b
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/ctool16/CreateDomainContext_menu_MenuDeclaration.gif
diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/ctool16/CreateElementTypeBindings_bindings_AdviceBinding.gif b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/ctool16/CreateElementTypeBindings_bindings_AdviceBinding.gif
new file mode 100644
index 00000000000..e2efc630b97
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/ctool16/CreateElementTypeBindings_bindings_AdviceBinding.gif
diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/ctool16/CreateElementTypeBindings_bindings_ElementTypeBinding.gif b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/ctool16/CreateElementTypeBindings_bindings_ElementTypeBinding.gif
new file mode 100644
index 00000000000..3ed52d7309b
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/ctool16/CreateElementTypeBindings_bindings_ElementTypeBinding.gif
diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/ctool16/CreateElementTypes_types_MetaClassType.gif b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/ctool16/CreateElementTypes_types_MetaClassType.gif
new file mode 100644
index 00000000000..0cf5f67ddb4
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/ctool16/CreateElementTypes_types_MetaClassType.gif
diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/ctool16/CreateElementTypes_types_SpecializationType.gif b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/ctool16/CreateElementTypes_types_SpecializationType.gif
new file mode 100644
index 00000000000..de440818fe2
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/ctool16/CreateElementTypes_types_SpecializationType.gif
diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/ctool16/CreateSpecializationType_genHelper_StereotypedElementHelper.gif b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/ctool16/CreateSpecializationType_genHelper_StereotypedElementHelper.gif
new file mode 100644
index 00000000000..2833425da49
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/ctool16/CreateSpecializationType_genHelper_StereotypedElementHelper.gif
diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/ctool16/CreateSpecializationType_genMatcher_StereotypedElementMatcher.gif b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/ctool16/CreateSpecializationType_genMatcher_StereotypedElementMatcher.gif
new file mode 100644
index 00000000000..a8269f3ea60
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/ctool16/CreateSpecializationType_genMatcher_StereotypedElementMatcher.gif
diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/obj16/Advice.gif b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/obj16/Advice.gif
new file mode 100644
index 00000000000..be22463d291
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/obj16/Advice.gif
diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/obj16/Command.gif b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/obj16/Command.gif
new file mode 100644
index 00000000000..904159880b3
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/obj16/Command.gif
diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/obj16/CommandDeclaration.gif b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/obj16/CommandDeclaration.gif
new file mode 100644
index 00000000000..c00aedf4135
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/obj16/CommandDeclaration.gif
diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/obj16/ElementTypeBinding.gif b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/obj16/ElementTypeBinding.gif
new file mode 100644
index 00000000000..338fb8d9a72
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/obj16/ElementTypeBinding.gif
diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/obj16/ElementTypeBindings.gif b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/obj16/ElementTypeBindings.gif
new file mode 100644
index 00000000000..53500daf98e
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/obj16/ElementTypeBindings.gif
diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/obj16/MenuDeclaration.gif b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/obj16/MenuDeclaration.gif
new file mode 100644
index 00000000000..2b692560297
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/obj16/MenuDeclaration.gif
diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/obj16/MetaClassType.gif b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/obj16/MetaClassType.gif
new file mode 100644
index 00000000000..ed874747401
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/obj16/MetaClassType.gif
diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/obj16/SpecializationType.gif b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/obj16/SpecializationType.gif
new file mode 100644
index 00000000000..33a997a1606
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/obj16/SpecializationType.gif
diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/obj16/StereotypedElementHelper.gif b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/obj16/StereotypedElementHelper.gif
new file mode 100644
index 00000000000..14af8aaee9f
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/obj16/StereotypedElementHelper.gif
diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/obj16/StereotypedElementMatcher.gif b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/obj16/StereotypedElementMatcher.gif
new file mode 100644
index 00000000000..badaab0664a
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/icons/full/obj16/StereotypedElementMatcher.gif
diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/plugin.properties b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/plugin.properties
index 0e70274c653..688975d357e 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/plugin.properties
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/plugin.properties
@@ -78,3 +78,60 @@ _UI_ElementTypes_types_feature = Types
 _UI_DomainContext_typeProjectName_feature = Type Project Name

 _UI_DomainContext_handlerProjectName_feature = Handler Project Name

 _UI_DomainContext_generatedSourceFolder_feature = Generated Source Folder

+_UI_MetaClassType_type = Meta Class Type

+_UI_SpecializationType_type = Specialization Type

+_UI_Advice_type = Advice

+_UI_ElementTypeBindings_type = Element Type Bindings

+_UI_ElementTypeBinding_type = Element Type Binding

+_UI_DomainContext_advices_feature = Advices

+_UI_ElementType_name_feature = Name

+_UI_ElementType_helper_feature = Helper

+_UI_MetaClassType_metaClass_feature = Meta Class

+_UI_SpecializationType_ref_feature = Ref

+_UI_Advice_adviceID_feature = Advice ID

+_UI_Advice_ref_feature = Ref

+_UI_Advice_advicePath_feature = Advice Path

+_UI_Advice_inheritance_feature = Inheritance

+_UI_ElementTypeBindings_clientContextID_feature = Client Context ID

+_UI_ElementTypeBindings_bindings_feature = Bindings

+_UI_Binding_owner_feature = Owner

+_UI_Binding_pattern_feature = Pattern

+_UI_ElementTypeBinding_ref_feature = Ref

+_UI_AdviceBinding_ref_feature = Ref

+_UI_SpecializationType_matcher_feature = Matcher

+_UI_ElementTypes_domain_feature = Domain

+_UI_ElementType_owner_feature = Owner

+_UI_GenMatcher_type = Gen Matcher

+_UI_GenHelper_type = Gen Helper

+_UI_StereotypedElementMatcher_type = Stereotyped Element Matcher

+_UI_StereotypedElementHelper_type = Stereotyped Element Helper

+_UI_SpecializationType_genMatcher_feature = Gen Matcher

+_UI_SpecializationType_genHelper_feature = Gen Helper

+_UI_GenMatcher_name_feature = Name

+_UI_GenHelper_name_feature = Name

+_UI_StereotypedElementMatcher_stereotype_feature = Stereotype

+_UI_StereotypedElementHelper_stereotype_feature = Stereotype

+_UI_StereotypedElementMatcher_stereotypeBase_feature = Stereotype Base

+_UI_StereotypedElementHelper_stereotypeBase_feature = Stereotype Base

+_UI_StereotypedElementMatcher_stereotypeName_feature = Stereotype Name

+_UI_StereotypedElementMatcher_stereotypePackage_feature = Stereotype Package

+_UI_StereotypedElementMatcher_baseElementName_feature = Base Element Name

+_UI_StereotypedElementMatcher_baseElementPackage_feature = Base Element Package

+_UI_StereotypedElementHelper_stereotypeName_feature = Stereotype Name

+_UI_StereotypedElementHelper_stereotypePackage_feature = Stereotype Package

+_UI_StereotypedElementHelper_baseElementName_feature = Base Element Name

+_UI_StereotypedElementHelper_baseElementPackage_feature = Base Element Package

+_UI_GenHandlers_visibleCreateChildHandlers_feature = Visible Create Child Handlers

+_UI_GenHandlers_parentDomainCreateChild_feature = Parent Domain Create Child

+_UI_MenuDeclaration_type = Menu Declaration

+_UI_CommandDeclaration_type = Command Declaration

+_UI_Command_type = Command

+_UI_DomainContext_menu_feature = Menu

+_UI_DomainContext_command_feature = Command

+_UI_ElementType_icon_feature = Icon

+_UI_MenuDeclaration_locationURI_feature = Location URI

+_UI_MenuDeclaration_commands_feature = Commands

+_UI_CommandDeclaration_commands_feature = Commands

+_UI_Command_elementType_feature = Element Type

+_UI_Command_icon_feature = Icon

+_UI_GenHandlers_createChildMenuLocationURI_feature = Create Child Menu Location URI

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/AdviceBindingItemProvider.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/AdviceBindingItemProvider.java
index 5fa21cc4f1d..83f9e704010 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/AdviceBindingItemProvider.java
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/AdviceBindingItemProvider.java
@@ -6,13 +6,11 @@
  */

 package org.eclipse.papyrus.domaincontextcodegen.provider;

 

-

 import java.util.Collection;

 import java.util.List;

 

 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

 import org.eclipse.emf.edit.provider.IItemLabelProvider;

@@ -20,9 +18,6 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;

 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.emf.edit.provider.ViewerNotification;

 import org.eclipse.papyrus.domaincontextcodegen.AdviceBinding;

 import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage;

 

@@ -33,7 +28,7 @@ import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage;
  * 

  * @generated

  */

-public class AdviceBindingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {

+public class AdviceBindingItemProvider extends BindingItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {

 

 	/**

 	 * This constructs an instance from a factory and a notifier.

@@ -58,68 +53,20 @@ public class AdviceBindingItemProvider extends ItemProviderAdapter implements IE
 		if(itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

-			addAdvicePathPropertyDescriptor(object);

-			addAdviceIDPropertyDescriptor(object);

-			addInheritancePropertyDescriptor(object);

-			addElementTypeRefPropertyDescriptor(object);

-			addElementTypeIDrefPropertyDescriptor(object);

+			addRefPropertyDescriptor(object);

 		}

 		return itemPropertyDescriptors;

 	}

 

 	/**

-	 * This adds a property descriptor for the Advice Path feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected void addAdvicePathPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_AdviceBinding_advicePath_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AdviceBinding_advicePath_feature", "_UI_AdviceBinding_type"), DomaincontextcodegenPackage.Literals.ADVICE_BINDING__ADVICE_PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Advice ID feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected void addAdviceIDPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_AdviceBinding_adviceID_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AdviceBinding_adviceID_feature", "_UI_AdviceBinding_type"), DomaincontextcodegenPackage.Literals.ADVICE_BINDING__ADVICE_ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Inheritance feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected void addInheritancePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_AdviceBinding_inheritance_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AdviceBinding_inheritance_feature", "_UI_AdviceBinding_type"), DomaincontextcodegenPackage.Literals.ADVICE_BINDING__INHERITANCE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Element Type Ref feature.

+	 * This adds a property descriptor for the Ref feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @generated

 	 */

-	protected void addElementTypeRefPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_AdviceBinding_elementTypeRef_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AdviceBinding_elementTypeRef_feature", "_UI_AdviceBinding_type"), DomaincontextcodegenPackage.Literals.ADVICE_BINDING__ELEMENT_TYPE_REF, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Element Type IDref feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected void addElementTypeIDrefPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_AdviceBinding_elementTypeIDref_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AdviceBinding_elementTypeIDref_feature", "_UI_AdviceBinding_type"), DomaincontextcodegenPackage.Literals.ADVICE_BINDING__ELEMENT_TYPE_IDREF, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

+	protected void addRefPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_AdviceBinding_ref_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AdviceBinding_ref_feature", "_UI_AdviceBinding_type"), DomaincontextcodegenPackage.Literals.ADVICE_BINDING__REF, true, false, true, null, null, null));

 	}

 

 	/**

@@ -139,12 +86,19 @@ public class AdviceBindingItemProvider extends ItemProviderAdapter implements IE
 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

-	 * @generated

+	 * @generated NOT

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((AdviceBinding)object).getAdvicePath();

-		return label == null || label.length() == 0 ? getString("_UI_AdviceBinding_type") : getString("_UI_AdviceBinding_type") + " " + label;

+

+		AdviceBinding binding = (AdviceBinding)object;

+		String label = "pattern : " + binding.getPattern();

+

+		if((binding.getRef() != null) && (binding.getRef().getAdviceID() != null)) {

+			label = "ref. : " + binding.getRef().getAdviceID();

+		}

+

+		return label == null || label.length() == 0 ? getString("_UI_AdviceBinding_type") : label + " (" + getString("_UI_AdviceBinding_type") + ")";

 	}

 

 	/**

@@ -158,15 +112,6 @@ public class AdviceBindingItemProvider extends ItemProviderAdapter implements IE
 	@Override

 	public void notifyChanged(Notification notification) {

 		updateChildren(notification);

-

-		switch(notification.getFeatureID(AdviceBinding.class)) {

-		case DomaincontextcodegenPackage.ADVICE_BINDING__ADVICE_PATH:

-		case DomaincontextcodegenPackage.ADVICE_BINDING__ADVICE_ID:

-		case DomaincontextcodegenPackage.ADVICE_BINDING__INHERITANCE:

-		case DomaincontextcodegenPackage.ADVICE_BINDING__ELEMENT_TYPE_IDREF:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

-		}

 		super.notifyChanged(notification);

 	}

 

@@ -183,16 +128,4 @@ public class AdviceBindingItemProvider extends ItemProviderAdapter implements IE
 		super.collectNewChildDescriptors(newChildDescriptors, object);

 	}

 

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return DomainContextEditPlugin.INSTANCE;

-	}

-

 }

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/AdviceItemProvider.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/AdviceItemProvider.java
new file mode 100644
index 00000000000..1f9a11e313c
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/AdviceItemProvider.java
@@ -0,0 +1,184 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.domaincontextcodegen.provider;

+

+import java.util.Collection;

+import java.util.List;

+

+import org.eclipse.emf.common.notify.AdapterFactory;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.util.ResourceLocator;

+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.ItemProviderAdapter;

+import org.eclipse.emf.edit.provider.ViewerNotification;

+import org.eclipse.papyrus.domaincontextcodegen.Advice;

+import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage;

+

+/**

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.domaincontextcodegen.Advice} object.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * 

+ * @generated

+ */

+public class AdviceItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {

+

+	/**

+	 * This constructs an instance from a factory and a notifier.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public AdviceItemProvider(AdapterFactory adapterFactory) {

+		super(adapterFactory);

+	}

+

+	/**

+	 * This returns the property descriptors for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

+		if(itemPropertyDescriptors == null) {

+			super.getPropertyDescriptors(object);

+

+			addAdviceIDPropertyDescriptor(object);

+			addRefPropertyDescriptor(object);

+			addAdvicePathPropertyDescriptor(object);

+			addInheritancePropertyDescriptor(object);

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

+	 * This adds a property descriptor for the Advice ID feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected void addAdviceIDPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Advice_adviceID_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Advice_adviceID_feature", "_UI_Advice_type"), DomaincontextcodegenPackage.Literals.ADVICE__ADVICE_ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

+	}

+

+	/**

+	 * This adds a property descriptor for the Ref feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected void addRefPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Advice_ref_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Advice_ref_feature", "_UI_Advice_type"), DomaincontextcodegenPackage.Literals.ADVICE__REF, true, false, true, null, null, null));

+	}

+

+	/**

+	 * This adds a property descriptor for the Advice Path feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected void addAdvicePathPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Advice_advicePath_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Advice_advicePath_feature", "_UI_Advice_type"), DomaincontextcodegenPackage.Literals.ADVICE__ADVICE_PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

+	}

+

+	/**

+	 * This adds a property descriptor for the Inheritance feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected void addInheritancePropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Advice_inheritance_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Advice_inheritance_feature", "_UI_Advice_type"), DomaincontextcodegenPackage.Literals.ADVICE__INHERITANCE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

+	}

+

+	/**

+	 * This returns Advice.gif.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public Object getImage(Object object) {

+		return overlayImage(object, getResourceLocator().getImage("full/obj16/Advice"));

+	}

+

+	/**

+	 * This returns the label text for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public String getText(Object object) {

+		String label = ((Advice)object).getAdviceID();

+		return label == null || label.length() == 0 ? getString("_UI_Advice_type") : getString("_UI_Advice_type") + " " + label;

+	}

+

+	/**

+	 * This handles model notifications by calling {@link #updateChildren} to update any cached

+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public void notifyChanged(Notification notification) {

+		updateChildren(notification);

+

+		switch(notification.getFeatureID(Advice.class)) {

+		case DomaincontextcodegenPackage.ADVICE__ADVICE_ID:

+		case DomaincontextcodegenPackage.ADVICE__ADVICE_PATH:

+		case DomaincontextcodegenPackage.ADVICE__INHERITANCE:

+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+			return;

+		}

+		super.notifyChanged(notification);

+	}

+

+	/**

+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

+	 * that can be created under this object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

+		super.collectNewChildDescriptors(newChildDescriptors, object);

+	}

+

+	/**

+	 * Return the resource locator for this item provider's resources.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public ResourceLocator getResourceLocator() {

+		return DomainContextEditPlugin.INSTANCE;

+	}

+

+}

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/BindingItemProvider.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/BindingItemProvider.java
index 71f81988cbd..fde7b914462 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/BindingItemProvider.java
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/BindingItemProvider.java
@@ -6,7 +6,6 @@
  */

 package org.eclipse.papyrus.domaincontextcodegen.provider;

 

-

 import java.util.Collection;

 import java.util.List;

 

@@ -58,56 +57,20 @@ public class BindingItemProvider extends ItemProviderAdapter implements IEditing
 		if(itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

-			addAdvicePropertyDescriptor(object);

-			addElementTypePatternPropertyDescriptor(object);

-			addAdviceIDPropertyDescriptor(object);

+			addPatternPropertyDescriptor(object);

 		}

 		return itemPropertyDescriptors;

 	}

 

 	/**

-	 * This adds a property descriptor for the Advice feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected void addAdvicePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Binding_advice_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Binding_advice_feature", "_UI_Binding_type"), DomaincontextcodegenPackage.Literals.BINDING__ADVICE, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Element Type Pattern feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected void addElementTypePatternPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Binding_elementTypePattern_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Binding_elementTypePattern_feature", "_UI_Binding_type"), DomaincontextcodegenPackage.Literals.BINDING__ELEMENT_TYPE_PATTERN, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Advice ID feature.

+	 * This adds a property descriptor for the Pattern feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @generated

 	 */

-	protected void addAdviceIDPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Binding_adviceID_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Binding_adviceID_feature", "_UI_Binding_type"), DomaincontextcodegenPackage.Literals.BINDING__ADVICE_ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

-	}

-

-	/**

-	 * This returns Binding.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Binding"));

+	protected void addPatternPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Binding_pattern_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Binding_pattern_feature", "_UI_Binding_type"), DomaincontextcodegenPackage.Literals.BINDING__PATTERN, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

 	}

 

 	/**

@@ -119,7 +82,7 @@ public class BindingItemProvider extends ItemProviderAdapter implements IEditing
 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((Binding)object).getElementTypePattern();

+		String label = ((Binding)object).getPattern();

 		return label == null || label.length() == 0 ? getString("_UI_Binding_type") : getString("_UI_Binding_type") + " " + label;

 	}

 

@@ -136,8 +99,7 @@ public class BindingItemProvider extends ItemProviderAdapter implements IEditing
 		updateChildren(notification);

 

 		switch(notification.getFeatureID(Binding.class)) {

-		case DomaincontextcodegenPackage.BINDING__ELEMENT_TYPE_PATTERN:

-		case DomaincontextcodegenPackage.BINDING__ADVICE_ID:

+		case DomaincontextcodegenPackage.BINDING__PATTERN:

 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

 			return;

 		}

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/CommandDeclarationItemProvider.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/CommandDeclarationItemProvider.java
new file mode 100644
index 00000000000..4a9939447f2
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/CommandDeclarationItemProvider.java
@@ -0,0 +1,167 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.domaincontextcodegen.provider;

+

+import java.util.Collection;

+import java.util.List;

+

+import org.eclipse.emf.common.notify.AdapterFactory;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.util.ResourceLocator;

+import org.eclipse.emf.ecore.EStructuralFeature;

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+import org.eclipse.emf.edit.provider.ItemProviderAdapter;

+import org.eclipse.emf.edit.provider.ViewerNotification;

+import org.eclipse.papyrus.domaincontextcodegen.CommandDeclaration;

+import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenFactory;

+import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage;

+

+/**

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.domaincontextcodegen.CommandDeclaration} object.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * 

+ * @generated

+ */

+public class CommandDeclarationItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {

+

+	/**

+	 * This constructs an instance from a factory and a notifier.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public CommandDeclarationItemProvider(AdapterFactory adapterFactory) {

+		super(adapterFactory);

+	}

+

+	/**

+	 * This returns the property descriptors for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

+		if(itemPropertyDescriptors == null) {

+			super.getPropertyDescriptors(object);

+

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

+		if(childrenFeatures == null) {

+			super.getChildrenFeatures(object);

+			childrenFeatures.add(DomaincontextcodegenPackage.Literals.COMMAND_DECLARATION__COMMANDS);

+		}

+		return childrenFeatures;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	protected EStructuralFeature getChildFeature(Object object, Object child) {

+		// Check the type of the specified child object and return the proper feature to use for

+		// adding (see {@link AddCommand}) it as a child.

+

+		return super.getChildFeature(object, child);

+	}

+

+	/**

+	 * This returns CommandDeclaration.gif.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public Object getImage(Object object) {

+		return overlayImage(object, getResourceLocator().getImage("full/obj16/CommandDeclaration"));

+	}

+

+	/**

+	 * This returns the label text for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public String getText(Object object) {

+		return getString("_UI_CommandDeclaration_type");

+	}

+

+	/**

+	 * This handles model notifications by calling {@link #updateChildren} to update any cached

+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public void notifyChanged(Notification notification) {

+		updateChildren(notification);

+

+		switch(notification.getFeatureID(CommandDeclaration.class)) {

+		case DomaincontextcodegenPackage.COMMAND_DECLARATION__COMMANDS:

+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

+			return;

+		}

+		super.notifyChanged(notification);

+	}

+

+	/**

+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

+	 * that can be created under this object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

+		super.collectNewChildDescriptors(newChildDescriptors, object);

+

+		newChildDescriptors.add(createChildParameter(DomaincontextcodegenPackage.Literals.COMMAND_DECLARATION__COMMANDS, DomaincontextcodegenFactory.eINSTANCE.createCommand()));

+	}

+

+	/**

+	 * Return the resource locator for this item provider's resources.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public ResourceLocator getResourceLocator() {

+		return DomainContextEditPlugin.INSTANCE;

+	}

+

+}

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/CommandItemProvider.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/CommandItemProvider.java
new file mode 100644
index 00000000000..f4bee249bfe
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/CommandItemProvider.java
@@ -0,0 +1,158 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.domaincontextcodegen.provider;

+

+import java.util.Collection;

+import java.util.List;

+

+import org.eclipse.emf.common.notify.AdapterFactory;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.util.ResourceLocator;

+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.ItemProviderAdapter;

+import org.eclipse.emf.edit.provider.ViewerNotification;

+import org.eclipse.papyrus.domaincontextcodegen.Command;

+import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage;

+

+/**

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.domaincontextcodegen.Command} object.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * 

+ * @generated

+ */

+public class CommandItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {

+

+	/**

+	 * This constructs an instance from a factory and a notifier.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public CommandItemProvider(AdapterFactory adapterFactory) {

+		super(adapterFactory);

+	}

+

+	/**

+	 * This returns the property descriptors for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

+		if(itemPropertyDescriptors == null) {

+			super.getPropertyDescriptors(object);

+

+			addElementTypePropertyDescriptor(object);

+			addIconPropertyDescriptor(object);

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

+	 * This adds a property descriptor for the Element Type feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected void addElementTypePropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Command_elementType_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Command_elementType_feature", "_UI_Command_type"), DomaincontextcodegenPackage.Literals.COMMAND__ELEMENT_TYPE, true, false, true, null, null, null));

+	}

+

+	/**

+	 * This adds a property descriptor for the Icon feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected void addIconPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Command_icon_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Command_icon_feature", "_UI_Command_type"), DomaincontextcodegenPackage.Literals.COMMAND__ICON, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

+	}

+

+	/**

+	 * This returns Command.gif.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public Object getImage(Object object) {

+		return overlayImage(object, getResourceLocator().getImage("full/obj16/Command"));

+	}

+

+	/**

+	 * This returns the label text for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public String getText(Object object) {

+		String label = ((Command)object).getIcon();

+		return label == null || label.length() == 0 ? getString("_UI_Command_type") : getString("_UI_Command_type") + " " + label;

+	}

+

+	/**

+	 * This handles model notifications by calling {@link #updateChildren} to update any cached

+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public void notifyChanged(Notification notification) {

+		updateChildren(notification);

+

+		switch(notification.getFeatureID(Command.class)) {

+		case DomaincontextcodegenPackage.COMMAND__ICON:

+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+			return;

+		}

+		super.notifyChanged(notification);

+	}

+

+	/**

+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

+	 * that can be created under this object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

+		super.collectNewChildDescriptors(newChildDescriptors, object);

+	}

+

+	/**

+	 * Return the resource locator for this item provider's resources.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public ResourceLocator getResourceLocator() {

+		return DomainContextEditPlugin.INSTANCE;

+	}

+

+}

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/DomainContextItemProvider.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/DomainContextItemProvider.java
index ba13f51889b..bc391f9e415 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/DomainContextItemProvider.java
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/DomainContextItemProvider.java
@@ -6,7 +6,6 @@
  */

 package org.eclipse.papyrus.domaincontextcodegen.provider;

 

-

 import java.util.Collection;

 import java.util.List;

 

@@ -67,7 +66,6 @@ public class DomainContextItemProvider extends ItemProviderAdapter implements IE
 			addSpecializationOfPropertyDescriptor(object);

 			addElementTypeIDPrefixPropertyDescriptor(object);

 			addElementTypeNamePrefixPropertyDescriptor(object);

-			addMatcherPatchPropertyDescriptor(object);

 			addDefaultHelperPathPropertyDescriptor(object);

 			addGeneratedSourceFolderPropertyDescriptor(object);

 		}

@@ -152,17 +150,6 @@ public class DomainContextItemProvider extends ItemProviderAdapter implements IE
 	}

 

 	/**

-	 * This adds a property descriptor for the Matcher Patch feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected void addMatcherPatchPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DomainContext_matcherPatch_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DomainContext_matcherPatch_feature", "_UI_DomainContext_type"), DomaincontextcodegenPackage.Literals.DOMAIN_CONTEXT__MATCHER_PATCH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

-	}

-

-	/**

 	 * This adds a property descriptor for the Default Helper Path feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

@@ -198,9 +185,11 @@ public class DomainContextItemProvider extends ItemProviderAdapter implements IE
 		if(childrenFeatures == null) {

 			super.getChildrenFeatures(object);

 			childrenFeatures.add(DomaincontextcodegenPackage.Literals.DOMAIN_CONTEXT__ELEMENT_TYPES);

-			childrenFeatures.add(DomaincontextcodegenPackage.Literals.DOMAIN_CONTEXT__ADVICEBINDINGS);

+			childrenFeatures.add(DomaincontextcodegenPackage.Literals.DOMAIN_CONTEXT__ADVICES);

 			childrenFeatures.add(DomaincontextcodegenPackage.Literals.DOMAIN_CONTEXT__BINDINGS);

 			childrenFeatures.add(DomaincontextcodegenPackage.Literals.DOMAIN_CONTEXT__GEN_HANDLERS);

+			childrenFeatures.add(DomaincontextcodegenPackage.Literals.DOMAIN_CONTEXT__MENU);

+			childrenFeatures.add(DomaincontextcodegenPackage.Literals.DOMAIN_CONTEXT__COMMAND);

 		}

 		return childrenFeatures;

 	}

@@ -262,15 +251,16 @@ public class DomainContextItemProvider extends ItemProviderAdapter implements IE
 		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__ICLIENT_CONTEXT_ID:

 		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__ELEMENT_TYPE_ID_PREFIX:

 		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__ELEMENT_TYPE_NAME_PREFIX:

-		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__MATCHER_PATCH:

 		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__DEFAULT_HELPER_PATH:

 		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__GENERATED_SOURCE_FOLDER:

 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

 			return;

 		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__ELEMENT_TYPES:

-		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__ADVICEBINDINGS:

+		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__ADVICES:

 		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__BINDINGS:

 		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__GEN_HANDLERS:

+		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__MENU:

+		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__COMMAND:

 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

 			return;

 		}

@@ -291,11 +281,15 @@ public class DomainContextItemProvider extends ItemProviderAdapter implements IE
 

 		newChildDescriptors.add(createChildParameter(DomaincontextcodegenPackage.Literals.DOMAIN_CONTEXT__ELEMENT_TYPES, DomaincontextcodegenFactory.eINSTANCE.createElementTypes()));

 

-		newChildDescriptors.add(createChildParameter(DomaincontextcodegenPackage.Literals.DOMAIN_CONTEXT__ADVICEBINDINGS, DomaincontextcodegenFactory.eINSTANCE.createAdviceBinding()));

+		newChildDescriptors.add(createChildParameter(DomaincontextcodegenPackage.Literals.DOMAIN_CONTEXT__ADVICES, DomaincontextcodegenFactory.eINSTANCE.createAdvice()));

 

-		newChildDescriptors.add(createChildParameter(DomaincontextcodegenPackage.Literals.DOMAIN_CONTEXT__BINDINGS, DomaincontextcodegenFactory.eINSTANCE.createBinding()));

+		newChildDescriptors.add(createChildParameter(DomaincontextcodegenPackage.Literals.DOMAIN_CONTEXT__BINDINGS, DomaincontextcodegenFactory.eINSTANCE.createElementTypeBindings()));

 

 		newChildDescriptors.add(createChildParameter(DomaincontextcodegenPackage.Literals.DOMAIN_CONTEXT__GEN_HANDLERS, DomaincontextcodegenFactory.eINSTANCE.createGenHandlers()));

+

+		newChildDescriptors.add(createChildParameter(DomaincontextcodegenPackage.Literals.DOMAIN_CONTEXT__MENU, DomaincontextcodegenFactory.eINSTANCE.createMenuDeclaration()));

+

+		newChildDescriptors.add(createChildParameter(DomaincontextcodegenPackage.Literals.DOMAIN_CONTEXT__COMMAND, DomaincontextcodegenFactory.eINSTANCE.createCommandDeclaration()));

 	}

 

 	/**

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/DomaincontextcodegenItemProviderAdapterFactory.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/DomaincontextcodegenItemProviderAdapterFactory.java
index aeb22fcf8a2..b0ecf8cfd1c 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/DomaincontextcodegenItemProviderAdapterFactory.java
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/DomaincontextcodegenItemProviderAdapterFactory.java
@@ -130,78 +130,153 @@ public class DomaincontextcodegenItemProviderAdapterFactory extends Domaincontex
 	}

 

 	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.domaincontextcodegen.ElementType} instances.

+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.domaincontextcodegen.MetaClassType} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @generated

 	 */

-	protected ElementTypeItemProvider elementTypeItemProvider;

+	protected MetaClassTypeItemProvider metaClassTypeItemProvider;

 

 	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.domaincontextcodegen.ElementType}.

+	 * This creates an adapter for a {@link org.eclipse.papyrus.domaincontextcodegen.MetaClassType}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @generated

 	 */

 	@Override

-	public Adapter createElementTypeAdapter() {

-		if(elementTypeItemProvider == null) {

-			elementTypeItemProvider = new ElementTypeItemProvider(this);

+	public Adapter createMetaClassTypeAdapter() {

+		if(metaClassTypeItemProvider == null) {

+			metaClassTypeItemProvider = new MetaClassTypeItemProvider(this);

 		}

 

-		return elementTypeItemProvider;

+		return metaClassTypeItemProvider;

 	}

 

 	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.domaincontextcodegen.AdviceBinding} instances.

+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.domaincontextcodegen.SpecializationType} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @generated

 	 */

-	protected AdviceBindingItemProvider adviceBindingItemProvider;

+	protected SpecializationTypeItemProvider specializationTypeItemProvider;

 

 	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.domaincontextcodegen.AdviceBinding}.

+	 * This creates an adapter for a {@link org.eclipse.papyrus.domaincontextcodegen.SpecializationType}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @generated

 	 */

 	@Override

-	public Adapter createAdviceBindingAdapter() {

-		if(adviceBindingItemProvider == null) {

-			adviceBindingItemProvider = new AdviceBindingItemProvider(this);

+	public Adapter createSpecializationTypeAdapter() {

+		if(specializationTypeItemProvider == null) {

+			specializationTypeItemProvider = new SpecializationTypeItemProvider(this);

 		}

 

-		return adviceBindingItemProvider;

+		return specializationTypeItemProvider;

+	}

+

+	/**

+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.domaincontextcodegen.Advice} instances.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected AdviceItemProvider adviceItemProvider;

+

+	/**

+	 * This creates an adapter for a {@link org.eclipse.papyrus.domaincontextcodegen.Advice}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public Adapter createAdviceAdapter() {

+		if(adviceItemProvider == null) {

+			adviceItemProvider = new AdviceItemProvider(this);

+		}

+

+		return adviceItemProvider;

 	}

 

 	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.domaincontextcodegen.Binding} instances.

+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.domaincontextcodegen.ElementTypeBindings} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @generated

 	 */

-	protected BindingItemProvider bindingItemProvider;

+	protected ElementTypeBindingsItemProvider elementTypeBindingsItemProvider;

 

 	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.domaincontextcodegen.Binding}.

+	 * This creates an adapter for a {@link org.eclipse.papyrus.domaincontextcodegen.ElementTypeBindings}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @generated

 	 */

 	@Override

-	public Adapter createBindingAdapter() {

-		if(bindingItemProvider == null) {

-			bindingItemProvider = new BindingItemProvider(this);

+	public Adapter createElementTypeBindingsAdapter() {

+		if(elementTypeBindingsItemProvider == null) {

+			elementTypeBindingsItemProvider = new ElementTypeBindingsItemProvider(this);

 		}

 

-		return bindingItemProvider;

+		return elementTypeBindingsItemProvider;

+	}

+

+	/**

+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.domaincontextcodegen.ElementTypeBinding} instances.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected ElementTypeBindingItemProvider elementTypeBindingItemProvider;

+

+	/**

+	 * This creates an adapter for a {@link org.eclipse.papyrus.domaincontextcodegen.ElementTypeBinding}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public Adapter createElementTypeBindingAdapter() {

+		if(elementTypeBindingItemProvider == null) {

+			elementTypeBindingItemProvider = new ElementTypeBindingItemProvider(this);

+		}

+

+		return elementTypeBindingItemProvider;

+	}

+

+	/**

+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.domaincontextcodegen.AdviceBinding} instances.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected AdviceBindingItemProvider adviceBindingItemProvider;

+

+	/**

+	 * This creates an adapter for a {@link org.eclipse.papyrus.domaincontextcodegen.AdviceBinding}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public Adapter createAdviceBindingAdapter() {

+		if(adviceBindingItemProvider == null) {

+			adviceBindingItemProvider = new AdviceBindingItemProvider(this);

+		}

+

+		return adviceBindingItemProvider;

 	}

 

 	/**

@@ -230,6 +305,131 @@ public class DomaincontextcodegenItemProviderAdapterFactory extends Domaincontex
 	}

 

 	/**

+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.domaincontextcodegen.StereotypedElementMatcher} instances.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected StereotypedElementMatcherItemProvider stereotypedElementMatcherItemProvider;

+

+	/**

+	 * This creates an adapter for a {@link org.eclipse.papyrus.domaincontextcodegen.StereotypedElementMatcher}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public Adapter createStereotypedElementMatcherAdapter() {

+		if(stereotypedElementMatcherItemProvider == null) {

+			stereotypedElementMatcherItemProvider = new StereotypedElementMatcherItemProvider(this);

+		}

+

+		return stereotypedElementMatcherItemProvider;

+	}

+

+	/**

+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.domaincontextcodegen.StereotypedElementHelper} instances.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected StereotypedElementHelperItemProvider stereotypedElementHelperItemProvider;

+

+	/**

+	 * This creates an adapter for a {@link org.eclipse.papyrus.domaincontextcodegen.StereotypedElementHelper}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public Adapter createStereotypedElementHelperAdapter() {

+		if(stereotypedElementHelperItemProvider == null) {

+			stereotypedElementHelperItemProvider = new StereotypedElementHelperItemProvider(this);

+		}

+

+		return stereotypedElementHelperItemProvider;

+	}

+

+	/**

+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.domaincontextcodegen.MenuDeclaration} instances.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected MenuDeclarationItemProvider menuDeclarationItemProvider;

+

+	/**

+	 * This creates an adapter for a {@link org.eclipse.papyrus.domaincontextcodegen.MenuDeclaration}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public Adapter createMenuDeclarationAdapter() {

+		if(menuDeclarationItemProvider == null) {

+			menuDeclarationItemProvider = new MenuDeclarationItemProvider(this);

+		}

+

+		return menuDeclarationItemProvider;

+	}

+

+	/**

+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.domaincontextcodegen.CommandDeclaration} instances.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected CommandDeclarationItemProvider commandDeclarationItemProvider;

+

+	/**

+	 * This creates an adapter for a {@link org.eclipse.papyrus.domaincontextcodegen.CommandDeclaration}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public Adapter createCommandDeclarationAdapter() {

+		if(commandDeclarationItemProvider == null) {

+			commandDeclarationItemProvider = new CommandDeclarationItemProvider(this);

+		}

+

+		return commandDeclarationItemProvider;

+	}

+

+	/**

+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.domaincontextcodegen.Command} instances.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected CommandItemProvider commandItemProvider;

+

+	/**

+	 * This creates an adapter for a {@link org.eclipse.papyrus.domaincontextcodegen.Command}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public Adapter createCommandAdapter() {

+		if(commandItemProvider == null) {

+			commandItemProvider = new CommandItemProvider(this);

+		}

+

+		return commandItemProvider;

+	}

+

+	/**

 	 * This returns the root adapter factory that contains this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

@@ -341,14 +541,30 @@ public class DomaincontextcodegenItemProviderAdapterFactory extends Domaincontex
 			domainContextItemProvider.dispose();

 		if(elementTypesItemProvider != null)

 			elementTypesItemProvider.dispose();

-		if(elementTypeItemProvider != null)

-			elementTypeItemProvider.dispose();

+		if(metaClassTypeItemProvider != null)

+			metaClassTypeItemProvider.dispose();

+		if(specializationTypeItemProvider != null)

+			specializationTypeItemProvider.dispose();

+		if(adviceItemProvider != null)

+			adviceItemProvider.dispose();

+		if(elementTypeBindingsItemProvider != null)

+			elementTypeBindingsItemProvider.dispose();

+		if(elementTypeBindingItemProvider != null)

+			elementTypeBindingItemProvider.dispose();

 		if(adviceBindingItemProvider != null)

 			adviceBindingItemProvider.dispose();

-		if(bindingItemProvider != null)

-			bindingItemProvider.dispose();

 		if(genHandlersItemProvider != null)

 			genHandlersItemProvider.dispose();

+		if(stereotypedElementMatcherItemProvider != null)

+			stereotypedElementMatcherItemProvider.dispose();

+		if(stereotypedElementHelperItemProvider != null)

+			stereotypedElementHelperItemProvider.dispose();

+		if(menuDeclarationItemProvider != null)

+			menuDeclarationItemProvider.dispose();

+		if(commandDeclarationItemProvider != null)

+			commandDeclarationItemProvider.dispose();

+		if(commandItemProvider != null)

+			commandItemProvider.dispose();

 	}

 

 }

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/ElementTypeBindingItemProvider.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/ElementTypeBindingItemProvider.java
new file mode 100644
index 00000000000..4404ad0f09c
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/ElementTypeBindingItemProvider.java
@@ -0,0 +1,131 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.domaincontextcodegen.provider;

+

+import java.util.Collection;

+import java.util.List;

+

+import org.eclipse.emf.common.notify.AdapterFactory;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage;

+import org.eclipse.papyrus.domaincontextcodegen.ElementTypeBinding;

+

+/**

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.domaincontextcodegen.ElementTypeBinding} object.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * 

+ * @generated

+ */

+public class ElementTypeBindingItemProvider extends BindingItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {

+

+	/**

+	 * This constructs an instance from a factory and a notifier.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public ElementTypeBindingItemProvider(AdapterFactory adapterFactory) {

+		super(adapterFactory);

+	}

+

+	/**

+	 * This returns the property descriptors for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

+		if(itemPropertyDescriptors == null) {

+			super.getPropertyDescriptors(object);

+

+			addRefPropertyDescriptor(object);

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

+	 * This adds a property descriptor for the Ref feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected void addRefPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ElementTypeBinding_ref_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ElementTypeBinding_ref_feature", "_UI_ElementTypeBinding_type"), DomaincontextcodegenPackage.Literals.ELEMENT_TYPE_BINDING__REF, true, false, true, null, null, null));

+	}

+

+	/**

+	 * This returns ElementTypeBinding.gif.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public Object getImage(Object object) {

+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ElementTypeBinding"));

+	}

+

+	/**

+	 * This returns the label text for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated NOT

+	 */

+	@Override

+	public String getText(Object object) {

+

+		ElementTypeBinding binding = (ElementTypeBinding)object;

+		String label = "pattern : " + binding.getPattern();

+

+		if((binding.getRef() != null) && (binding.getRef().getName() != null)) {

+			label = "ref. : " + binding.getRef().getName();

+		}

+

+		return label == null || label.length() == 0 ? getString("_UI_ElementTypeBinding_type") : label + " (" + getString("_UI_ElementTypeBinding_type") + ")";

+	}

+

+	/**

+	 * This handles model notifications by calling {@link #updateChildren} to update any cached

+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public void notifyChanged(Notification notification) {

+		updateChildren(notification);

+		super.notifyChanged(notification);

+	}

+

+	/**

+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

+	 * that can be created under this object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

+		super.collectNewChildDescriptors(newChildDescriptors, object);

+	}

+

+}

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/ElementTypeBindingsItemProvider.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/ElementTypeBindingsItemProvider.java
new file mode 100644
index 00000000000..388cd3e0000
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/ElementTypeBindingsItemProvider.java
@@ -0,0 +1,187 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.domaincontextcodegen.provider;

+

+import java.util.Collection;

+import java.util.List;

+

+import org.eclipse.emf.common.notify.AdapterFactory;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.util.ResourceLocator;

+import org.eclipse.emf.ecore.EStructuralFeature;

+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.ItemProviderAdapter;

+import org.eclipse.emf.edit.provider.ViewerNotification;

+import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenFactory;

+import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage;

+import org.eclipse.papyrus.domaincontextcodegen.ElementTypeBindings;

+

+/**

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.domaincontextcodegen.ElementTypeBindings} object.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * 

+ * @generated

+ */

+public class ElementTypeBindingsItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {

+

+	/**

+	 * This constructs an instance from a factory and a notifier.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public ElementTypeBindingsItemProvider(AdapterFactory adapterFactory) {

+		super(adapterFactory);

+	}

+

+	/**

+	 * This returns the property descriptors for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

+		if(itemPropertyDescriptors == null) {

+			super.getPropertyDescriptors(object);

+

+			addClientContextIDPropertyDescriptor(object);

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

+	 * This adds a property descriptor for the Client Context ID feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected void addClientContextIDPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ElementTypeBindings_clientContextID_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ElementTypeBindings_clientContextID_feature", "_UI_ElementTypeBindings_type"), DomaincontextcodegenPackage.Literals.ELEMENT_TYPE_BINDINGS__CLIENT_CONTEXT_ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

+	}

+

+	/**

+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

+		if(childrenFeatures == null) {

+			super.getChildrenFeatures(object);

+			childrenFeatures.add(DomaincontextcodegenPackage.Literals.ELEMENT_TYPE_BINDINGS__BINDINGS);

+		}

+		return childrenFeatures;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	protected EStructuralFeature getChildFeature(Object object, Object child) {

+		// Check the type of the specified child object and return the proper feature to use for

+		// adding (see {@link AddCommand}) it as a child.

+

+		return super.getChildFeature(object, child);

+	}

+

+	/**

+	 * This returns ElementTypeBindings.gif.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public Object getImage(Object object) {

+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ElementTypeBindings"));

+	}

+

+	/**

+	 * This returns the label text for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public String getText(Object object) {

+		String label = ((ElementTypeBindings)object).getClientContextID();

+		return label == null || label.length() == 0 ? getString("_UI_ElementTypeBindings_type") : getString("_UI_ElementTypeBindings_type") + " " + label;

+	}

+

+	/**

+	 * This handles model notifications by calling {@link #updateChildren} to update any cached

+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public void notifyChanged(Notification notification) {

+		updateChildren(notification);

+

+		switch(notification.getFeatureID(ElementTypeBindings.class)) {

+		case DomaincontextcodegenPackage.ELEMENT_TYPE_BINDINGS__CLIENT_CONTEXT_ID:

+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+			return;

+		case DomaincontextcodegenPackage.ELEMENT_TYPE_BINDINGS__BINDINGS:

+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

+			return;

+		}

+		super.notifyChanged(notification);

+	}

+

+	/**

+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

+	 * that can be created under this object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

+		super.collectNewChildDescriptors(newChildDescriptors, object);

+

+		newChildDescriptors.add(createChildParameter(DomaincontextcodegenPackage.Literals.ELEMENT_TYPE_BINDINGS__BINDINGS, DomaincontextcodegenFactory.eINSTANCE.createElementTypeBinding()));

+

+		newChildDescriptors.add(createChildParameter(DomaincontextcodegenPackage.Literals.ELEMENT_TYPE_BINDINGS__BINDINGS, DomaincontextcodegenFactory.eINSTANCE.createAdviceBinding()));

+	}

+

+	/**

+	 * Return the resource locator for this item provider's resources.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public ResourceLocator getResourceLocator() {

+		return DomainContextEditPlugin.INSTANCE;

+	}

+

+}

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/ElementTypeItemProvider.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/ElementTypeItemProvider.java
index 633ccfe4183..c741e5f9d33 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/ElementTypeItemProvider.java
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/ElementTypeItemProvider.java
@@ -6,7 +6,6 @@
  */

 package org.eclipse.papyrus.domaincontextcodegen.provider;

 

-

 import java.util.Collection;

 import java.util.List;

 

@@ -58,80 +57,44 @@ public class ElementTypeItemProvider extends ItemProviderAdapter implements IEdi
 		if(itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

-			addMetaClassPropertyDescriptor(object);

-			addSpecificNamePropertyDescriptor(object);

-			addEdithelper_EditHelperAdvicePathPropertyDescriptor(object);

-			addKindPropertyDescriptor(object);

-			addSpecializationofPropertyDescriptor(object);

-			addSpecializationIDofPropertyDescriptor(object);

+			addNamePropertyDescriptor(object);

+			addHelperPropertyDescriptor(object);

+			addIconPropertyDescriptor(object);

 		}

 		return itemPropertyDescriptors;

 	}

 

 	/**

-	 * This adds a property descriptor for the Meta Class feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected void addMetaClassPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ElementType_metaClass_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ElementType_metaClass_feature", "_UI_ElementType_type"), DomaincontextcodegenPackage.Literals.ELEMENT_TYPE__META_CLASS, true, false, true, null, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Specific Name feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected void addSpecificNamePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ElementType_specificName_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ElementType_specificName_feature", "_UI_ElementType_type"), DomaincontextcodegenPackage.Literals.ELEMENT_TYPE__SPECIFIC_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Edithelper Edit Helper Advice Path feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected void addEdithelper_EditHelperAdvicePathPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ElementType_edithelper_EditHelperAdvicePath_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ElementType_edithelper_EditHelperAdvicePath_feature", "_UI_ElementType_type"), DomaincontextcodegenPackage.Literals.ELEMENT_TYPE__EDITHELPER_EDIT_HELPER_ADVICE_PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Kind feature.

+	 * This adds a property descriptor for the Name feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @generated

 	 */

-	protected void addKindPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ElementType_kind_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ElementType_kind_feature", "_UI_ElementType_type"), DomaincontextcodegenPackage.Literals.ELEMENT_TYPE__KIND, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

+	protected void addNamePropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ElementType_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ElementType_name_feature", "_UI_ElementType_type"), DomaincontextcodegenPackage.Literals.ELEMENT_TYPE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

 	}

 

 	/**

-	 * This adds a property descriptor for the Specializationof feature.

+	 * This adds a property descriptor for the Helper feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @generated

 	 */

-	protected void addSpecializationofPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ElementType_specializationof_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ElementType_specializationof_feature", "_UI_ElementType_type"), DomaincontextcodegenPackage.Literals.ELEMENT_TYPE__SPECIALIZATIONOF, true, false, true, null, null, null));

+	protected void addHelperPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ElementType_helper_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ElementType_helper_feature", "_UI_ElementType_type"), DomaincontextcodegenPackage.Literals.ELEMENT_TYPE__HELPER, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

 	}

 

 	/**

-	 * This adds a property descriptor for the Specialization IDof feature.

+	 * This adds a property descriptor for the Icon feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @generated

 	 */

-	protected void addSpecializationIDofPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ElementType_specializationIDof_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ElementType_specializationIDof_feature", "_UI_ElementType_type"), DomaincontextcodegenPackage.Literals.ELEMENT_TYPE__SPECIALIZATION_IDOF, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

+	protected void addIconPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ElementType_icon_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ElementType_icon_feature", "_UI_ElementType_type"), DomaincontextcodegenPackage.Literals.ELEMENT_TYPE__ICON, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

 	}

 

 	/**

@@ -155,7 +118,7 @@ public class ElementTypeItemProvider extends ItemProviderAdapter implements IEdi
 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((ElementType)object).getSpecificName();

+		String label = ((ElementType)object).getName();

 		return label == null || label.length() == 0 ? getString("_UI_ElementType_type") : getString("_UI_ElementType_type") + " " + label;

 	}

 

@@ -172,10 +135,9 @@ public class ElementTypeItemProvider extends ItemProviderAdapter implements IEdi
 		updateChildren(notification);

 

 		switch(notification.getFeatureID(ElementType.class)) {

-		case DomaincontextcodegenPackage.ELEMENT_TYPE__SPECIFIC_NAME:

-		case DomaincontextcodegenPackage.ELEMENT_TYPE__EDITHELPER_EDIT_HELPER_ADVICE_PATH:

-		case DomaincontextcodegenPackage.ELEMENT_TYPE__KIND:

-		case DomaincontextcodegenPackage.ELEMENT_TYPE__SPECIALIZATION_IDOF:

+		case DomaincontextcodegenPackage.ELEMENT_TYPE__NAME:

+		case DomaincontextcodegenPackage.ELEMENT_TYPE__HELPER:

+		case DomaincontextcodegenPackage.ELEMENT_TYPE__ICON:

 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

 			return;

 		}

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/ElementTypesItemProvider.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/ElementTypesItemProvider.java
index 6d15ac6ec00..a46619f8300 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/ElementTypesItemProvider.java
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/ElementTypesItemProvider.java
@@ -6,7 +6,6 @@
  */

 package org.eclipse.papyrus.domaincontextcodegen.provider;

 

-

 import java.util.Collection;

 import java.util.List;

 

@@ -150,7 +149,9 @@ public class ElementTypesItemProvider extends ItemProviderAdapter implements IEd
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

 		super.collectNewChildDescriptors(newChildDescriptors, object);

 

-		newChildDescriptors.add(createChildParameter(DomaincontextcodegenPackage.Literals.ELEMENT_TYPES__TYPES, DomaincontextcodegenFactory.eINSTANCE.createElementType()));

+		newChildDescriptors.add(createChildParameter(DomaincontextcodegenPackage.Literals.ELEMENT_TYPES__TYPES, DomaincontextcodegenFactory.eINSTANCE.createMetaClassType()));

+

+		newChildDescriptors.add(createChildParameter(DomaincontextcodegenPackage.Literals.ELEMENT_TYPES__TYPES, DomaincontextcodegenFactory.eINSTANCE.createSpecializationType()));

 	}

 

 	/**

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/GenHandlersItemProvider.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/GenHandlersItemProvider.java
index d76f876137a..40861a907c9 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/GenHandlersItemProvider.java
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/GenHandlersItemProvider.java
@@ -6,7 +6,6 @@
  */

 package org.eclipse.papyrus.domaincontextcodegen.provider;

 

-

 import java.util.Collection;

 import java.util.List;

 

@@ -63,6 +62,9 @@ public class GenHandlersItemProvider extends ItemProviderAdapter implements IEdi
 			addSuperClassPackagePropertyDescriptor(object);

 			addElementTypeEnumeratorPropertyDescriptor(object);

 			addElementTypeEnumeratorPackagePropertyDescriptor(object);

+			addVisibleCreateChildHandlersPropertyDescriptor(object);

+			addParentDomainCreateChildPropertyDescriptor(object);

+			addCreateChildMenuLocationURIPropertyDescriptor(object);

 		}

 		return itemPropertyDescriptors;

 	}

@@ -123,6 +125,39 @@ public class GenHandlersItemProvider extends ItemProviderAdapter implements IEdi
 	}

 

 	/**

+	 * This adds a property descriptor for the Visible Create Child Handlers feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected void addVisibleCreateChildHandlersPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GenHandlers_visibleCreateChildHandlers_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GenHandlers_visibleCreateChildHandlers_feature", "_UI_GenHandlers_type"), DomaincontextcodegenPackage.Literals.GEN_HANDLERS__VISIBLE_CREATE_CHILD_HANDLERS, true, false, true, null, null, null));

+	}

+

+	/**

+	 * This adds a property descriptor for the Parent Domain Create Child feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected void addParentDomainCreateChildPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GenHandlers_parentDomainCreateChild_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GenHandlers_parentDomainCreateChild_feature", "_UI_GenHandlers_type"), DomaincontextcodegenPackage.Literals.GEN_HANDLERS__PARENT_DOMAIN_CREATE_CHILD, true, false, true, null, null, null));

+	}

+

+	/**

+	 * This adds a property descriptor for the Create Child Menu Location URI feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected void addCreateChildMenuLocationURIPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GenHandlers_createChildMenuLocationURI_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GenHandlers_createChildMenuLocationURI_feature", "_UI_GenHandlers_type"), DomaincontextcodegenPackage.Literals.GEN_HANDLERS__CREATE_CHILD_MENU_LOCATION_URI, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

+	}

+

+	/**

 	 * This returns GenHandlers.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

@@ -165,6 +200,7 @@ public class GenHandlersItemProvider extends ItemProviderAdapter implements IEdi
 		case DomaincontextcodegenPackage.GEN_HANDLERS__SUPER_CLASS_PACKAGE:

 		case DomaincontextcodegenPackage.GEN_HANDLERS__ELEMENT_TYPE_ENUMERATOR:

 		case DomaincontextcodegenPackage.GEN_HANDLERS__ELEMENT_TYPE_ENUMERATOR_PACKAGE:

+		case DomaincontextcodegenPackage.GEN_HANDLERS__CREATE_CHILD_MENU_LOCATION_URI:

 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

 			return;

 		}

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/GenHelperItemProvider.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/GenHelperItemProvider.java
new file mode 100644
index 00000000000..44a958c8050
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/GenHelperItemProvider.java
@@ -0,0 +1,134 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.domaincontextcodegen.provider;

+

+import java.util.Collection;

+import java.util.List;

+

+import org.eclipse.emf.common.notify.AdapterFactory;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.util.ResourceLocator;

+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.ItemProviderAdapter;

+import org.eclipse.emf.edit.provider.ViewerNotification;

+import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage;

+import org.eclipse.papyrus.domaincontextcodegen.GenHelper;

+

+/**

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.domaincontextcodegen.GenHelper} object.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * 

+ * @generated

+ */

+public class GenHelperItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {

+

+	/**

+	 * This constructs an instance from a factory and a notifier.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public GenHelperItemProvider(AdapterFactory adapterFactory) {

+		super(adapterFactory);

+	}

+

+	/**

+	 * This returns the property descriptors for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

+		if(itemPropertyDescriptors == null) {

+			super.getPropertyDescriptors(object);

+

+			addNamePropertyDescriptor(object);

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

+	 * This adds a property descriptor for the Name feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected void addNamePropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GenHelper_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GenHelper_name_feature", "_UI_GenHelper_type"), DomaincontextcodegenPackage.Literals.GEN_HELPER__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

+	}

+

+	/**

+	 * This returns the label text for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public String getText(Object object) {

+		String label = ((GenHelper)object).getName();

+		return label == null || label.length() == 0 ? getString("_UI_GenHelper_type") : getString("_UI_GenHelper_type") + " " + label;

+	}

+

+	/**

+	 * This handles model notifications by calling {@link #updateChildren} to update any cached

+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public void notifyChanged(Notification notification) {

+		updateChildren(notification);

+

+		switch(notification.getFeatureID(GenHelper.class)) {

+		case DomaincontextcodegenPackage.GEN_HELPER__NAME:

+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+			return;

+		}

+		super.notifyChanged(notification);

+	}

+

+	/**

+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

+	 * that can be created under this object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

+		super.collectNewChildDescriptors(newChildDescriptors, object);

+	}

+

+	/**

+	 * Return the resource locator for this item provider's resources.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public ResourceLocator getResourceLocator() {

+		return DomainContextEditPlugin.INSTANCE;

+	}

+

+}

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/GenMatcherItemProvider.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/GenMatcherItemProvider.java
new file mode 100644
index 00000000000..ba7c8f4c6f5
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/GenMatcherItemProvider.java
@@ -0,0 +1,134 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.domaincontextcodegen.provider;

+

+import java.util.Collection;

+import java.util.List;

+

+import org.eclipse.emf.common.notify.AdapterFactory;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.util.ResourceLocator;

+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.ItemProviderAdapter;

+import org.eclipse.emf.edit.provider.ViewerNotification;

+import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage;

+import org.eclipse.papyrus.domaincontextcodegen.GenMatcher;

+

+/**

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.domaincontextcodegen.GenMatcher} object.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * 

+ * @generated

+ */

+public class GenMatcherItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {

+

+	/**

+	 * This constructs an instance from a factory and a notifier.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public GenMatcherItemProvider(AdapterFactory adapterFactory) {

+		super(adapterFactory);

+	}

+

+	/**

+	 * This returns the property descriptors for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

+		if(itemPropertyDescriptors == null) {

+			super.getPropertyDescriptors(object);

+

+			addNamePropertyDescriptor(object);

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

+	 * This adds a property descriptor for the Name feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected void addNamePropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GenMatcher_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GenMatcher_name_feature", "_UI_GenMatcher_type"), DomaincontextcodegenPackage.Literals.GEN_MATCHER__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

+	}

+

+	/**

+	 * This returns the label text for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public String getText(Object object) {

+		String label = ((GenMatcher)object).getName();

+		return label == null || label.length() == 0 ? getString("_UI_GenMatcher_type") : getString("_UI_GenMatcher_type") + " " + label;

+	}

+

+	/**

+	 * This handles model notifications by calling {@link #updateChildren} to update any cached

+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public void notifyChanged(Notification notification) {

+		updateChildren(notification);

+

+		switch(notification.getFeatureID(GenMatcher.class)) {

+		case DomaincontextcodegenPackage.GEN_MATCHER__NAME:

+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+			return;

+		}

+		super.notifyChanged(notification);

+	}

+

+	/**

+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

+	 * that can be created under this object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

+		super.collectNewChildDescriptors(newChildDescriptors, object);

+	}

+

+	/**

+	 * Return the resource locator for this item provider's resources.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public ResourceLocator getResourceLocator() {

+		return DomainContextEditPlugin.INSTANCE;

+	}

+

+}

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/MenuDeclarationItemProvider.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/MenuDeclarationItemProvider.java
new file mode 100644
index 00000000000..b033bc40c3a
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/MenuDeclarationItemProvider.java
@@ -0,0 +1,158 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.domaincontextcodegen.provider;

+

+import java.util.Collection;

+import java.util.List;

+

+import org.eclipse.emf.common.notify.AdapterFactory;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.util.ResourceLocator;

+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.ItemProviderAdapter;

+import org.eclipse.emf.edit.provider.ViewerNotification;

+import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage;

+import org.eclipse.papyrus.domaincontextcodegen.MenuDeclaration;

+

+/**

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.domaincontextcodegen.MenuDeclaration} object.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * 

+ * @generated

+ */

+public class MenuDeclarationItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {

+

+	/**

+	 * This constructs an instance from a factory and a notifier.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public MenuDeclarationItemProvider(AdapterFactory adapterFactory) {

+		super(adapterFactory);

+	}

+

+	/**

+	 * This returns the property descriptors for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

+		if(itemPropertyDescriptors == null) {

+			super.getPropertyDescriptors(object);

+

+			addLocationURIPropertyDescriptor(object);

+			addCommandsPropertyDescriptor(object);

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

+	 * This adds a property descriptor for the Location URI feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected void addLocationURIPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_MenuDeclaration_locationURI_feature"), getString("_UI_PropertyDescriptor_description", "_UI_MenuDeclaration_locationURI_feature", "_UI_MenuDeclaration_type"), DomaincontextcodegenPackage.Literals.MENU_DECLARATION__LOCATION_URI, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

+	}

+

+	/**

+	 * This adds a property descriptor for the Commands feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected void addCommandsPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_MenuDeclaration_commands_feature"), getString("_UI_PropertyDescriptor_description", "_UI_MenuDeclaration_commands_feature", "_UI_MenuDeclaration_type"), DomaincontextcodegenPackage.Literals.MENU_DECLARATION__COMMANDS, true, false, true, null, null, null));

+	}

+

+	/**

+	 * This returns MenuDeclaration.gif.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public Object getImage(Object object) {

+		return overlayImage(object, getResourceLocator().getImage("full/obj16/MenuDeclaration"));

+	}

+

+	/**

+	 * This returns the label text for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public String getText(Object object) {

+		String label = ((MenuDeclaration)object).getLocationURI();

+		return label == null || label.length() == 0 ? getString("_UI_MenuDeclaration_type") : getString("_UI_MenuDeclaration_type") + " " + label;

+	}

+

+	/**

+	 * This handles model notifications by calling {@link #updateChildren} to update any cached

+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public void notifyChanged(Notification notification) {

+		updateChildren(notification);

+

+		switch(notification.getFeatureID(MenuDeclaration.class)) {

+		case DomaincontextcodegenPackage.MENU_DECLARATION__LOCATION_URI:

+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+			return;

+		}

+		super.notifyChanged(notification);

+	}

+

+	/**

+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

+	 * that can be created under this object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

+		super.collectNewChildDescriptors(newChildDescriptors, object);

+	}

+

+	/**

+	 * Return the resource locator for this item provider's resources.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public ResourceLocator getResourceLocator() {

+		return DomainContextEditPlugin.INSTANCE;

+	}

+

+}

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/MetaClassTypeItemProvider.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/MetaClassTypeItemProvider.java
new file mode 100644
index 00000000000..5ba0daf3f14
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/MetaClassTypeItemProvider.java
@@ -0,0 +1,124 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.domaincontextcodegen.provider;

+

+import java.util.Collection;

+import java.util.List;

+

+import org.eclipse.emf.common.notify.AdapterFactory;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage;

+import org.eclipse.papyrus.domaincontextcodegen.MetaClassType;

+

+/**

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.domaincontextcodegen.MetaClassType} object.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * 

+ * @generated

+ */

+public class MetaClassTypeItemProvider extends ElementTypeItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {

+

+	/**

+	 * This constructs an instance from a factory and a notifier.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public MetaClassTypeItemProvider(AdapterFactory adapterFactory) {

+		super(adapterFactory);

+	}

+

+	/**

+	 * This returns the property descriptors for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

+		if(itemPropertyDescriptors == null) {

+			super.getPropertyDescriptors(object);

+

+			addMetaClassPropertyDescriptor(object);

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

+	 * This adds a property descriptor for the Meta Class feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected void addMetaClassPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_MetaClassType_metaClass_feature"), getString("_UI_PropertyDescriptor_description", "_UI_MetaClassType_metaClass_feature", "_UI_MetaClassType_type"), DomaincontextcodegenPackage.Literals.META_CLASS_TYPE__META_CLASS, true, false, true, null, null, null));

+	}

+

+	/**

+	 * This returns MetaClassType.gif.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public Object getImage(Object object) {

+		return overlayImage(object, getResourceLocator().getImage("full/obj16/MetaClassType"));

+	}

+

+	/**

+	 * This returns the label text for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public String getText(Object object) {

+		String label = ((MetaClassType)object).getName();

+		return label == null || label.length() == 0 ? getString("_UI_MetaClassType_type") : getString("_UI_MetaClassType_type") + " " + label;

+	}

+

+	/**

+	 * This handles model notifications by calling {@link #updateChildren} to update any cached

+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public void notifyChanged(Notification notification) {

+		updateChildren(notification);

+		super.notifyChanged(notification);

+	}

+

+	/**

+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

+	 * that can be created under this object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

+		super.collectNewChildDescriptors(newChildDescriptors, object);

+	}

+

+}

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/SpecializationTypeItemProvider.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/SpecializationTypeItemProvider.java
new file mode 100644
index 00000000000..1c610d2f290
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/SpecializationTypeItemProvider.java
@@ -0,0 +1,187 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.domaincontextcodegen.provider;

+

+import java.util.Collection;

+import java.util.List;

+

+import org.eclipse.emf.common.notify.AdapterFactory;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EStructuralFeature;

+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.ViewerNotification;

+import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenFactory;

+import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage;

+import org.eclipse.papyrus.domaincontextcodegen.SpecializationType;

+

+/**

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.domaincontextcodegen.SpecializationType} object.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * 

+ * @generated

+ */

+public class SpecializationTypeItemProvider extends ElementTypeItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {

+

+	/**

+	 * This constructs an instance from a factory and a notifier.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public SpecializationTypeItemProvider(AdapterFactory adapterFactory) {

+		super(adapterFactory);

+	}

+

+	/**

+	 * This returns the property descriptors for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

+		if(itemPropertyDescriptors == null) {

+			super.getPropertyDescriptors(object);

+

+			addRefPropertyDescriptor(object);

+			addMatcherPropertyDescriptor(object);

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

+	 * This adds a property descriptor for the Ref feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected void addRefPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_SpecializationType_ref_feature"), getString("_UI_PropertyDescriptor_description", "_UI_SpecializationType_ref_feature", "_UI_SpecializationType_type"), DomaincontextcodegenPackage.Literals.SPECIALIZATION_TYPE__REF, true, false, true, null, null, null));

+	}

+

+	/**

+	 * This adds a property descriptor for the Matcher feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected void addMatcherPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_SpecializationType_matcher_feature"), getString("_UI_PropertyDescriptor_description", "_UI_SpecializationType_matcher_feature", "_UI_SpecializationType_type"), DomaincontextcodegenPackage.Literals.SPECIALIZATION_TYPE__MATCHER, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

+	}

+

+	/**

+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

+		if(childrenFeatures == null) {

+			super.getChildrenFeatures(object);

+			childrenFeatures.add(DomaincontextcodegenPackage.Literals.SPECIALIZATION_TYPE__GEN_MATCHER);

+			childrenFeatures.add(DomaincontextcodegenPackage.Literals.SPECIALIZATION_TYPE__GEN_HELPER);

+		}

+		return childrenFeatures;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	protected EStructuralFeature getChildFeature(Object object, Object child) {

+		// Check the type of the specified child object and return the proper feature to use for

+		// adding (see {@link AddCommand}) it as a child.

+

+		return super.getChildFeature(object, child);

+	}

+

+	/**

+	 * This returns SpecializationType.gif.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public Object getImage(Object object) {

+		return overlayImage(object, getResourceLocator().getImage("full/obj16/SpecializationType"));

+	}

+

+	/**

+	 * This returns the label text for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public String getText(Object object) {

+		String label = ((SpecializationType)object).getName();

+		return label == null || label.length() == 0 ? getString("_UI_SpecializationType_type") : getString("_UI_SpecializationType_type") + " " + label;

+	}

+

+	/**

+	 * This handles model notifications by calling {@link #updateChildren} to update any cached

+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public void notifyChanged(Notification notification) {

+		updateChildren(notification);

+

+		switch(notification.getFeatureID(SpecializationType.class)) {

+		case DomaincontextcodegenPackage.SPECIALIZATION_TYPE__MATCHER:

+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+			return;

+		case DomaincontextcodegenPackage.SPECIALIZATION_TYPE__GEN_MATCHER:

+		case DomaincontextcodegenPackage.SPECIALIZATION_TYPE__GEN_HELPER:

+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

+			return;

+		}

+		super.notifyChanged(notification);

+	}

+

+	/**

+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

+	 * that can be created under this object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

+		super.collectNewChildDescriptors(newChildDescriptors, object);

+

+		newChildDescriptors.add(createChildParameter(DomaincontextcodegenPackage.Literals.SPECIALIZATION_TYPE__GEN_MATCHER, DomaincontextcodegenFactory.eINSTANCE.createStereotypedElementMatcher()));

+

+		newChildDescriptors.add(createChildParameter(DomaincontextcodegenPackage.Literals.SPECIALIZATION_TYPE__GEN_HELPER, DomaincontextcodegenFactory.eINSTANCE.createStereotypedElementHelper()));

+	}

+

+}

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/StereotypedElementHelperItemProvider.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/StereotypedElementHelperItemProvider.java
new file mode 100644
index 00000000000..7925caea595
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/StereotypedElementHelperItemProvider.java
@@ -0,0 +1,171 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.domaincontextcodegen.provider;

+

+import java.util.Collection;

+import java.util.List;

+

+import org.eclipse.emf.common.notify.AdapterFactory;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.ViewerNotification;

+import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage;

+import org.eclipse.papyrus.domaincontextcodegen.StereotypedElementHelper;

+

+/**

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.domaincontextcodegen.StereotypedElementHelper} object.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * 

+ * @generated

+ */

+public class StereotypedElementHelperItemProvider extends GenHelperItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {

+

+	/**

+	 * This constructs an instance from a factory and a notifier.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public StereotypedElementHelperItemProvider(AdapterFactory adapterFactory) {

+		super(adapterFactory);

+	}

+

+	/**

+	 * This returns the property descriptors for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

+		if(itemPropertyDescriptors == null) {

+			super.getPropertyDescriptors(object);

+

+			addStereotypeNamePropertyDescriptor(object);

+			addStereotypePackagePropertyDescriptor(object);

+			addBaseElementNamePropertyDescriptor(object);

+			addBaseElementPackagePropertyDescriptor(object);

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

+	 * This adds a property descriptor for the Stereotype Name feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected void addStereotypeNamePropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_StereotypedElementHelper_stereotypeName_feature"), getString("_UI_PropertyDescriptor_description", "_UI_StereotypedElementHelper_stereotypeName_feature", "_UI_StereotypedElementHelper_type"), DomaincontextcodegenPackage.Literals.STEREOTYPED_ELEMENT_HELPER__STEREOTYPE_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

+	}

+

+	/**

+	 * This adds a property descriptor for the Stereotype Package feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected void addStereotypePackagePropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_StereotypedElementHelper_stereotypePackage_feature"), getString("_UI_PropertyDescriptor_description", "_UI_StereotypedElementHelper_stereotypePackage_feature", "_UI_StereotypedElementHelper_type"), DomaincontextcodegenPackage.Literals.STEREOTYPED_ELEMENT_HELPER__STEREOTYPE_PACKAGE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

+	}

+

+	/**

+	 * This adds a property descriptor for the Base Element Name feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected void addBaseElementNamePropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_StereotypedElementHelper_baseElementName_feature"), getString("_UI_PropertyDescriptor_description", "_UI_StereotypedElementHelper_baseElementName_feature", "_UI_StereotypedElementHelper_type"), DomaincontextcodegenPackage.Literals.STEREOTYPED_ELEMENT_HELPER__BASE_ELEMENT_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

+	}

+

+	/**

+	 * This adds a property descriptor for the Base Element Package feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected void addBaseElementPackagePropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_StereotypedElementHelper_baseElementPackage_feature"), getString("_UI_PropertyDescriptor_description", "_UI_StereotypedElementHelper_baseElementPackage_feature", "_UI_StereotypedElementHelper_type"), DomaincontextcodegenPackage.Literals.STEREOTYPED_ELEMENT_HELPER__BASE_ELEMENT_PACKAGE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

+	}

+

+	/**

+	 * This returns StereotypedElementHelper.gif.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public Object getImage(Object object) {

+		return overlayImage(object, getResourceLocator().getImage("full/obj16/StereotypedElementHelper"));

+	}

+

+	/**

+	 * This returns the label text for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public String getText(Object object) {

+		String label = ((StereotypedElementHelper)object).getName();

+		return label == null || label.length() == 0 ? getString("_UI_StereotypedElementHelper_type") : getString("_UI_StereotypedElementHelper_type") + " " + label;

+	}

+

+	/**

+	 * This handles model notifications by calling {@link #updateChildren} to update any cached

+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public void notifyChanged(Notification notification) {

+		updateChildren(notification);

+

+		switch(notification.getFeatureID(StereotypedElementHelper.class)) {

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_HELPER__STEREOTYPE_NAME:

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_HELPER__STEREOTYPE_PACKAGE:

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_HELPER__BASE_ELEMENT_NAME:

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_HELPER__BASE_ELEMENT_PACKAGE:

+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+			return;

+		}

+		super.notifyChanged(notification);

+	}

+

+	/**

+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

+	 * that can be created under this object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

+		super.collectNewChildDescriptors(newChildDescriptors, object);

+	}

+

+}

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/StereotypedElementMatcherItemProvider.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/StereotypedElementMatcherItemProvider.java
new file mode 100644
index 00000000000..b625dc593d6
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.edit/src/org/eclipse/papyrus/domaincontextcodegen/provider/StereotypedElementMatcherItemProvider.java
@@ -0,0 +1,171 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.domaincontextcodegen.provider;

+

+import java.util.Collection;

+import java.util.List;

+

+import org.eclipse.emf.common.notify.AdapterFactory;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.ViewerNotification;

+import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage;

+import org.eclipse.papyrus.domaincontextcodegen.StereotypedElementMatcher;

+

+/**

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.domaincontextcodegen.StereotypedElementMatcher} object.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * 

+ * @generated

+ */

+public class StereotypedElementMatcherItemProvider extends GenMatcherItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {

+

+	/**

+	 * This constructs an instance from a factory and a notifier.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public StereotypedElementMatcherItemProvider(AdapterFactory adapterFactory) {

+		super(adapterFactory);

+	}

+

+	/**

+	 * This returns the property descriptors for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

+		if(itemPropertyDescriptors == null) {

+			super.getPropertyDescriptors(object);

+

+			addStereotypeNamePropertyDescriptor(object);

+			addStereotypePackagePropertyDescriptor(object);

+			addBaseElementNamePropertyDescriptor(object);

+			addBaseElementPackagePropertyDescriptor(object);

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

+	 * This adds a property descriptor for the Stereotype Name feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected void addStereotypeNamePropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_StereotypedElementMatcher_stereotypeName_feature"), getString("_UI_PropertyDescriptor_description", "_UI_StereotypedElementMatcher_stereotypeName_feature", "_UI_StereotypedElementMatcher_type"), DomaincontextcodegenPackage.Literals.STEREOTYPED_ELEMENT_MATCHER__STEREOTYPE_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

+	}

+

+	/**

+	 * This adds a property descriptor for the Stereotype Package feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected void addStereotypePackagePropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_StereotypedElementMatcher_stereotypePackage_feature"), getString("_UI_PropertyDescriptor_description", "_UI_StereotypedElementMatcher_stereotypePackage_feature", "_UI_StereotypedElementMatcher_type"), DomaincontextcodegenPackage.Literals.STEREOTYPED_ELEMENT_MATCHER__STEREOTYPE_PACKAGE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

+	}

+

+	/**

+	 * This adds a property descriptor for the Base Element Name feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected void addBaseElementNamePropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_StereotypedElementMatcher_baseElementName_feature"), getString("_UI_PropertyDescriptor_description", "_UI_StereotypedElementMatcher_baseElementName_feature", "_UI_StereotypedElementMatcher_type"), DomaincontextcodegenPackage.Literals.STEREOTYPED_ELEMENT_MATCHER__BASE_ELEMENT_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

+	}

+

+	/**

+	 * This adds a property descriptor for the Base Element Package feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected void addBaseElementPackagePropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_StereotypedElementMatcher_baseElementPackage_feature"), getString("_UI_PropertyDescriptor_description", "_UI_StereotypedElementMatcher_baseElementPackage_feature", "_UI_StereotypedElementMatcher_type"), DomaincontextcodegenPackage.Literals.STEREOTYPED_ELEMENT_MATCHER__BASE_ELEMENT_PACKAGE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

+	}

+

+	/**

+	 * This returns StereotypedElementMatcher.gif.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public Object getImage(Object object) {

+		return overlayImage(object, getResourceLocator().getImage("full/obj16/StereotypedElementMatcher"));

+	}

+

+	/**

+	 * This returns the label text for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public String getText(Object object) {

+		String label = ((StereotypedElementMatcher)object).getName();

+		return label == null || label.length() == 0 ? getString("_UI_StereotypedElementMatcher_type") : getString("_UI_StereotypedElementMatcher_type") + " " + label;

+	}

+

+	/**

+	 * This handles model notifications by calling {@link #updateChildren} to update any cached

+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public void notifyChanged(Notification notification) {

+		updateChildren(notification);

+

+		switch(notification.getFeatureID(StereotypedElementMatcher.class)) {

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_MATCHER__STEREOTYPE_NAME:

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_MATCHER__STEREOTYPE_PACKAGE:

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_MATCHER__BASE_ELEMENT_NAME:

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_MATCHER__BASE_ELEMENT_PACKAGE:

+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+			return;

+		}

+		super.notifyChanged(notification);

+	}

+

+	/**

+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

+	 * that can be created under this object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

+		super.collectNewChildDescriptors(newChildDescriptors, object);

+	}

+

+}

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/.classpath b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/.classpath
index 2d1a4302f04..45f024e850e 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/.classpath
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

+	<classpathentry kind="src" path="src"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

 	<classpathentry kind="output" path="bin"/>

 </classpath>

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/src/org/eclipse/papyrus/domaincontextcodegen/presentation/DomainContextEditorPlugin.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/src/org/eclipse/papyrus/domaincontextcodegen/presentation/DomainContextEditorPlugin.java
index eb452fa2d0a..66a07b8350e 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/src/org/eclipse/papyrus/domaincontextcodegen/presentation/DomainContextEditorPlugin.java
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/src/org/eclipse/papyrus/domaincontextcodegen/presentation/DomainContextEditorPlugin.java
@@ -7,32 +7,33 @@
 package org.eclipse.papyrus.domaincontextcodegen.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;

 

 /**

  * This is the central singleton for the DomainContext editor plugin.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

+ * 

  * @generated

  */

 public final class DomainContextEditorPlugin extends EMFPlugin {

+

 	/**

 	 * Keep track of the singleton.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public static final DomainContextEditorPlugin INSTANCE = new DomainContextEditorPlugin();

-	

+

 	/**

 	 * Keep track of the singleton.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private static Implementation plugin;

@@ -41,19 +42,18 @@ public final class DomainContextEditorPlugin extends EMFPlugin {
 	 * Create the instance.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public DomainContextEditorPlugin() {

-		super

-			(new ResourceLocator [] {

-				EcoreEditPlugin.INSTANCE,

-			});

+		super(new ResourceLocator[]{ EcoreEditPlugin.INSTANCE, });

 	}

 

 	/**

 	 * Returns the singleton instance of the Eclipse plugin.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the singleton instance.

 	 * @generated

 	 */

@@ -61,34 +61,38 @@ public final class DomainContextEditorPlugin extends EMFPlugin {
 	public ResourceLocator getPluginResourceLocator() {

 		return plugin;

 	}

-	

+

 	/**

 	 * Returns the singleton instance of the Eclipse plugin.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the singleton instance.

 	 * @generated

 	 */

 	public static Implementation getPlugin() {

 		return plugin;

 	}

-	

+

 	/**

 	 * The actual implementation of the Eclipse <b>Plugin</b>.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public static class Implementation extends EclipseUIPlugin {

+

 		/**

 		 * Creates an instance.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		public Implementation() {

 			super();

-	

+

 			// Remember the static instance.

 			//

 			plugin = this;

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/src/org/eclipse/papyrus/domaincontextcodegen/presentation/DomaincontextcodegenActionBarContributor.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/src/org/eclipse/papyrus/domaincontextcodegen/presentation/DomaincontextcodegenActionBarContributor.java
index f02c0905bf7..10820757c91 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/src/org/eclipse/papyrus/domaincontextcodegen/presentation/DomaincontextcodegenActionBarContributor.java
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/src/org/eclipse/papyrus/domaincontextcodegen/presentation/DomaincontextcodegenActionBarContributor.java
@@ -10,17 +10,14 @@ 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;

@@ -32,14 +29,12 @@ 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;

 

@@ -47,15 +42,16 @@ import org.eclipse.ui.PartInitException;
  * This is the action bar contributor for the Domaincontextcodegen model editor.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

+ * 

  * @generated

  */

-public class DomaincontextcodegenActionBarContributor

-	extends EditingDomainActionBarContributor

-	implements ISelectionChangedListener {

+public class DomaincontextcodegenActionBarContributor extends EditingDomainActionBarContributor implements ISelectionChangedListener {

+

 	/**

 	 * This keeps track of the active editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected IEditorPart activeEditorPart;

@@ -64,6 +60,7 @@ public class DomaincontextcodegenActionBarContributor
 	 * This keeps track of the current selection provider.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected ISelectionProvider selectionProvider;

@@ -72,51 +69,53 @@ public class DomaincontextcodegenActionBarContributor
 	 * This action opens the Properties view.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

-	protected IAction showPropertiesViewAction =

-		new Action(DomainContextEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) {

-			@Override

-			public void run() {

-				try {

-					getPage().showView("org.eclipse.ui.views.PropertySheet");

-				}

-				catch (PartInitException exception) {

-					DomainContextEditorPlugin.INSTANCE.log(exception);

-				}

+	protected IAction showPropertiesViewAction = new Action(DomainContextEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) {

+

+		@Override

+		public void run() {

+			try {

+				getPage().showView("org.eclipse.ui.views.PropertySheet");

+			} catch (PartInitException exception) {

+				DomainContextEditorPlugin.INSTANCE.log(exception);

 			}

-		};

+		}

+	};

 

 	/**

 	 * This action refreshes the viewer of the current editor if the editor

 	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

-	protected IAction refreshViewerAction =

-		new Action(DomainContextEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) {

-			@Override

-			public boolean isEnabled() {

-				return activeEditorPart instanceof IViewerProvider;

-			}

+	protected IAction refreshViewerAction = new Action(DomainContextEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) {

 

-			@Override

-			public void run() {

-				if (activeEditorPart instanceof IViewerProvider) {

-					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();

-					if (viewer != null) {

-						viewer.refresh();

-					}

+		@Override

+		public boolean isEnabled() {

+			return activeEditorPart instanceof IViewerProvider;

+		}

+

+		@Override

+		public void run() {

+			if(activeEditorPart instanceof IViewerProvider) {

+				Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();

+				if(viewer != null) {

+					viewer.refresh();

 				}

 			}

-		};

+		}

+	};

 

 	/**

 	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor

 	 * generated for the current selection by the item provider.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected Collection<IAction> createChildActions;

@@ -125,6 +124,7 @@ public class DomaincontextcodegenActionBarContributor
 	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected IMenuManager createChildMenuManager;

@@ -134,6 +134,7 @@ public class DomaincontextcodegenActionBarContributor
 	 * generated for the current selection by the item provider.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected Collection<IAction> createSiblingActions;

@@ -142,6 +143,7 @@ public class DomaincontextcodegenActionBarContributor
 	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected IMenuManager createSiblingMenuManager;

@@ -150,6 +152,7 @@ public class DomaincontextcodegenActionBarContributor
 	 * This creates an instance of the contributor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public DomaincontextcodegenActionBarContributor() {

@@ -163,6 +166,7 @@ public class DomaincontextcodegenActionBarContributor
 	 * This adds Separators for editor additions to the tool bar.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -176,6 +180,7 @@ public class DomaincontextcodegenActionBarContributor
 	 * as well as the sub-menus for object creation items.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -201,12 +206,12 @@ public class DomaincontextcodegenActionBarContributor
 

 		// Force an update because Eclipse hides empty menus now.

 		//

-		submenuManager.addMenuListener

-			(new IMenuListener() {

-				 public void menuAboutToShow(IMenuManager menuManager) {

-					 menuManager.updateAll(true);

-				 }

-			 });

+		submenuManager.addMenuListener(new IMenuListener() {

+

+			public void menuAboutToShow(IMenuManager menuManager) {

+				menuManager.updateAll(true);

+			}

+		});

 

 		addGlobalActions(submenuManager);

 	}

@@ -215,6 +220,7 @@ public class DomaincontextcodegenActionBarContributor
 	 * When the active editor changes, this remembers the change and registers with it as a selection provider.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -224,19 +230,18 @@ public class DomaincontextcodegenActionBarContributor
 

 		// Switch to the new selection provider.

 		//

-		if (selectionProvider != null) {

+		if(selectionProvider != null) {

 			selectionProvider.removeSelectionChangedListener(this);

 		}

-		if (part == null) {

+		if(part == null) {

 			selectionProvider = null;

-		}

-		else {

+		} else {

 			selectionProvider = part.getSite().getSelectionProvider();

 			selectionProvider.addSelectionChangedListener(this);

 

 			// Fake a selection changed event to update the menus.

 			//

-			if (selectionProvider.getSelection() != null) {

+			if(selectionProvider.getSelection() != null) {

 				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));

 			}

 		}

@@ -248,15 +253,16 @@ public class DomaincontextcodegenActionBarContributor
 	 * that can be added to the selected object and updating the menus accordingly.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void selectionChanged(SelectionChangedEvent event) {

 		// Remove any menu items for old selection.

 		//

-		if (createChildMenuManager != null) {

+		if(createChildMenuManager != null) {

 			depopulateManager(createChildMenuManager, createChildActions);

 		}

-		if (createSiblingMenuManager != null) {

+		if(createSiblingMenuManager != null) {

 			depopulateManager(createSiblingMenuManager, createSiblingActions);

 		}

 

@@ -266,7 +272,7 @@ public class DomaincontextcodegenActionBarContributor
 		Collection<?> newSiblingDescriptors = null;

 

 		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

+		if(selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

 			Object object = ((IStructuredSelection)selection).getFirstElement();

 

 			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

@@ -280,11 +286,11 @@ public class DomaincontextcodegenActionBarContributor
 		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

 		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

 

-		if (createChildMenuManager != null) {

+		if(createChildMenuManager != null) {

 			populateManager(createChildMenuManager, createChildActions, null);

 			createChildMenuManager.update(true);

 		}

-		if (createSiblingMenuManager != null) {

+		if(createSiblingMenuManager != null) {

 			populateManager(createSiblingMenuManager, createSiblingActions, null);

 			createSiblingMenuManager.update(true);

 		}

@@ -295,12 +301,13 @@ public class DomaincontextcodegenActionBarContributor
 	 * and returns the collection of these actions.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

 		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

+		if(descriptors != null) {

+			for(Object descriptor : descriptors) {

 				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

 			}

 		}

@@ -312,12 +319,13 @@ public class DomaincontextcodegenActionBarContributor
 	 * and returns the collection of these actions.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

 		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

+		if(descriptors != null) {

+			for(Object descriptor : descriptors) {

 				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

 			}

 		}

@@ -331,44 +339,45 @@ public class DomaincontextcodegenActionBarContributor
 	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

-		if (actions != null) {

-			for (IAction action : actions) {

-				if (contributionID != null) {

+		if(actions != null) {

+			for(IAction action : actions) {

+				if(contributionID != null) {

 					manager.insertBefore(contributionID, action);

-				}

-				else {

+				} else {

 					manager.add(action);

 				}

 			}

 		}

 	}

-		

+

 	/**

 	 * 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.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

-		if (actions != null) {

+		if(actions != null) {

 			IContributionItem[] items = manager.getItems();

-			for (int i = 0; i < items.length; i++) {

+			for(int i = 0; i < items.length; i++) {

 				// Look into SubContributionItems

 				//

 				IContributionItem contributionItem = items[i];

-				while (contributionItem instanceof SubContributionItem) {

+				while(contributionItem instanceof SubContributionItem) {

 					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

 				}

 

 				// Delete the ActionContributionItems with matching action.

 				//

-				if (contributionItem instanceof ActionContributionItem) {

+				if(contributionItem instanceof ActionContributionItem) {

 					IAction action = ((ActionContributionItem)contributionItem).getAction();

-					if (actions.contains(action)) {

+					if(actions.contains(action)) {

 						manager.remove(contributionItem);

 					}

 				}

@@ -380,6 +389,7 @@ public class DomaincontextcodegenActionBarContributor
 	 * This populates the pop-up menu before it appears.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -400,6 +410,7 @@ public class DomaincontextcodegenActionBarContributor
 	 * This inserts global actions before the "additions-end" separator.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -407,7 +418,7 @@ public class DomaincontextcodegenActionBarContributor
 		menuManager.insertAfter("additions-end", new Separator("ui-actions"));

 		menuManager.insertAfter("ui-actions", showPropertiesViewAction);

 

-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());

 		menuManager.insertAfter("ui-actions", refreshViewerAction);

 

 		super.addGlobalActions(menuManager);

@@ -417,6 +428,7 @@ public class DomaincontextcodegenActionBarContributor
 	 * This ensures that a delete action will clean up all references to deleted objects.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -424,4 +436,4 @@ public class DomaincontextcodegenActionBarContributor
 		return true;

 	}

 

-}
\ No newline at end of file
+}

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/src/org/eclipse/papyrus/domaincontextcodegen/presentation/DomaincontextcodegenEditor.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/src/org/eclipse/papyrus/domaincontextcodegen/presentation/DomaincontextcodegenEditor.java
index 8279e87f5ea..a65802ad7e2 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/src/org/eclipse/papyrus/domaincontextcodegen/presentation/DomaincontextcodegenEditor.java
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/src/org/eclipse/papyrus/domaincontextcodegen/presentation/DomaincontextcodegenEditor.java
@@ -6,10 +6,8 @@
  */

 package org.eclipse.papyrus.domaincontextcodegen.presentation;

 

-

 import java.io.IOException;

 import java.io.InputStream;

-

 import java.util.ArrayList;

 import java.util.Collection;

 import java.util.Collections;

@@ -28,22 +26,56 @@ 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.EObject;

+import org.eclipse.emf.ecore.EValidator;

+import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

+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.viewers.ColumnWeightData;

 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.ISelectionChangedListener;

@@ -57,28 +89,21 @@ 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.domaincontextcodegen.provider.DomaincontextcodegenItemProviderAdapterFactory;

 import org.eclipse.swt.SWT;

-

 import org.eclipse.swt.custom.CTabFolder;

-

 import org.eclipse.swt.dnd.DND;

 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;

@@ -86,97 +111,32 @@ 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.EObject;

-import org.eclipse.emf.ecore.EValidator;

-

-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.domaincontextcodegen.provider.DomaincontextcodegenItemProviderAdapterFactory;

-

-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

-

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-

-

 /**

  * This is an example of a Domaincontextcodegen model editor.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

+ * 

  * @generated

  */

-public class DomaincontextcodegenEditor

-	extends MultiPageEditorPart

-	implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {

+public class DomaincontextcodegenEditor 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 -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected AdapterFactoryEditingDomain editingDomain;

@@ -185,6 +145,7 @@ public class DomaincontextcodegenEditor
 	 * This is the one adapter factory used for providing views of the model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected ComposedAdapterFactory adapterFactory;

@@ -193,6 +154,7 @@ public class DomaincontextcodegenEditor
 	 * This is the content outline page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected IContentOutlinePage contentOutlinePage;

@@ -201,6 +163,7 @@ public class DomaincontextcodegenEditor
 	 * This is a kludge...

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected IStatusLineManager contentOutlineStatusLineManager;

@@ -209,6 +172,7 @@ public class DomaincontextcodegenEditor
 	 * This is the content outline page's viewer.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected TreeViewer contentOutlineViewer;

@@ -217,6 +181,7 @@ public class DomaincontextcodegenEditor
 	 * This is the property sheet page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected PropertySheetPage propertySheetPage;

@@ -226,6 +191,7 @@ public class DomaincontextcodegenEditor
 	 * The parent relation must be correctly defined for this to work.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected TreeViewer selectionViewer;

@@ -234,6 +200,7 @@ public class DomaincontextcodegenEditor
 	 * This inverts the roll of parent and child in the content provider and show parents as a tree.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected TreeViewer parentViewer;

@@ -242,6 +209,7 @@ public class DomaincontextcodegenEditor
 	 * This shows how a tree view works.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected TreeViewer treeViewer;

@@ -251,6 +219,7 @@ public class DomaincontextcodegenEditor
 	 * A list viewer doesn't support icons.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected ListViewer listViewer;

@@ -260,6 +229,7 @@ public class DomaincontextcodegenEditor
 	 * A table can be used as a list with icons.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected TableViewer tableViewer;

@@ -268,6 +238,7 @@ public class DomaincontextcodegenEditor
 	 * This shows how a tree view with columns works.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected TreeViewer treeViewerWithColumns;

@@ -276,6 +247,7 @@ public class DomaincontextcodegenEditor
 	 * This keeps track of the active viewer pane, in the book.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected ViewerPane currentViewerPane;

@@ -284,6 +256,7 @@ public class DomaincontextcodegenEditor
 	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected Viewer currentViewer;

@@ -292,6 +265,7 @@ public class DomaincontextcodegenEditor
 	 * This listens to which ever viewer is active.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected ISelectionChangedListener selectionChangedListener;

@@ -300,6 +274,7 @@ public class DomaincontextcodegenEditor
 	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();

@@ -308,6 +283,7 @@ public class DomaincontextcodegenEditor
 	 * This keeps track of the selection of the editor as a whole.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected ISelection editorSelection = StructuredSelection.EMPTY;

@@ -317,6 +293,7 @@ public class DomaincontextcodegenEditor
 	 * in Eclipse's Problems View.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

@@ -325,46 +302,50 @@ public class DomaincontextcodegenEditor
 	 * This listens for when the outline becomes active

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

-	protected IPartListener partListener =

-		new IPartListener() {

-			public void partActivated(IWorkbenchPart p) {

-				if (p instanceof ContentOutline) {

-					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {

-						getActionBarContributor().setActiveEditor(DomaincontextcodegenEditor.this);

+	protected IPartListener partListener = new IPartListener() {

 

-						setCurrentViewer(contentOutlineViewer);

-					}

-				}

-				else if (p instanceof PropertySheet) {

-					if (((PropertySheet)p).getCurrentPage() == propertySheetPage) {

-						getActionBarContributor().setActiveEditor(DomaincontextcodegenEditor.this);

-						handleActivate();

-					}

+		public void partActivated(IWorkbenchPart p) {

+			if(p instanceof ContentOutline) {

+				if(((ContentOutline)p).getCurrentPage() == contentOutlinePage) {

+					getActionBarContributor().setActiveEditor(DomaincontextcodegenEditor.this);

+

+					setCurrentViewer(contentOutlineViewer);

 				}

-				else if (p == DomaincontextcodegenEditor.this) {

+			} else if(p instanceof PropertySheet) {

+				if(((PropertySheet)p).getCurrentPage() == propertySheetPage) {

+					getActionBarContributor().setActiveEditor(DomaincontextcodegenEditor.this);

 					handleActivate();

 				}

+			} else if(p == DomaincontextcodegenEditor.this) {

+				handleActivate();

 			}

-			public void partBroughtToTop(IWorkbenchPart p) {

-				// Ignore.

-			}

-			public void partClosed(IWorkbenchPart p) {

-				// Ignore.

-			}

-			public void partDeactivated(IWorkbenchPart p) {

-				// Ignore.

-			}

-			public void partOpened(IWorkbenchPart p) {

-				// Ignore.

-			}

-		};

+		}

+

+		public void partBroughtToTop(IWorkbenchPart p) {

+			// Ignore.

+		}

+

+		public void partClosed(IWorkbenchPart p) {

+			// Ignore.

+		}

+

+		public void partDeactivated(IWorkbenchPart p) {

+			// Ignore.

+		}

+

+		public void partOpened(IWorkbenchPart p) {

+			// Ignore.

+		}

+	};

 

 	/**

 	 * Resources that have been removed since last activation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected Collection<Resource> removedResources = new ArrayList<Resource>();

@@ -373,6 +354,7 @@ public class DomaincontextcodegenEditor
 	 * Resources that have been changed since last activation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected Collection<Resource> changedResources = new ArrayList<Resource>();

@@ -381,6 +363,7 @@ public class DomaincontextcodegenEditor
 	 * Resources that have been saved.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected Collection<Resource> savedResources = new ArrayList<Resource>();

@@ -389,6 +372,7 @@ public class DomaincontextcodegenEditor
 	 * Map to store the diagnostic associated with a resource.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();

@@ -397,6 +381,7 @@ public class DomaincontextcodegenEditor
 	 * Controls whether the problem indication should be updated.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected boolean updateProblemIndication = true;

@@ -405,159 +390,159 @@ public class DomaincontextcodegenEditor
 	 * Adapter used to update the problem indication when resources are demanded loaded.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

-	protected EContentAdapter problemIndicationAdapter = 

-		new EContentAdapter() {

-			@Override

-			public void notifyChanged(Notification notification) {

-				if (notification.getNotifier() instanceof Resource) {

-					switch (notification.getFeatureID(Resource.class)) {

-						case Resource.RESOURCE__IS_LOADED:

-						case Resource.RESOURCE__ERRORS:

-						case Resource.RESOURCE__WARNINGS: {

-							Resource resource = (Resource)notification.getNotifier();

-							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

-							if (diagnostic.getSeverity() != Diagnostic.OK) {

-								resourceToDiagnosticMap.put(resource, diagnostic);

-							}

-							else {

-								resourceToDiagnosticMap.remove(resource);

-							}

+	protected EContentAdapter problemIndicationAdapter = new EContentAdapter() {

 

-							if (updateProblemIndication) {

-								getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										 public void run() {

-											 updateProblemIndication();

-										 }

-									 });

+		@Override

+		public void notifyChanged(Notification notification) {

+			if(notification.getNotifier() instanceof Resource) {

+				switch(notification.getFeatureID(Resource.class)) {

+				case Resource.RESOURCE__IS_LOADED:

+				case Resource.RESOURCE__ERRORS:

+				case Resource.RESOURCE__WARNINGS:

+				{

+					Resource resource = (Resource)notification.getNotifier();

+					Diagnostic diagnostic = analyzeResourceProblems(resource, null);

+					if(diagnostic.getSeverity() != Diagnostic.OK) {

+						resourceToDiagnosticMap.put(resource, diagnostic);

+					} else {

+						resourceToDiagnosticMap.remove(resource);

+					}

+

+					if(updateProblemIndication) {

+						getSite().getShell().getDisplay().asyncExec(new Runnable() {

+

+							public void run() {

+								updateProblemIndication();

 							}

-							break;

-						}

+						});

 					}

+					break;

 				}

-				else {

-					super.notifyChanged(notification);

 				}

+			} else {

+				super.notifyChanged(notification);

 			}

+		}

 

-			@Override

-			protected void setTarget(Resource target) {

-				basicSetTarget(target);

-			}

+		@Override

+		protected void setTarget(Resource target) {

+			basicSetTarget(target);

+		}

 

-			@Override

-			protected void unsetTarget(Resource target) {

-				basicUnsetTarget(target);

-			}

-		};

+		@Override

+		protected void unsetTarget(Resource target) {

+			basicUnsetTarget(target);

+		}

+	};

 

 	/**

 	 * This listens for workspace changes.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

-	protected IResourceChangeListener resourceChangeListener =

-		new IResourceChangeListener() {

-			public void resourceChanged(IResourceChangeEvent event) {

-				IResourceDelta delta = event.getDelta();

-				try {

-					class ResourceDeltaVisitor implements IResourceDeltaVisitor {

-						protected ResourceSet resourceSet = editingDomain.getResourceSet();

-						protected Collection<Resource> changedResources = new ArrayList<Resource>();

-						protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-						public boolean visit(IResourceDelta delta) {

-							if (delta.getResource().getType() == IResource.FILE) {

-								if (delta.getKind() == IResourceDelta.REMOVED ||

-								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

-									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

-									if (resource != null) {

-										if (delta.getKind() == IResourceDelta.REMOVED) {

-											removedResources.add(resource);

-										}

-										else if (!savedResources.remove(resource)) {

-											changedResources.add(resource);

-										}

+	protected IResourceChangeListener resourceChangeListener = new IResourceChangeListener() {

+

+		public void resourceChanged(IResourceChangeEvent event) {

+			IResourceDelta delta = event.getDelta();

+			try {

+				class ResourceDeltaVisitor implements IResourceDeltaVisitor {

+

+					protected ResourceSet resourceSet = editingDomain.getResourceSet();

+

+					protected Collection<Resource> changedResources = new ArrayList<Resource>();

+

+					protected Collection<Resource> removedResources = new ArrayList<Resource>();

+

+					public boolean visit(IResourceDelta delta) {

+						if(delta.getResource().getType() == IResource.FILE) {

+							if(delta.getKind() == IResourceDelta.REMOVED || delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

+								Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

+								if(resource != null) {

+									if(delta.getKind() == IResourceDelta.REMOVED) {

+										removedResources.add(resource);

+									} else if(!savedResources.remove(resource)) {

+										changedResources.add(resource);

 									}

 								}

 							}

-

-							return true;

-						}

-

-						public Collection<Resource> getChangedResources() {

-							return changedResources;

 						}

 

-						public Collection<Resource> getRemovedResources() {

-							return removedResources;

-						}

+						return true;

 					}

 

-					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

-					delta.accept(visitor);

-

-					if (!visitor.getRemovedResources().isEmpty()) {

-						getSite().getShell().getDisplay().asyncExec

-							(new Runnable() {

-								 public void run() {

-									 removedResources.addAll(visitor.getRemovedResources());

-									 if (!isDirty()) {

-										 getSite().getPage().closeEditor(DomaincontextcodegenEditor.this, false);

-									 }

-								 }

-							 });

+					public Collection<Resource> getChangedResources() {

+						return changedResources;

 					}

 

-					if (!visitor.getChangedResources().isEmpty()) {

-						getSite().getShell().getDisplay().asyncExec

-							(new Runnable() {

-								 public void run() {

-									 changedResources.addAll(visitor.getChangedResources());

-									 if (getSite().getPage().getActiveEditor() == DomaincontextcodegenEditor.this) {

-										 handleActivate();

-									 }

-								 }

-							 });

+					public Collection<Resource> getRemovedResources() {

+						return removedResources;

 					}

 				}

-				catch (CoreException exception) {

-					DomainContextEditorPlugin.INSTANCE.log(exception);

+

+				final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

+				delta.accept(visitor);

+

+				if(!visitor.getRemovedResources().isEmpty()) {

+					getSite().getShell().getDisplay().asyncExec(new Runnable() {

+

+						public void run() {

+							removedResources.addAll(visitor.getRemovedResources());

+							if(!isDirty()) {

+								getSite().getPage().closeEditor(DomaincontextcodegenEditor.this, false);

+							}

+						}

+					});

 				}

+

+				if(!visitor.getChangedResources().isEmpty()) {

+					getSite().getShell().getDisplay().asyncExec(new Runnable() {

+

+						public void run() {

+							changedResources.addAll(visitor.getChangedResources());

+							if(getSite().getPage().getActiveEditor() == DomaincontextcodegenEditor.this) {

+								handleActivate();

+							}

+						}

+					});

+				}

+			} catch (CoreException exception) {

+				DomainContextEditorPlugin.INSTANCE.log(exception);

 			}

-		};

+		}

+	};

 

 	/**

 	 * Handles activation of the editor or it's associated views.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected void handleActivate() {

 		// Recompute the read only state.

 		//

-		if (editingDomain.getResourceToReadOnlyMap() != null) {

-		  editingDomain.getResourceToReadOnlyMap().clear();

+		if(editingDomain.getResourceToReadOnlyMap() != null) {

+			editingDomain.getResourceToReadOnlyMap().clear();

 

-		  // Refresh any actions that may become enabled or disabled.

-		  //

-		  setSelection(getSelection());

+			// Refresh any actions that may become enabled or disabled.

+			//

+			setSelection(getSelection());

 		}

 

-		if (!removedResources.isEmpty()) {

-			if (handleDirtyConflict()) {

+		if(!removedResources.isEmpty()) {

+			if(handleDirtyConflict()) {

 				getSite().getPage().closeEditor(DomaincontextcodegenEditor.this, false);

-			}

-			else {

+			} else {

 				removedResources.clear();

 				changedResources.clear();

 				savedResources.clear();

 			}

-		}

-		else if (!changedResources.isEmpty()) {

+		} else if(!changedResources.isEmpty()) {

 			changedResources.removeAll(savedResources);

 			handleChangedResources();

 			changedResources.clear();

@@ -569,31 +554,31 @@ public class DomaincontextcodegenEditor
 	 * Handles what to do with changed resources on activation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected void handleChangedResources() {

-		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {

-			if (isDirty()) {

+		if(!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {

+			if(isDirty()) {

 				changedResources.addAll(editingDomain.getResourceSet().getResources());

 			}

 			editingDomain.getCommandStack().flush();

 

 			updateProblemIndication = false;

-			for (Resource resource : changedResources) {

-				if (resource.isLoaded()) {

+			for(Resource resource : changedResources) {

+				if(resource.isLoaded()) {

 					resource.unload();

 					try {

 						resource.load(Collections.EMPTY_MAP);

-					}

-					catch (IOException exception) {

-						if (!resourceToDiagnosticMap.containsKey(resource)) {

+					} catch (IOException exception) {

+						if(!resourceToDiagnosticMap.containsKey(resource)) {

 							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

 						}

 					}

 				}

 			}

 

-			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {

+			if(AdapterFactoryEditingDomain.isStale(editorSelection)) {

 				setSelection(StructuredSelection.EMPTY);

 			}

 

@@ -601,36 +586,30 @@ public class DomaincontextcodegenEditor
 			updateProblemIndication();

 		}

 	}

-  

+

 	/**

 	 * Updates the problems indication with the information described in the specified diagnostic.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected void updateProblemIndication() {

-		if (updateProblemIndication) {

-			BasicDiagnostic diagnostic =

-				new BasicDiagnostic

-					(Diagnostic.OK,

-					 "org.eclipse.papyrus.domaincontextcodegen.editor",

-					 0,

-					 null,

-					 new Object [] { editingDomain.getResourceSet() });

-			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

-				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

+		if(updateProblemIndication) {

+			BasicDiagnostic diagnostic = new BasicDiagnostic(Diagnostic.OK, "org.eclipse.papyrus.domaincontextcodegen.editor", 0, null, new Object[]{ editingDomain.getResourceSet() });

+			for(Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

+				if(childDiagnostic.getSeverity() != Diagnostic.OK) {

 					diagnostic.add(childDiagnostic);

 				}

 			}

 

 			int lastEditorPage = getPageCount() - 1;

-			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

+			if(lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

 				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

+				if(diagnostic.getSeverity() != Diagnostic.OK) {

 					setActivePage(lastEditorPage);

 				}

-			}

-			else if (diagnostic.getSeverity() != Diagnostic.OK) {

+			} else if(diagnostic.getSeverity() != Diagnostic.OK) {

 				ProblemEditorPart problemEditorPart = new ProblemEditorPart();

 				problemEditorPart.setDiagnostic(diagnostic);

 				problemEditorPart.setMarkerHelper(markerHelper);

@@ -639,19 +618,17 @@ public class DomaincontextcodegenEditor
 					setPageText(lastEditorPage, problemEditorPart.getPartName());

 					setActivePage(lastEditorPage);

 					showTabs();

-				}

-				catch (PartInitException exception) {

+				} catch (PartInitException exception) {

 					DomainContextEditorPlugin.INSTANCE.log(exception);

 				}

 			}

 

-			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {

+			if(markerHelper.hasMarkers(editingDomain.getResourceSet())) {

 				markerHelper.deleteMarkers(editingDomain.getResourceSet());

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

+				if(diagnostic.getSeverity() != Diagnostic.OK) {

 					try {

 						markerHelper.createMarkers(diagnostic);

-					}

-					catch (CoreException exception) {

+					} catch (CoreException exception) {

 						DomainContextEditorPlugin.INSTANCE.log(exception);

 					}

 				}

@@ -663,20 +640,18 @@ public class DomaincontextcodegenEditor
 	 * Shows a dialog that asks if conflicting changes should be discarded.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected boolean handleDirtyConflict() {

-		return

-			MessageDialog.openQuestion

-				(getSite().getShell(),

-				 getString("_UI_FileConflict_label"),

-				 getString("_WARN_FileConflict"));

+		return MessageDialog.openQuestion(getSite().getShell(), getString("_UI_FileConflict_label"), getString("_WARN_FileConflict"));

 	}

 

 	/**

 	 * This creates a model editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public DomaincontextcodegenEditor() {

@@ -688,6 +663,7 @@ public class DomaincontextcodegenEditor
 	 * This sets up the editing domain for the model editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected void initializeEditingDomain() {

@@ -706,27 +682,27 @@ public class DomaincontextcodegenEditor
 

 		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.

 		//

-		commandStack.addCommandStackListener

-			(new CommandStackListener() {

-				 public void commandStackChanged(final EventObject event) {

-					 getContainer().getDisplay().asyncExec

-						 (new Runnable() {

-							  public void run() {

-								  firePropertyChange(IEditorPart.PROP_DIRTY);

-

-								  // Try to select the affected objects.

-								  //

-								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();

-								  if (mostRecentCommand != null) {

-									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());

-								  }

-								  if (propertySheetPage != null && !propertySheetPage.getControl().isDisposed()) {

-									  propertySheetPage.refresh();

-								  }

-							  }

-						  });

-				 }

-			 });

+		commandStack.addCommandStackListener(new CommandStackListener() {

+

+			public void commandStackChanged(final EventObject event) {

+				getContainer().getDisplay().asyncExec(new Runnable() {

+

+					public void run() {

+						firePropertyChange(IEditorPart.PROP_DIRTY);

+

+						// Try to select the affected objects.

+						//

+						Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();

+						if(mostRecentCommand != null) {

+							setSelectionToViewer(mostRecentCommand.getAffectedObjects());

+						}

+						if(propertySheetPage != null && !propertySheetPage.getControl().isDisposed()) {

+							propertySheetPage.refresh();

+						}

+					}

+				});

+			}

+		});

 

 		// Create the editing domain with a special command stack.

 		//

@@ -737,9 +713,10 @@ public class DomaincontextcodegenEditor
 	 * This is here for the listener to be able to call it.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

-			@Override

+	@Override

 	protected void firePropertyChange(int action) {

 		super.firePropertyChange(action);

 	}

@@ -748,33 +725,35 @@ public class DomaincontextcodegenEditor
 	 * This sets the selection into whichever viewer is active.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setSelectionToViewer(Collection<?> collection) {

 		final Collection<?> theSelection = collection;

 		// Make sure it's okay.

 		//

-		if (theSelection != null && !theSelection.isEmpty()) {

-			Runnable runnable =

-				new Runnable() {

-					public void run() {

-						// Try to select the items in the current content viewer of the editor.

-						//

-						if (currentViewer != null) {

-							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

-						}

+		if(theSelection != null && !theSelection.isEmpty()) {

+			Runnable runnable = new Runnable() {

+

+				public void run() {

+					// Try to select the items in the current content viewer of the editor.

+					//

+					if(currentViewer != null) {

+						currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

 					}

-				};

+				}

+			};

 			getSite().getShell().getDisplay().asyncExec(runnable);

 		}

 	}

 

 	/**

 	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.

-	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}

-	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

+	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain} and for supporting

+	 * {@link org.eclipse.emf.edit.ui.action.CommandAction}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EditingDomain getEditingDomain() {

@@ -784,12 +763,15 @@ public class DomaincontextcodegenEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

+

 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

@@ -799,10 +781,11 @@ public class DomaincontextcodegenEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		@Override

-		public Object [] getElements(Object object) {

+		public Object[] getElements(Object object) {

 			Object parent = super.getParent(object);

 			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

 		}

@@ -810,10 +793,11 @@ public class DomaincontextcodegenEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		@Override

-		public Object [] getChildren(Object object) {

+		public Object[] getChildren(Object object) {

 			Object parent = super.getParent(object);

 			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

 		}

@@ -821,6 +805,7 @@ public class DomaincontextcodegenEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		@Override

@@ -832,6 +817,7 @@ public class DomaincontextcodegenEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		@Override

@@ -843,11 +829,12 @@ public class DomaincontextcodegenEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setCurrentViewerPane(ViewerPane viewerPane) {

-		if (currentViewerPane != viewerPane) {

-			if (currentViewerPane != null) {

+		if(currentViewerPane != viewerPane) {

+			if(currentViewerPane != null) {

 				currentViewerPane.showFocus(false);

 			}

 			currentViewerPane = viewerPane;

@@ -860,34 +847,35 @@ public class DomaincontextcodegenEditor
 	 * is the current one.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setCurrentViewer(Viewer viewer) {

 		// If it is changing...

 		//

-		if (currentViewer != viewer) {

-			if (selectionChangedListener == null) {

+		if(currentViewer != viewer) {

+			if(selectionChangedListener == null) {

 				// Create the listener on demand.

 				//

-				selectionChangedListener =

-					new ISelectionChangedListener() {

-						// This just notifies those things that are affected by the section.

-						//

-						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

-							setSelection(selectionChangedEvent.getSelection());

-						}

-					};

+				selectionChangedListener = new ISelectionChangedListener() {

+

+					// This just notifies those things that are affected by the section.

+					//

+					public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

+						setSelection(selectionChangedEvent.getSelection());

+					}

+				};

 			}

 

 			// Stop listening to the old one.

 			//

-			if (currentViewer != null) {

+			if(currentViewer != null) {

 				currentViewer.removeSelectionChangedListener(selectionChangedListener);

 			}

 

 			// Start listening to the new one.

 			//

-			if (viewer != null) {

+			if(viewer != null) {

 				viewer.addSelectionChangedListener(selectionChangedListener);

 			}

 

@@ -905,6 +893,7 @@ public class DomaincontextcodegenEditor
 	 * This returns the viewer as required by the {@link IViewerProvider} interface.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public Viewer getViewer() {

@@ -915,6 +904,7 @@ public class DomaincontextcodegenEditor
 	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected void createContextMenuFor(StructuredViewer viewer) {

@@ -922,12 +912,12 @@ public class DomaincontextcodegenEditor
 		contextMenu.add(new Separator("additions"));

 		contextMenu.setRemoveAllWhenShown(true);

 		contextMenu.addMenuListener(this);

-		Menu menu= contextMenu.createContextMenu(viewer.getControl());

+		Menu menu = contextMenu.createContextMenu(viewer.getControl());

 		viewer.getControl().setMenu(menu);

 		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

 

 		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;

-		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance() };

+		Transfer[] transfers = new Transfer[]{ LocalTransfer.getInstance() };

 		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));

 		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));

 	}

@@ -936,6 +926,7 @@ public class DomaincontextcodegenEditor
 	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void createModel() {

@@ -946,15 +937,14 @@ public class DomaincontextcodegenEditor
 			// Load the resource through the editing domain.

 			//

 			resource = editingDomain.getResourceSet().getResource(resourceURI, true);

-		}

-		catch (Exception e) {

+		} catch (Exception e) {

 			exception = e;

 			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

 		}

 

 		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

-		if (diagnostic.getSeverity() != Diagnostic.OK) {

-			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));

+		if(diagnostic.getSeverity() != Diagnostic.OK) {

+			resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

 		}

 		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

 	}

@@ -964,30 +954,17 @@ public class DomaincontextcodegenEditor
 	 * and the specified exception (if any).

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {

-			BasicDiagnostic basicDiagnostic =

-				new BasicDiagnostic

-					(Diagnostic.ERROR,

-					 "org.eclipse.papyrus.domaincontextcodegen.editor",

-					 0,

-					 getString("_UI_CreateModelError_message", resource.getURI()),

-					 new Object [] { exception == null ? (Object)resource : exception });

+		if(!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {

+			BasicDiagnostic basicDiagnostic = new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.papyrus.domaincontextcodegen.editor", 0, getString("_UI_CreateModelError_message", resource.getURI()), new Object[]{ exception == null ? (Object)resource : exception });

 			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));

 			return basicDiagnostic;

-		}

-		else if (exception != null) {

-			return

-				new BasicDiagnostic

-					(Diagnostic.ERROR,

-					 "org.eclipse.papyrus.domaincontextcodegen.editor",

-					 0,

-					 getString("_UI_CreateModelError_message", resource.getURI()),

-					 new Object[] { exception });

-		}

-		else {

+		} else if(exception != null) {

+			return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.papyrus.domaincontextcodegen.editor", 0, getString("_UI_CreateModelError_message", resource.getURI()), new Object[]{ exception });

+		} else {

 			return Diagnostic.OK_INSTANCE;

 		}

 	}

@@ -996,6 +973,7 @@ public class DomaincontextcodegenEditor
 	 * This is the method used by the framework to install your own controls.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -1006,24 +984,25 @@ public class DomaincontextcodegenEditor
 

 		// Only creates the other pages if there is something that can be edited

 		//

-		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {

+		if(!getEditingDomain().getResourceSet().getResources().isEmpty()) {

 			// Create a page for the selection tree view.

 			//

 			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), DomaincontextcodegenEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							Tree tree = new Tree(composite, SWT.MULTI);

-							TreeViewer newTreeViewer = new TreeViewer(tree);

-							return newTreeViewer;

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

+				ViewerPane viewerPane = new ViewerPane(getSite().getPage(), DomaincontextcodegenEditor.this) {

+

+					@Override

+					public Viewer createViewer(Composite composite) {

+						Tree tree = new Tree(composite, SWT.MULTI);

+						TreeViewer newTreeViewer = new TreeViewer(tree);

+						return newTreeViewer;

+					}

+

+					@Override

+					public void requestActivation() {

+						super.requestActivation();

+						setCurrentViewerPane(this);

+					}

+				};

 				viewerPane.createControl(getContainer());

 

 				selectionViewer = (TreeViewer)viewerPane.getViewer();

@@ -1044,20 +1023,21 @@ public class DomaincontextcodegenEditor
 			// Create a page for the parent tree view.

 			//

 			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), DomaincontextcodegenEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							Tree tree = new Tree(composite, SWT.MULTI);

-							TreeViewer newTreeViewer = new TreeViewer(tree);

-							return newTreeViewer;

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

+				ViewerPane viewerPane = new ViewerPane(getSite().getPage(), DomaincontextcodegenEditor.this) {

+

+					@Override

+					public Viewer createViewer(Composite composite) {

+						Tree tree = new Tree(composite, SWT.MULTI);

+						TreeViewer newTreeViewer = new TreeViewer(tree);

+						return newTreeViewer;

+					}

+

+					@Override

+					public void requestActivation() {

+						super.requestActivation();

+						setCurrentViewerPane(this);

+					}

+				};

 				viewerPane.createControl(getContainer());

 

 				parentViewer = (TreeViewer)viewerPane.getViewer();

@@ -1073,18 +1053,19 @@ public class DomaincontextcodegenEditor
 			// This is the page for the list viewer

 			//

 			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), DomaincontextcodegenEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new ListViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

+				ViewerPane viewerPane = new ViewerPane(getSite().getPage(), DomaincontextcodegenEditor.this) {

+

+					@Override

+					public Viewer createViewer(Composite composite) {

+						return new ListViewer(composite);

+					}

+

+					@Override

+					public void requestActivation() {

+						super.requestActivation();

+						setCurrentViewerPane(this);

+					}

+				};

 				viewerPane.createControl(getContainer());

 				listViewer = (ListViewer)viewerPane.getViewer();

 				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

@@ -1098,18 +1079,19 @@ public class DomaincontextcodegenEditor
 			// This is the page for the tree viewer

 			//

 			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), DomaincontextcodegenEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new TreeViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

+				ViewerPane viewerPane = new ViewerPane(getSite().getPage(), DomaincontextcodegenEditor.this) {

+

+					@Override

+					public Viewer createViewer(Composite composite) {

+						return new TreeViewer(composite);

+					}

+

+					@Override

+					public void requestActivation() {

+						super.requestActivation();

+						setCurrentViewerPane(this);

+					}

+				};

 				viewerPane.createControl(getContainer());

 				treeViewer = (TreeViewer)viewerPane.getViewer();

 				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

@@ -1125,18 +1107,19 @@ public class DomaincontextcodegenEditor
 			// This is the page for the table viewer.

 			//

 			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), DomaincontextcodegenEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new TableViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

+				ViewerPane viewerPane = new ViewerPane(getSite().getPage(), DomaincontextcodegenEditor.this) {

+

+					@Override

+					public Viewer createViewer(Composite composite) {

+						return new TableViewer(composite);

+					}

+

+					@Override

+					public void requestActivation() {

+						super.requestActivation();

+						setCurrentViewerPane(this);

+					}

+				};

 				viewerPane.createControl(getContainer());

 				tableViewer = (TableViewer)viewerPane.getViewer();

 

@@ -1156,7 +1139,7 @@ public class DomaincontextcodegenEditor
 				selfColumn.setText(getString("_UI_SelfColumn_label"));

 				selfColumn.setResizable(true);

 

-				tableViewer.setColumnProperties(new String [] {"a", "b"});

+				tableViewer.setColumnProperties(new String[]{ "a", "b" });

 				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1168,18 +1151,19 @@ public class DomaincontextcodegenEditor
 			// This is the page for the table tree viewer.

 			//

 			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), DomaincontextcodegenEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new TreeViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

+				ViewerPane viewerPane = new ViewerPane(getSite().getPage(), DomaincontextcodegenEditor.this) {

+

+					@Override

+					public Viewer createViewer(Composite composite) {

+						return new TreeViewer(composite);

+					}

+

+					@Override

+					public void requestActivation() {

+						super.requestActivation();

+						setCurrentViewerPane(this);

+					}

+				};

 				viewerPane.createControl(getContainer());

 

 				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();

@@ -1199,7 +1183,7 @@ public class DomaincontextcodegenEditor
 				selfColumn.setResizable(true);

 				selfColumn.setWidth(200);

 

-				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"});

+				treeViewerWithColumns.setColumnProperties(new String[]{ "a", "b" });

 				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1208,36 +1192,37 @@ public class DomaincontextcodegenEditor
 				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label"));

 			}

 

-			getSite().getShell().getDisplay().asyncExec

-				(new Runnable() {

-					 public void run() {

-						 setActivePage(0);

-					 }

-				 });

+			getSite().getShell().getDisplay().asyncExec(new Runnable() {

+

+				public void run() {

+					setActivePage(0);

+				}

+			});

 		}

 

 		// Ensures that this editor will only display the page's tab

 		// area if there are more than one page

 		//

-		getContainer().addControlListener

-			(new ControlAdapter() {

-				boolean guard = false;

-				@Override

-				public void controlResized(ControlEvent event) {

-					if (!guard) {

-						guard = true;

-						hideTabs();

-						guard = false;

-					}

+		getContainer().addControlListener(new ControlAdapter() {

+

+			boolean guard = false;

+

+			@Override

+			public void controlResized(ControlEvent event) {

+				if(!guard) {

+					guard = true;

+					hideTabs();

+					guard = false;

 				}

-			 });

-

-		getSite().getShell().getDisplay().asyncExec

-			(new Runnable() {

-				 public void run() {

-					 updateProblemIndication();

-				 }

-			 });

+			}

+		});

+

+		getSite().getShell().getDisplay().asyncExec(new Runnable() {

+

+			public void run() {

+				updateProblemIndication();

+			}

+		});

 	}

 

 	/**

@@ -1245,12 +1230,13 @@ public class DomaincontextcodegenEditor
 	 * this hides the single tab at the bottom.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected void hideTabs() {

-		if (getPageCount() <= 1) {

+		if(getPageCount() <= 1) {

 			setPageText(0, "");

-			if (getContainer() instanceof CTabFolder) {

+			if(getContainer() instanceof CTabFolder) {

 				((CTabFolder)getContainer()).setTabHeight(1);

 				Point point = getContainer().getSize();

 				getContainer().setSize(point.x, point.y + 6);

@@ -1263,12 +1249,13 @@ public class DomaincontextcodegenEditor
 	 * this shows the tabs at the bottom.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected void showTabs() {

-		if (getPageCount() > 1) {

+		if(getPageCount() > 1) {

 			setPageText(0, getString("_UI_SelectionPage_label"));

-			if (getContainer() instanceof CTabFolder) {

+			if(getContainer() instanceof CTabFolder) {

 				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);

 				Point point = getContainer().getSize();

 				getContainer().setSize(point.x, point.y - 6);

@@ -1280,13 +1267,14 @@ public class DomaincontextcodegenEditor
 	 * This is used to track the active viewer.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	protected void pageChange(int pageIndex) {

 		super.pageChange(pageIndex);

 

-		if (contentOutlinePage != null) {

+		if(contentOutlinePage != null) {

 			handleContentOutlineSelection(contentOutlinePage.getSelection());

 		}

 	}

@@ -1295,21 +1283,19 @@ public class DomaincontextcodegenEditor
 	 * This is how the framework determines which interfaces we implement.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@SuppressWarnings("rawtypes")

 	@Override

 	public Object getAdapter(Class key) {

-		if (key.equals(IContentOutlinePage.class)) {

+		if(key.equals(IContentOutlinePage.class)) {

 			return showOutlineView() ? getContentOutlinePage() : null;

-		}

-		else if (key.equals(IPropertySheetPage.class)) {

+		} else if(key.equals(IPropertySheetPage.class)) {

 			return getPropertySheetPage();

-		}

-		else if (key.equals(IGotoMarker.class)) {

+		} else if(key.equals(IGotoMarker.class)) {

 			return this;

-		}

-		else {

+		} else {

 			return super.getAdapter(key);

 		}

 	}

@@ -1318,13 +1304,15 @@ public class DomaincontextcodegenEditor
 	 * This accesses a cached version of the content outliner.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public IContentOutlinePage getContentOutlinePage() {

-		if (contentOutlinePage == null) {

+		if(contentOutlinePage == null) {

 			// The content outline is just a tree.

 			//

 			class MyContentOutlinePage extends ContentOutlinePage {

+

 				@Override

 				public void createControl(Composite parent) {

 					super.createControl(parent);

@@ -1341,10 +1329,10 @@ public class DomaincontextcodegenEditor
 					//

 					createContextMenuFor(contentOutlineViewer);

 

-					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

-					  // Select the root object in the view.

-					  //

-					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

+					if(!editingDomain.getResourceSet().getResources().isEmpty()) {

+						// Select the root object in the view.

+						//

+						contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

 					}

 				}

 

@@ -1365,14 +1353,14 @@ public class DomaincontextcodegenEditor
 

 			// Listen to selection so that we can handle it is a special way.

 			//

-			contentOutlinePage.addSelectionChangedListener

-				(new ISelectionChangedListener() {

-					 // This ensures that we handle selections correctly.

-					 //

-					 public void selectionChanged(SelectionChangedEvent event) {

-						 handleContentOutlineSelection(event.getSelection());

-					 }

-				 });

+			contentOutlinePage.addSelectionChangedListener(new ISelectionChangedListener() {

+

+				// This ensures that we handle selections correctly.

+				//

+				public void selectionChanged(SelectionChangedEvent event) {

+					handleContentOutlineSelection(event.getSelection());

+				}

+			});

 		}

 

 		return contentOutlinePage;

@@ -1382,24 +1370,25 @@ public class DomaincontextcodegenEditor
 	 * This accesses a cached version of the property sheet.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public IPropertySheetPage getPropertySheetPage() {

-		if (propertySheetPage == null) {

-			propertySheetPage =

-				new ExtendedPropertySheetPage(editingDomain) {

-					@Override

-					public void setSelectionToViewer(List<?> selection) {

-						DomaincontextcodegenEditor.this.setSelectionToViewer(selection);

-						DomaincontextcodegenEditor.this.setFocus();

-					}

+		if(propertySheetPage == null) {

+			propertySheetPage = new ExtendedPropertySheetPage(editingDomain) {

 

-					@Override

-					public void setActionBars(IActionBars actionBars) {

-						super.setActionBars(actionBars);

-						getActionBarContributor().shareGlobalActions(this, actionBars);

-					}

-				};

+				@Override

+				public void setSelectionToViewer(List<?> selection) {

+					DomaincontextcodegenEditor.this.setSelectionToViewer(selection);

+					DomaincontextcodegenEditor.this.setFocus();

+				}

+

+				@Override

+				public void setActionBars(IActionBars actionBars) {

+					super.setActionBars(actionBars);

+					getActionBarContributor().shareGlobalActions(this, actionBars);

+				}

+			};

 			propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

 		}

 

@@ -1410,33 +1399,33 @@ public class DomaincontextcodegenEditor
 	 * This deals with how we want selection in the outliner to affect the other views.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void handleContentOutlineSelection(ISelection selection) {

-		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {

+		if(currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {

 			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();

-			if (selectedElements.hasNext()) {

+			if(selectedElements.hasNext()) {

 				// Get the first selected element.

 				//

 				Object selectedElement = selectedElements.next();

 

 				// If it's the selection viewer, then we want it to select the same selection as this selection.

 				//

-				if (currentViewerPane.getViewer() == selectionViewer) {

+				if(currentViewerPane.getViewer() == selectionViewer) {

 					ArrayList<Object> selectionList = new ArrayList<Object>();

 					selectionList.add(selectedElement);

-					while (selectedElements.hasNext()) {

+					while(selectedElements.hasNext()) {

 						selectionList.add(selectedElements.next());

 					}

 

 					// Set the selection to the widget.

 					//

 					selectionViewer.setSelection(new StructuredSelection(selectionList));

-				}

-				else {

+				} else {

 					// Set the input to the widget.

 					//

-					if (currentViewerPane.getViewer().getInput() != selectedElement) {

+					if(currentViewerPane.getViewer().getInput() != selectedElement) {

 						currentViewerPane.getViewer().setInput(selectedElement);

 						currentViewerPane.setTitle(selectedElement);

 					}

@@ -1449,6 +1438,7 @@ public class DomaincontextcodegenEditor
 	 * This is for implementing {@link IEditorPart} and simply tests the command stack.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -1460,6 +1450,7 @@ public class DomaincontextcodegenEditor
 	 * This is for implementing {@link IEditorPart} and simply saves the model file.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -1471,32 +1462,31 @@ public class DomaincontextcodegenEditor
 

 		// Do the work within an operation because this is a long running activity that modifies the workbench.

 		//

-		WorkspaceModifyOperation operation =

-			new WorkspaceModifyOperation() {

-				// This is the method that gets invoked when the operation runs.

+		WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {

+

+			// This is the method that gets invoked when the operation runs.

+			//

+			@Override

+			public void execute(IProgressMonitor monitor) {

+				// Save the resources to the file system.

 				//

-				@Override

-				public void execute(IProgressMonitor monitor) {

-					// Save the resources to the file system.

-					//

-					boolean first = true;

-					for (Resource resource : editingDomain.getResourceSet().getResources()) {

-						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

-							try {

-								long timeStamp = resource.getTimeStamp();

-								resource.save(saveOptions);

-								if (resource.getTimeStamp() != timeStamp) {

-									savedResources.add(resource);

-								}

-							}

-							catch (Exception exception) {

-								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+				boolean first = true;

+				for(Resource resource : editingDomain.getResourceSet().getResources()) {

+					if((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

+						try {

+							long timeStamp = resource.getTimeStamp();

+							resource.save(saveOptions);

+							if(resource.getTimeStamp() != timeStamp) {

+								savedResources.add(resource);

 							}

-							first = false;

+						} catch (Exception exception) {

+							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

 						}

+						first = false;

 					}

 				}

-			};

+			}

+		};

 

 		updateProblemIndication = false;

 		try {

@@ -1508,8 +1498,7 @@ public class DomaincontextcodegenEditor
 			//

 			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

 			firePropertyChange(IEditorPart.PROP_DIRTY);

-		}

-		catch (Exception exception) {

+		} catch (Exception exception) {

 			// Something went wrong that shouldn't.

 			//

 			DomainContextEditorPlugin.INSTANCE.log(exception);

@@ -1520,21 +1509,21 @@ public class DomaincontextcodegenEditor
 

 	/**

 	 * This returns whether something has been persisted to the URI of the specified resource.

-	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream. 

+	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected boolean isPersisted(Resource resource) {

 		boolean result = false;

 		try {

 			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

-			if (stream != null) {

+			if(stream != null) {

 				result = true;

 				stream.close();

 			}

-		}

-		catch (IOException e) {

+		} catch (IOException e) {

 			// Ignore

 		}

 		return result;

@@ -1544,6 +1533,7 @@ public class DomaincontextcodegenEditor
 	 * This always returns true because it is not currently supported.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -1555,6 +1545,7 @@ public class DomaincontextcodegenEditor
 	 * This also changes the editor's input.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -1562,9 +1553,9 @@ public class DomaincontextcodegenEditor
 		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

 		saveAsDialog.open();

 		IPath path = saveAsDialog.getResult();

-		if (path != null) {

+		if(path != null) {

 			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

-			if (file != null) {

+			if(file != null) {

 				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

 			}

 		}

@@ -1573,38 +1564,36 @@ public class DomaincontextcodegenEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected void doSaveAs(URI uri, IEditorInput editorInput) {

 		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

 		setInputWithNotify(editorInput);

 		setPartName(editorInput.getName());

-		IProgressMonitor progressMonitor =

-			getActionBars().getStatusLineManager() != null ?

-				getActionBars().getStatusLineManager().getProgressMonitor() :

-				new NullProgressMonitor();

+		IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null ? getActionBars().getStatusLineManager().getProgressMonitor() : new NullProgressMonitor();

 		doSave(progressMonitor);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void gotoMarker(IMarker marker) {

 		try {

-			if (marker.getType().equals(EValidator.MARKER)) {

+			if(marker.getType().equals(EValidator.MARKER)) {

 				String uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);

-				if (uriAttribute != null) {

+				if(uriAttribute != null) {

 					URI uri = URI.createURI(uriAttribute);

 					EObject eObject = editingDomain.getResourceSet().getEObject(uri, true);

-					if (eObject != null) {

-					  setSelectionToViewer(Collections.singleton(editingDomain.getWrapper(eObject)));

+					if(eObject != null) {

+						setSelectionToViewer(Collections.singleton(editingDomain.getWrapper(eObject)));

 					}

 				}

 			}

-		}

-		catch (CoreException exception) {

+		} catch (CoreException exception) {

 			DomainContextEditorPlugin.INSTANCE.log(exception);

 		}

 	}

@@ -1613,6 +1602,7 @@ public class DomaincontextcodegenEditor
 	 * This is called during startup.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -1628,14 +1618,14 @@ public class DomaincontextcodegenEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public void setFocus() {

-		if (currentViewerPane != null) {

+		if(currentViewerPane != null) {

 			currentViewerPane.setFocus();

-		}

-		else {

+		} else {

 			getControl(getActivePage()).setFocus();

 		}

 	}

@@ -1644,6 +1634,7 @@ public class DomaincontextcodegenEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void addSelectionChangedListener(ISelectionChangedListener listener) {

@@ -1654,6 +1645,7 @@ public class DomaincontextcodegenEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void removeSelectionChangedListener(ISelectionChangedListener listener) {

@@ -1664,6 +1656,7 @@ public class DomaincontextcodegenEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public ISelection getSelection() {

@@ -1675,12 +1668,13 @@ public class DomaincontextcodegenEditor
 	 * Calling this result will notify the listeners.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setSelection(ISelection selection) {

 		editorSelection = selection;

 

-		for (ISelectionChangedListener listener : selectionChangedListeners) {

+		for(ISelectionChangedListener listener : selectionChangedListeners) {

 			listener.selectionChanged(new SelectionChangedEvent(this, selection));

 		}

 		setStatusLineManager(selection);

@@ -1689,32 +1683,34 @@ public class DomaincontextcodegenEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setStatusLineManager(ISelection selection) {

-		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

-			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

+		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ? contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

 

-		if (statusLineManager != null) {

-			if (selection instanceof IStructuredSelection) {

+		if(statusLineManager != null) {

+			if(selection instanceof IStructuredSelection) {

 				Collection<?> collection = ((IStructuredSelection)selection).toList();

-				switch (collection.size()) {

-					case 0: {

-						statusLineManager.setMessage(getString("_UI_NoObjectSelected"));

-						break;

-					}

-					case 1: {

-						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

-						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text));

-						break;

-					}

-					default: {

-						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size())));

-						break;

-					}

+				switch(collection.size()) {

+				case 0:

+				{

+					statusLineManager.setMessage(getString("_UI_NoObjectSelected"));

+					break;

 				}

-			}

-			else {

+				case 1:

+				{

+					String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

+					statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text));

+					break;

+				}

+				default:

+				{

+					statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size())));

+					break;

+				}

+				}

+			} else {

 				statusLineManager.setMessage("");

 			}

 		}

@@ -1724,6 +1720,7 @@ public class DomaincontextcodegenEditor
 	 * This looks up a string in the plugin's plugin.properties file.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private static String getString(String key) {

@@ -1734,16 +1731,18 @@ public class DomaincontextcodegenEditor
 	 * This looks up a string in plugin.properties, making a substitution.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private static String getString(String key, Object s1) {

-		return DomainContextEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });

+		return DomainContextEditorPlugin.INSTANCE.getString(key, new Object[]{ s1 });

 	}

 

 	/**

 	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void menuAboutToShow(IMenuManager menuManager) {

@@ -1753,6 +1752,7 @@ public class DomaincontextcodegenEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EditingDomainActionBarContributor getActionBarContributor() {

@@ -1762,6 +1762,7 @@ public class DomaincontextcodegenEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public IActionBars getActionBars() {

@@ -1771,6 +1772,7 @@ public class DomaincontextcodegenEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public AdapterFactory getAdapterFactory() {

@@ -1780,6 +1782,7 @@ public class DomaincontextcodegenEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -1792,15 +1795,15 @@ public class DomaincontextcodegenEditor
 

 		adapterFactory.dispose();

 

-		if (getActionBarContributor().getActiveEditor() == this) {

+		if(getActionBarContributor().getActiveEditor() == this) {

 			getActionBarContributor().setActiveEditor(null);

 		}

 

-		if (propertySheetPage != null) {

+		if(propertySheetPage != null) {

 			propertySheetPage.dispose();

 		}

 

-		if (contentOutlinePage != null) {

+		if(contentOutlinePage != null) {

 			contentOutlinePage.dispose();

 		}

 

@@ -1811,6 +1814,7 @@ public class DomaincontextcodegenEditor
 	 * Returns whether the outline view should be presented to the user.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected boolean showOutlineView() {

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/src/org/eclipse/papyrus/domaincontextcodegen/presentation/DomaincontextcodegenModelWizard.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/src/org/eclipse/papyrus/domaincontextcodegen/presentation/DomaincontextcodegenModelWizard.java
index 4c71a8d0f8d..85814c0a1eb 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/src/org/eclipse/papyrus/domaincontextcodegen/presentation/DomaincontextcodegenModelWizard.java
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen.editor/src/org/eclipse/papyrus/domaincontextcodegen/presentation/DomaincontextcodegenModelWizard.java
@@ -6,7 +6,6 @@
  */

 package org.eclipse.papyrus.domaincontextcodegen.presentation;

 

-

 import java.util.ArrayList;

 import java.util.Arrays;

 import java.util.Collection;

@@ -17,107 +16,84 @@ 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.domaincontextcodegen.DomaincontextcodegenFactory;

+import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage;

+import org.eclipse.papyrus.domaincontextcodegen.provider.DomainContextEditPlugin;

 import org.eclipse.swt.SWT;

-

-import org.eclipse.swt.events.ModifyListener;

 import org.eclipse.swt.events.ModifyEvent;

-

+import org.eclipse.swt.events.ModifyListener;

 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.actions.WorkspaceModifyOperation;

-

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.ISetSelectionTarget;

-

-import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenFactory;

-import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage;

-import org.eclipse.papyrus.domaincontextcodegen.provider.DomainContextEditPlugin;

-

-

-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;

-

+import org.eclipse.ui.actions.WorkspaceModifyOperation;

+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

+import org.eclipse.ui.part.FileEditorInput;

+import org.eclipse.ui.part.ISetSelectionTarget;

 

 /**

  * This is a simple wizard for creating a new model file.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

+ * 

  * @generated

  */

 public class DomaincontextcodegenModelWizard extends Wizard implements INewWizard {

+

 	/**

 	 * The supported extensions for created files.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

-	public static final List<String> FILE_EXTENSIONS =

-		Collections.unmodifiableList(Arrays.asList(DomainContextEditorPlugin.INSTANCE.getString("_UI_DomaincontextcodegenEditorFilenameExtensions").split("\\s*,\\s*")));

+	public static final List<String> FILE_EXTENSIONS = Collections.unmodifiableList(Arrays.asList(DomainContextEditorPlugin.INSTANCE.getString("_UI_DomaincontextcodegenEditorFilenameExtensions").split("\\s*,\\s*")));

 

 	/**

 	 * A formatted list of supported file extensions, suitable for display.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

-	public static final String FORMATTED_FILE_EXTENSIONS =

-		DomainContextEditorPlugin.INSTANCE.getString("_UI_DomaincontextcodegenEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");

+	public static final String FORMATTED_FILE_EXTENSIONS = DomainContextEditorPlugin.INSTANCE.getString("_UI_DomaincontextcodegenEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");

 

 	/**

 	 * This caches an instance of the model package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected DomaincontextcodegenPackage domaincontextcodegenPackage = DomaincontextcodegenPackage.eINSTANCE;

@@ -126,6 +102,7 @@ public class DomaincontextcodegenModelWizard extends Wizard implements INewWizar
 	 * This caches an instance of the model factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected DomaincontextcodegenFactory domaincontextcodegenFactory = domaincontextcodegenPackage.getDomaincontextcodegenFactory();

@@ -134,6 +111,7 @@ public class DomaincontextcodegenModelWizard extends Wizard implements INewWizar
 	 * This is the file creation page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected DomaincontextcodegenModelWizardNewFileCreationPage newFileCreationPage;

@@ -142,6 +120,7 @@ public class DomaincontextcodegenModelWizard extends Wizard implements INewWizar
 	 * This is the initial object creation page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected DomaincontextcodegenModelWizardInitialObjectCreationPage initialObjectCreationPage;

@@ -150,6 +129,7 @@ public class DomaincontextcodegenModelWizard extends Wizard implements INewWizar
 	 * Remember the selection during initialization for populating the default container.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected IStructuredSelection selection;

@@ -158,6 +138,7 @@ public class DomaincontextcodegenModelWizard extends Wizard implements INewWizar
 	 * Remember the workbench during initialization.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected IWorkbench workbench;

@@ -166,6 +147,7 @@ public class DomaincontextcodegenModelWizard extends Wizard implements INewWizar
 	 * Caches the names of the types that can be created as the root object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected List<String> initialObjectNames;

@@ -174,6 +156,7 @@ public class DomaincontextcodegenModelWizard extends Wizard implements INewWizar
 	 * This just records the information.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void init(IWorkbench workbench, IStructuredSelection selection) {

@@ -187,15 +170,16 @@ public class DomaincontextcodegenModelWizard extends Wizard implements INewWizar
 	 * Returns the names of the types that can be created as the root object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected Collection<String> getInitialObjectNames() {

-		if (initialObjectNames == null) {

+		if(initialObjectNames == null) {

 			initialObjectNames = new ArrayList<String>();

-			for (EClassifier eClassifier : domaincontextcodegenPackage.getEClassifiers()) {

-				if (eClassifier instanceof EClass) {

+			for(EClassifier eClassifier : domaincontextcodegenPackage.getEClassifiers()) {

+				if(eClassifier instanceof EClass) {

 					EClass eClass = (EClass)eClassifier;

-					if (!eClass.isAbstract()) {

+					if(!eClass.isAbstract()) {

 						initialObjectNames.add(eClass.getName());

 					}

 				}

@@ -209,6 +193,7 @@ public class DomaincontextcodegenModelWizard extends Wizard implements INewWizar
 	 * Create a new model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected EObject createInitialModel() {

@@ -221,6 +206,7 @@ public class DomaincontextcodegenModelWizard extends Wizard implements INewWizar
 	 * Do the work after everything is specified.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -232,44 +218,42 @@ public class DomaincontextcodegenModelWizard extends Wizard implements INewWizar
 

 			// Do the work within an operation.

 			//

-			WorkspaceModifyOperation operation =

-				new WorkspaceModifyOperation() {

-					@Override

-					protected void execute(IProgressMonitor progressMonitor) {

-						try {

-							// Create a resource set

-							//

-							ResourceSet resourceSet = new ResourceSetImpl();

-

-							// Get the URI of the model file.

-							//

-							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

-

-							// Create a resource for this file.

-							//

-							Resource resource = resourceSet.createResource(fileURI);

-

-							// Add the initial model object to the contents.

-							//

-							EObject rootObject = createInitialModel();

-							if (rootObject != null) {

-								resource.getContents().add(rootObject);

-							}

-

-							// Save the contents of the resource to the file system.

-							//

-							Map<Object, Object> options = new HashMap<Object, Object>();

-							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

-							resource.save(options);

-						}

-						catch (Exception exception) {

-							DomainContextEditorPlugin.INSTANCE.log(exception);

-						}

-						finally {

-							progressMonitor.done();

+			WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {

+

+				@Override

+				protected void execute(IProgressMonitor progressMonitor) {

+					try {

+						// Create a resource set

+						//

+						ResourceSet resourceSet = new ResourceSetImpl();

+

+						// Get the URI of the model file.

+						//

+						URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

+

+						// Create a resource for this file.

+						//

+						Resource resource = resourceSet.createResource(fileURI);

+

+						// Add the initial model object to the contents.

+						//

+						EObject rootObject = createInitialModel();

+						if(rootObject != null) {

+							resource.getContents().add(rootObject);

 						}

+

+						// Save the contents of the resource to the file system.

+						//

+						Map<Object, Object> options = new HashMap<Object, Object>();

+						options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

+						resource.save(options);

+					} catch (Exception exception) {

+						DomainContextEditorPlugin.INSTANCE.log(exception);

+					} finally {

+						progressMonitor.done();

 					}

-				};

+				}

+			};

 

 			getContainer().run(false, false, operation);

 

@@ -278,31 +262,27 @@ public class DomaincontextcodegenModelWizard extends Wizard implements INewWizar
 			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();

 			IWorkbenchPage page = workbenchWindow.getActivePage();

 			final IWorkbenchPart activePart = page.getActivePart();

-			if (activePart instanceof ISetSelectionTarget) {

+			if(activePart instanceof ISetSelectionTarget) {

 				final ISelection targetSelection = new StructuredSelection(modelFile);

-				getShell().getDisplay().asyncExec

-					(new Runnable() {

-						 public void run() {

-							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);

-						 }

-					 });

+				getShell().getDisplay().asyncExec(new Runnable() {

+

+					public void run() {

+						((ISetSelectionTarget)activePart).selectReveal(targetSelection);

+					}

+				});

 			}

 

 			// Open an editor on the new file.

 			//

 			try {

-				page.openEditor

-					(new FileEditorInput(modelFile),

-					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 

-			}

-			catch (PartInitException exception) {

+				page.openEditor(new FileEditorInput(modelFile), workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());

+			} catch (PartInitException exception) {

 				MessageDialog.openError(workbenchWindow.getShell(), DomainContextEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());

 				return false;

 			}

 

 			return true;

-		}

-		catch (Exception exception) {

+		} catch (Exception exception) {

 			DomainContextEditorPlugin.INSTANCE.log(exception);

 			return false;

 		}

@@ -312,13 +292,16 @@ public class DomaincontextcodegenModelWizard extends Wizard implements INewWizar
 	 * This is the one page of the wizard.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public class DomaincontextcodegenModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

+

 		/**

 		 * Pass in the selection.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		public DomaincontextcodegenModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

@@ -329,15 +312,16 @@ public class DomaincontextcodegenModelWizard extends Wizard implements INewWizar
 		 * The framework calls this to see if the file is correct.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		@Override

 		protected boolean validatePage() {

-			if (super.validatePage()) {

+			if(super.validatePage()) {

 				String extension = new Path(getFileName()).getFileExtension();

-				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {

+				if(extension == null || !FILE_EXTENSIONS.contains(extension)) {

 					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension";

-					setErrorMessage(DomainContextEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));

+					setErrorMessage(DomainContextEditorPlugin.INSTANCE.getString(key, new Object[]{ FORMATTED_FILE_EXTENSIONS }));

 					return false;

 				}

 				return true;

@@ -348,6 +332,7 @@ public class DomaincontextcodegenModelWizard extends Wizard implements INewWizar
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		public IFile getModelFile() {

@@ -359,26 +344,30 @@ public class DomaincontextcodegenModelWizard extends Wizard implements INewWizar
 	 * This is the page where the type of object to create is selected.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public class DomaincontextcodegenModelWizardInitialObjectCreationPage extends WizardPage {

+

 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		protected Combo initialObjectField;

 

 		/**

 		 * @generated

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

+		 *            <!-- begin-user-doc -->

+		 *            <!-- end-user-doc -->

 		 */

 		protected List<String> encodings;

 

 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		protected Combo encodingField;

@@ -387,6 +376,7 @@ public class DomaincontextcodegenModelWizard extends Wizard implements INewWizar
 		 * Pass in the selection.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		public DomaincontextcodegenModelWizardInitialObjectCreationPage(String pageId) {

@@ -396,10 +386,12 @@ public class DomaincontextcodegenModelWizard extends Wizard implements INewWizar
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		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;

@@ -429,11 +421,11 @@ public class DomaincontextcodegenModelWizard extends Wizard implements INewWizar
 				initialObjectField.setLayoutData(data);

 			}

 

-			for (String objectName : getInitialObjectNames()) {

+			for(String objectName : getInitialObjectNames()) {

 				initialObjectField.add(getLabel(objectName));

 			}

 

-			if (initialObjectField.getItemCount() == 1) {

+			if(initialObjectField.getItemCount() == 1) {

 				initialObjectField.select(0);

 			}

 			initialObjectField.addModifyListener(validator);

@@ -454,7 +446,7 @@ public class DomaincontextcodegenModelWizard extends Wizard implements INewWizar
 				encodingField.setLayoutData(data);

 			}

 

-			for (String encoding : getEncodings()) {

+			for(String encoding : getEncodings()) {

 				encodingField.add(encoding);

 			}

 

@@ -468,18 +460,20 @@ public class DomaincontextcodegenModelWizard extends Wizard implements INewWizar
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

-		protected ModifyListener validator =

-			new ModifyListener() {

-				public void modifyText(ModifyEvent e) {

-					setPageComplete(validatePage());

-				}

-			};

+		protected ModifyListener validator = new ModifyListener() {

+

+			public void modifyText(ModifyEvent e) {

+				setPageComplete(validatePage());

+			}

+		};

 

 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		protected boolean validatePage() {

@@ -489,17 +483,17 @@ public class DomaincontextcodegenModelWizard extends Wizard implements INewWizar
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		@Override

 		public void setVisible(boolean visible) {

 			super.setVisible(visible);

-			if (visible) {

-				if (initialObjectField.getItemCount() == 1) {

+			if(visible) {

+				if(initialObjectField.getItemCount() == 1) {

 					initialObjectField.clearSelection();

 					encodingField.setFocus();

-				}

-				else {

+				} else {

 					encodingField.clearSelection();

 					initialObjectField.setFocus();

 				}

@@ -509,13 +503,14 @@ public class DomaincontextcodegenModelWizard extends Wizard implements INewWizar
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		public String getInitialObjectName() {

 			String label = initialObjectField.getText();

 

-			for (String name : getInitialObjectNames()) {

-				if (getLabel(name).equals(label)) {

+			for(String name : getInitialObjectNames()) {

+				if(getLabel(name).equals(label)) {

 					return name;

 				}

 			}

@@ -525,6 +520,7 @@ public class DomaincontextcodegenModelWizard extends Wizard implements INewWizar
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		public String getEncoding() {

@@ -535,13 +531,13 @@ public class DomaincontextcodegenModelWizard extends Wizard implements INewWizar
 		 * Returns the label for the specified type name.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		protected String getLabel(String typeName) {

 			try {

 				return DomainContextEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type");

-			}

-			catch(MissingResourceException mre) {

+			} catch (MissingResourceException mre) {

 				DomainContextEditorPlugin.INSTANCE.log(mre);

 			}

 			return typeName;

@@ -550,12 +546,13 @@ public class DomaincontextcodegenModelWizard extends Wizard implements INewWizar
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * 

 		 * @generated

 		 */

 		protected Collection<String> getEncodings() {

-			if (encodings == null) {

+			if(encodings == null) {

 				encodings = new ArrayList<String>();

-				for (StringTokenizer stringTokenizer = new StringTokenizer(DomainContextEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) {

+				for(StringTokenizer stringTokenizer = new StringTokenizer(DomainContextEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens();) {

 					encodings.add(stringTokenizer.nextToken());

 				}

 			}

@@ -567,9 +564,10 @@ public class DomaincontextcodegenModelWizard extends Wizard implements INewWizar
 	 * The framework calls this to create the contents of the wizard.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

-		@Override

+	@Override

 	public void addPages() {

 		// Create a page, set the title, and the initial model file name.

 		//

@@ -581,21 +579,21 @@ public class DomaincontextcodegenModelWizard extends Wizard implements INewWizar
 

 		// Try and get the resource selection to determine a current directory for the file dialog.

 		//

-		if (selection != null && !selection.isEmpty()) {

+		if(selection != null && !selection.isEmpty()) {

 			// Get the resource...

 			//

 			Object selectedElement = selection.iterator().next();

-			if (selectedElement instanceof IResource) {

+			if(selectedElement instanceof IResource) {

 				// Get the resource parent, if its a file.

 				//

 				IResource selectedResource = (IResource)selectedElement;

-				if (selectedResource.getType() == IResource.FILE) {

+				if(selectedResource.getType() == IResource.FILE) {

 					selectedResource = selectedResource.getParent();

 				}

 

 				// This gives us a directory...

 				//

-				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {

+				if(selectedResource instanceof IFolder || selectedResource instanceof IProject) {

 					// Set this for the container.

 					//

 					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());

@@ -605,7 +603,7 @@ public class DomaincontextcodegenModelWizard extends Wizard implements INewWizar
 					String defaultModelBaseFilename = DomainContextEditorPlugin.INSTANCE.getString("_UI_DomaincontextcodegenEditorFilenameDefaultBase");

 					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);

 					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension;

-					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {

+					for(int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {

 						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension;

 					}

 					newFileCreationPage.setFileName(modelFilename);

@@ -622,6 +620,7 @@ public class DomaincontextcodegenModelWizard extends Wizard implements INewWizar
 	 * Get the file from the page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public IFile getModelFile() {

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/actionsrc/org/eclipse/papyrus/domaincontextcodegen/AddBindingsAction.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/actionsrc/org/eclipse/papyrus/domaincontextcodegen/AddBindingsAction.java
new file mode 100644
index 00000000000..2b6a5d440fc
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/actionsrc/org/eclipse/papyrus/domaincontextcodegen/AddBindingsAction.java
@@ -0,0 +1,57 @@
+/*****************************************************************************

+ * Copyright (c) 2010 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

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.domaincontextcodegen;

+

+import java.util.Iterator;

+

+import org.eclipse.jface.action.IAction;

+import org.eclipse.jface.viewers.ISelection;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.ui.IObjectActionDelegate;

+import org.eclipse.ui.IWorkbenchPart;

+

+public class AddBindingsAction implements IObjectActionDelegate {

+

+	protected ElementTypes eltTypes = null;

+

+	public AddBindingsAction() {

+	}

+

+	public void run(IAction action) {

+

+		DomainContext domain = eltTypes.getDomain();

+		ElementTypeBindings bindings = domain.getBindings().get(0);

+

+		Iterator<ElementType> it = eltTypes.getTypes().iterator();

+		while(it.hasNext()) {

+			ElementType elementType = it.next();

+

+			ElementTypeBinding etb = DomaincontextcodegenFactory.eINSTANCE.createElementTypeBinding();

+			etb.setRef(elementType);

+

+			bindings.getBindings().add(etb);

+		}

+	}

+

+	public void selectionChanged(IAction action, ISelection selection) {

+		if(selection instanceof IStructuredSelection) {

+			if(((IStructuredSelection)selection).getFirstElement() instanceof ElementTypes) {

+				eltTypes = (ElementTypes)((IStructuredSelection)selection).getFirstElement();

+			}

+		}

+

+	}

+

+	public void setActivePart(IAction action, IWorkbenchPart targetPart) {

+

+	}

+

+}

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/actionsrc/org/eclipse/papyrus/domaincontextcodegen/AddVisibleCommandForChildrenAction.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/actionsrc/org/eclipse/papyrus/domaincontextcodegen/AddVisibleCommandForChildrenAction.java
new file mode 100644
index 00000000000..a9eedf1725b
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/actionsrc/org/eclipse/papyrus/domaincontextcodegen/AddVisibleCommandForChildrenAction.java
@@ -0,0 +1,60 @@
+/*****************************************************************************

+ * Copyright (c) 2010 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

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.domaincontextcodegen;

+

+import java.util.Iterator;

+

+import org.eclipse.jface.action.IAction;

+import org.eclipse.jface.viewers.ISelection;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.ui.IObjectActionDelegate;

+import org.eclipse.ui.IWorkbenchPart;

+

+public class AddVisibleCommandForChildrenAction implements IObjectActionDelegate {

+

+	protected GenHandlers handlers = null;

+

+	public AddVisibleCommandForChildrenAction() {

+	}

+

+	public void run(IAction action) {

+

+		DomainContext domain = (DomainContext)handlers.eContainer();

+		ElementTypes types = domain.getElementTypes();

+

+		Iterator<ElementType> it = types.getTypes().iterator();

+		while(it.hasNext()) {

+			ElementType elementType = it.next();

+

+			if(elementType instanceof MetaClassType) {

+				MetaClassType mClassType = (MetaClassType)elementType;

+

+				if(!mClassType.getMetaClass().isAbstract()) {

+					handlers.getVisibleCreateChildHandlers().add(elementType);

+				}

+			}

+		}

+	}

+

+	public void selectionChanged(IAction action, ISelection selection) {

+		if(selection instanceof IStructuredSelection) {

+			if(((IStructuredSelection)selection).getFirstElement() instanceof GenHandlers) {

+				handlers = (GenHandlers)((IStructuredSelection)selection).getFirstElement();

+			}

+		}

+

+	}

+

+	public void setActivePart(IAction action, IWorkbenchPart targetPart) {

+

+	}

+

+}

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/actionsrc/org/eclipse/papyrus/domaincontextcodegen/ElementTypeComparator.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/actionsrc/org/eclipse/papyrus/domaincontextcodegen/ElementTypeComparator.java
index fb009427f97..15d43807e09 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/actionsrc/org/eclipse/papyrus/domaincontextcodegen/ElementTypeComparator.java
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/actionsrc/org/eclipse/papyrus/domaincontextcodegen/ElementTypeComparator.java
@@ -22,8 +22,8 @@ import java.util.Comparator;
 public class ElementTypeComparator implements Comparator<ElementType> {

 

 	public int compare(ElementType o1, ElementType o2) {

-		String name1 = o1.getSpecificName();

-		String name2 = o2.getSpecificName();

+		String name1 = o1.getName();

+		String name2 = o2.getName();

 		name1.compareTo(name2);

 		return name1.compareTo(name2);

 	}

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/actionsrc/org/eclipse/papyrus/domaincontextcodegen/GenerateElementTypeModelAction.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/actionsrc/org/eclipse/papyrus/domaincontextcodegen/GenerateElementTypeModelAction.java
index 2f9627b6aca..982e7e5dbc4 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/actionsrc/org/eclipse/papyrus/domaincontextcodegen/GenerateElementTypeModelAction.java
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/actionsrc/org/eclipse/papyrus/domaincontextcodegen/GenerateElementTypeModelAction.java
@@ -17,7 +17,6 @@ import java.util.ArrayList;
 import java.util.Collections;

 import java.util.Iterator;

 

-import org.eclipse.emf.codegen.util.CodeGenUtil;

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EClassifier;

 import org.eclipse.jface.action.IAction;

@@ -36,8 +35,6 @@ import org.eclipse.ui.IWorkbenchPart;
  */

 public class GenerateElementTypeModelAction implements IObjectActionDelegate {

 

-	protected static final String I_HINTED_TYPE = "org.eclipse.gmf.runtime.emf.type.core.IHintedType";

-

 	protected DomainContext selectedContext = null;

 

 	public GenerateElementTypeModelAction() {

@@ -51,18 +48,22 @@ public class GenerateElementTypeModelAction implements IObjectActionDelegate {
 		if(selectedContext.getSpecializationOf() == null) {

 			if(selectedContext.getMetamodel() != null) {

 				Iterator<EClassifier> iterClass = selectedContext.getMetamodel().getEClassifiers().iterator();

-				ArrayList<ElementType> result = new ArrayList<ElementType>();

+				ArrayList<MetaClassType> result = new ArrayList<MetaClassType>();

 				while(iterClass.hasNext()) {

 					EClassifier eClassifier = (EClassifier)iterClass.next();

 					if(eClassifier instanceof EClass) {

-						ElementType elemenType = DomaincontextcodegenFactory.eINSTANCE.createElementType();

-						elemenType.setEdithelper_EditHelperAdvicePath(selectedContext.getDefaultHelperPath());

-						elemenType.setKind(I_HINTED_TYPE);

+						MetaClassType elemenType = DomaincontextcodegenFactory.eINSTANCE.createMetaClassType();

+						elemenType.setHelper(selectedContext.getDefaultHelperPath());

 						elemenType.setMetaClass((EClass)eClassifier);

+						elemenType.setIcon("platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/" + eClassifier.getName() + ".gif");

 

 						// Convert name to upper case with '_' separator between name parts e.g. NamedElement -> NAMED_ELEMENT

-						String formattedName = CodeGenUtil.format(eClassifier.getName(), '_', null, false, true).toUpperCase();

-						elemenType.setSpecificName(formattedName);

+						// String formattedName = CodeGenUtil.format(eClassifier.getName(), '_', null, false, true).toUpperCase();

+						// elemenType.setName(not_formattedName);

+

+						// No formatting

+						String not_formattedName = eClassifier.getName();

+						elemenType.setName(not_formattedName);

 

 						result.add(elemenType);

 					}

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/actionsrc/org/eclipse/papyrus/domaincontextcodegen/SetUMLIconInElementTypesAction.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/actionsrc/org/eclipse/papyrus/domaincontextcodegen/SetUMLIconInElementTypesAction.java
new file mode 100644
index 00000000000..cffc723e95b
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/actionsrc/org/eclipse/papyrus/domaincontextcodegen/SetUMLIconInElementTypesAction.java
@@ -0,0 +1,55 @@
+/*****************************************************************************

+ * Copyright (c) 2010 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

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.domaincontextcodegen;

+

+import java.util.Iterator;

+

+import org.eclipse.jface.action.IAction;

+import org.eclipse.jface.viewers.ISelection;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.ui.IObjectActionDelegate;

+import org.eclipse.ui.IWorkbenchPart;

+

+public class SetUMLIconInElementTypesAction implements IObjectActionDelegate {

+

+	protected ElementTypes types = null;

+

+	public SetUMLIconInElementTypesAction() {

+	}

+

+	public void run(IAction action) {

+

+		DomainContext domain = (DomainContext)types.eContainer();

+		ElementTypes types = domain.getElementTypes();

+

+		Iterator<ElementType> it = types.getTypes().iterator();

+		while(it.hasNext()) {

+			ElementType elementType = it.next();

+

+			if(elementType instanceof MetaClassType) {

+				MetaClassType mClassType = (MetaClassType)elementType;

+				mClassType.setIcon("platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/" + mClassType.getName() + ".gif");

+			}

+		}

+	}

+

+	public void selectionChanged(IAction action, ISelection selection) {

+		if(selection instanceof IStructuredSelection) {

+			if(((IStructuredSelection)selection).getFirstElement() instanceof ElementTypes) {

+				types = (ElementTypes)((IStructuredSelection)selection).getFirstElement();

+			}

+		}

+	}

+

+	public void setActivePart(IAction action, IWorkbenchPart targetPart) {

+

+	}

+}

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/build.properties b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/build.properties
index 8faaf851b57..46f81bc816f 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/build.properties
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/build.properties
@@ -5,7 +5,6 @@
 # $Id$

 

 bin.includes = .,\

-               model/,\

                META-INF/,\

                plugin.xml,\

                plugin.properties,\

@@ -13,5 +12,7 @@ bin.includes = .,\
                build.properties,\

                resource/

 jars.compile.order = .

-source.. = src/

+source.. = src/,\

+           transforsrc/,\

+           actionsrc/

 output.. = bin/

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/plugin.xml b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/plugin.xml
index 92e9177d1e1..4f2fb1ef411 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/plugin.xml
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/plugin.xml
@@ -14,6 +14,34 @@
                label="Generate All ElementTypes model">

          </action>

       </objectContribution>

+      <objectContribution

+            adaptable="true"

+            id="org.eclipse.papyrus.domaincontextcodegen.ElementTypesContribution"

+            objectClass="org.eclipse.papyrus.domaincontextcodegen.ElementTypes">

+         <action

+               class="org.eclipse.papyrus.domaincontextcodegen.AddBindingsAction"

+               enablesFor="1"

+               id="org.eclipse.papyrus.domaincontextcodegen.AddBindingsAction"

+               label="Add bindings for ElementTypes">

+         </action>

+         <action

+               class="org.eclipse.papyrus.domaincontextcodegen.SetUMLIconInElementTypesAction"

+               enablesFor="1"

+               id="org.eclipse.papyrus.domaincontextcodegen.SetUMLIconInElementTypesAction"

+               label="Set UML icon for ElementTypes">

+         </action>

+      </objectContribution>

+      <objectContribution

+            adaptable="true"

+            id="org.eclipse.papyrus.domaincontextcodegen.GenHandlers"

+            objectClass="org.eclipse.papyrus.domaincontextcodegen.GenHandlers">

+         <action

+               class="org.eclipse.papyrus.domaincontextcodegen.AddVisibleCommandForChildrenAction"

+               enablesFor="1"

+               id="org.eclipse.papyrus.domaincontextcodegen.AddVisibleCommandForChildrenAction"

+               label="Add non-abstract ElementTypes in create menu">

+         </action>

+      </objectContribution>

    </extension>

 

 </plugin>

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/resource/DomainContext.ecore b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/resource/DomainContext.ecore
index b90ebe76904..dae4c73670a 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/resource/DomainContext.ecore
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/resource/DomainContext.ecore
@@ -16,50 +16,69 @@
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="elementTypeNamePrefix"

         lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="matcherPatch" lowerBound="1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="elementTypes" eType="#//ElementTypes"

-        containment="true"/>

+        containment="true" eOpposite="#//ElementTypes/domain"/>

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultHelperPath" lowerBound="1"

         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="advicebindings" upperBound="-1"

-        eType="#//AdviceBinding" containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="advices" upperBound="-1"

+        eType="#//Advice" containment="true"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="bindings" upperBound="-1"

-        eType="#//Binding" containment="true"/>

+        eType="#//ElementTypeBindings" containment="true"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="genHandlers" eType="#//GenHandlers"

         containment="true"/>

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="generatedSourceFolder"

         lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="menu" upperBound="-1" eType="#//MenuDeclaration"

+        containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="command" upperBound="-1"

+        eType="#//CommandDeclaration" containment="true"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="ElementTypes">

     <eStructuralFeatures xsi:type="ecore:EReference" name="types" upperBound="-1"

-        eType="#//ElementType" containment="true"/>

+        eType="#//ElementType" containment="true" eOpposite="#//ElementType/owner"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="domain" eType="#//DomainContext"

+        eOpposite="#//DomainContext/elementTypes"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ElementType" abstract="true">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="helper" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="owner" eType="#//ElementTypes"

+        eOpposite="#//ElementTypes/types"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="icon" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ElementType">

+  <eClassifiers xsi:type="ecore:EClass" name="MetaClassType" eSuperTypes="#//ElementType">

     <eStructuralFeatures xsi:type="ecore:EReference" name="metaClass" lowerBound="1"

         eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="specificName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="edithelper_EditHelperAdvicePath"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="specializationof" eType="#//ElementType"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="specializationIDof" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="AdviceBinding">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="advicePath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  <eClassifiers xsi:type="ecore:EClass" name="SpecializationType" eSuperTypes="#//ElementType">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="ref" eType="#//ElementType"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="matcher" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="genMatcher" eType="#//GenMatcher"

+        containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="genHelper" eType="#//GenHelper"

+        containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Advice">

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="adviceID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="ref" eType="#//ElementType"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="advicePath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="inheritance" eType="#//InheritanceKind"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="elementTypeRef" eType="#//ElementType"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="elementTypeIDref" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EEnum" name="InheritanceKind">

-    <eLiterals name="none"/>

-    <eLiterals name="all" value="1"/>

+  <eClassifiers xsi:type="ecore:EClass" name="ElementTypeBindings">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="clientContextID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="bindings" upperBound="-1"

+        eType="#//Binding" containment="true" eOpposite="#//Binding/owner"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Binding">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="advice" eType="#//AdviceBinding"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="elementTypePattern" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="adviceID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  <eClassifiers xsi:type="ecore:EClass" name="Binding" abstract="true">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="owner" lowerBound="1" eType="#//ElementTypeBindings"

+        eOpposite="#//ElementTypeBindings/bindings"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="pattern" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ElementTypeBinding" eSuperTypes="#//Binding">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="ref" eType="#//ElementType"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="AdviceBinding" eSuperTypes="#//Binding">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="ref" eType="#//Advice"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="GenHandlers">

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="handlerPackage" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

@@ -69,5 +88,46 @@
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="elementTypeEnumeratorPackage"

         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="visibleCreateChildHandlers"

+        upperBound="-1" eType="#//ElementType"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="parentDomainCreateChild"

+        upperBound="-1" eType="#//ElementType"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="createChildMenuLocationURI"

+        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EEnum" name="InheritanceKind">

+    <eLiterals name="none"/>

+    <eLiterals name="all" value="1"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="GenMatcher" abstract="true">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="GenHelper" abstract="true">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="StereotypedElementMatcher" eSuperTypes="#//GenMatcher">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="stereotypeName" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="stereotypePackage" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="baseElementName" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="baseElementPackage" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="StereotypedElementHelper" eSuperTypes="#//GenHelper">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="stereotypeName" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="stereotypePackage" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="baseElementName" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="baseElementPackage" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="MenuDeclaration">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="locationURI" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="commands" upperBound="-1"

+        eType="#//Command"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="CommandDeclaration">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="commands" upperBound="-1"

+        eType="#//Command" containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Command">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="elementType" eType="#//ElementType"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="icon" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

   </eClassifiers>

 </ecore:EPackage>

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/resource/DomainContext.genmodel b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/resource/DomainContext.genmodel
index f63597f9e86..e068f142d48 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/resource/DomainContext.genmodel
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/resource/DomainContext.genmodel
@@ -8,21 +8,89 @@
   <foreignModel>DomainContext.ecore</foreignModel>

   <genPackages prefix="Domaincontextcodegen" basePackage="org.eclipse.papyrus" disposableProviderFactory="true"

       ecorePackage="DomainContext.ecore#/">

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="DomainContext.ecore#//InheritanceKind">

+      <genEnumLiterals ecoreEnumLiteral="DomainContext.ecore#//InheritanceKind/none"/>

+      <genEnumLiterals ecoreEnumLiteral="DomainContext.ecore#//InheritanceKind/all"/>

+    </genEnums>

     <genClasses ecoreClass="DomainContext.ecore#//DomainContext">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DomainContext.ecore#//DomainContext/typeProjectName"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DomainContext.ecore#//DomainContext/handlerProjectName"/>

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DomainContext.ecore#//DomainContext/IClientContextID"/>

       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference DomainContext.ecore#//DomainContext/metamodel"/>

       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference DomainContext.ecore#//DomainContext/specializationOf"/>

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DomainContext.ecore#//DomainContext/elementTypeIDPrefix"/>

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DomainContext.ecore#//DomainContext/elementTypeNamePrefix"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DomainContext.ecore#//DomainContext/matcherPatch"/>

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference DomainContext.ecore#//DomainContext/elementTypes"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DomainContext.ecore#//DomainContext/defaultHelperPath"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference DomainContext.ecore#//DomainContext/advices"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference DomainContext.ecore#//DomainContext/bindings"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference DomainContext.ecore#//DomainContext/genHandlers"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DomainContext.ecore#//DomainContext/generatedSourceFolder"/>

+    </genClasses>

+    <genClasses ecoreClass="DomainContext.ecore#//ElementTypes">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference DomainContext.ecore#//ElementTypes/types"/>

+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference DomainContext.ecore#//ElementTypes/domain"/>

     </genClasses>

     <genClasses ecoreClass="DomainContext.ecore#//ElementType">

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference DomainContext.ecore#//ElementType/eclass"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DomainContext.ecore#//ElementType/specificName"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DomainContext.ecore#//ElementType/edithelper_EditHelperAdvicePath"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DomainContext.ecore#//ElementType/kind"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference DomainContext.ecore#//ElementType/specializationof"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DomainContext.ecore#//ElementType/name"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DomainContext.ecore#//ElementType/helper"/>

+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference DomainContext.ecore#//ElementType/owner"/>

+    </genClasses>

+    <genClasses ecoreClass="DomainContext.ecore#//MetaClassType">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference DomainContext.ecore#//MetaClassType/metaClass"/>

+    </genClasses>

+    <genClasses ecoreClass="DomainContext.ecore#//SpecializationType">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference DomainContext.ecore#//SpecializationType/ref"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DomainContext.ecore#//SpecializationType/matcher"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference DomainContext.ecore#//SpecializationType/genMatcher"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference DomainContext.ecore#//SpecializationType/genHelper"/>

+    </genClasses>

+    <genClasses ecoreClass="DomainContext.ecore#//Advice">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DomainContext.ecore#//Advice/adviceID"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference DomainContext.ecore#//Advice/ref"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DomainContext.ecore#//Advice/advicePath"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DomainContext.ecore#//Advice/inheritance"/>

+    </genClasses>

+    <genClasses ecoreClass="DomainContext.ecore#//ElementTypeBindings">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DomainContext.ecore#//ElementTypeBindings/clientContextID"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference DomainContext.ecore#//ElementTypeBindings/bindings"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="DomainContext.ecore#//Binding">

+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference DomainContext.ecore#//Binding/owner"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DomainContext.ecore#//Binding/pattern"/>

+    </genClasses>

+    <genClasses ecoreClass="DomainContext.ecore#//ElementTypeBinding">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference DomainContext.ecore#//ElementTypeBinding/ref"/>

+    </genClasses>

+    <genClasses ecoreClass="DomainContext.ecore#//AdviceBinding">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference DomainContext.ecore#//AdviceBinding/ref"/>

+    </genClasses>

+    <genClasses ecoreClass="DomainContext.ecore#//GenHandlers">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DomainContext.ecore#//GenHandlers/handlerPackage"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DomainContext.ecore#//GenHandlers/superClass"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DomainContext.ecore#//GenHandlers/superClassPackage"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DomainContext.ecore#//GenHandlers/elementTypeEnumerator"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DomainContext.ecore#//GenHandlers/elementTypeEnumeratorPackage"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference DomainContext.ecore#//GenHandlers/visibleCreateChildHandlers"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference DomainContext.ecore#//GenHandlers/parentDomainCreateChild"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="DomainContext.ecore#//GenMatcher">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DomainContext.ecore#//GenMatcher/name"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="DomainContext.ecore#//GenHelper">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DomainContext.ecore#//GenHelper/name"/>

+    </genClasses>

+    <genClasses ecoreClass="DomainContext.ecore#//StereotypedElementMatcher">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DomainContext.ecore#//StereotypedElementMatcher/stereotypeName"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DomainContext.ecore#//StereotypedElementMatcher/stereotypePackage"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DomainContext.ecore#//StereotypedElementMatcher/baseElementName"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DomainContext.ecore#//StereotypedElementMatcher/baseElementPackage"/>

+    </genClasses>

+    <genClasses ecoreClass="DomainContext.ecore#//StereotypedElementHelper">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DomainContext.ecore#//StereotypedElementHelper/stereotypeName"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DomainContext.ecore#//StereotypedElementHelper/stereotypePackage"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DomainContext.ecore#//StereotypedElementHelper/baseElementName"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DomainContext.ecore#//StereotypedElementHelper/baseElementPackage"/>

     </genClasses>

   </genPackages>

 </genmodel:GenModel>

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/Advice.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/Advice.java
new file mode 100644
index 00000000000..0618599ee1c
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/Advice.java
@@ -0,0 +1,147 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.domaincontextcodegen;

+

+import org.eclipse.emf.ecore.EObject;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Advice</b></em>'.

+ * <!-- end-user-doc -->

+ * 

+ * <p>

+ * The following features are supported:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.Advice#getAdviceID <em>Advice ID</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.Advice#getRef <em>Ref</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.Advice#getAdvicePath <em>Advice Path</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.Advice#getInheritance <em>Inheritance</em>}</li>

+ * </ul>

+ * </p>

+ * 

+ * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getAdvice()

+ * @model

+ * @generated

+ */

+public interface Advice extends EObject {

+

+	/**

+	 * Returns the value of the '<em><b>Advice ID</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Advice ID</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the value of the '<em>Advice ID</em>' attribute.

+	 * @see #setAdviceID(String)

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getAdvice_AdviceID()

+	 * @model

+	 * @generated

+	 */

+	String getAdviceID();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.Advice#getAdviceID <em>Advice ID</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Advice ID</em>' attribute.

+	 * @see #getAdviceID()

+	 * @generated

+	 */

+	void setAdviceID(String value);

+

+	/**

+	 * Returns the value of the '<em><b>Ref</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Ref</em>' reference isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the value of the '<em>Ref</em>' reference.

+	 * @see #setRef(ElementType)

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getAdvice_Ref()

+	 * @model

+	 * @generated

+	 */

+	ElementType getRef();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.Advice#getRef <em>Ref</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Ref</em>' reference.

+	 * @see #getRef()

+	 * @generated

+	 */

+	void setRef(ElementType value);

+

+	/**

+	 * Returns the value of the '<em><b>Advice Path</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Advice Path</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the value of the '<em>Advice Path</em>' attribute.

+	 * @see #setAdvicePath(String)

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getAdvice_AdvicePath()

+	 * @model

+	 * @generated

+	 */

+	String getAdvicePath();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.Advice#getAdvicePath <em>Advice Path</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Advice Path</em>' attribute.

+	 * @see #getAdvicePath()

+	 * @generated

+	 */

+	void setAdvicePath(String value);

+

+	/**

+	 * Returns the value of the '<em><b>Inheritance</b></em>' attribute.

+	 * The literals are from the enumeration {@link org.eclipse.papyrus.domaincontextcodegen.InheritanceKind}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Inheritance</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the value of the '<em>Inheritance</em>' attribute.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.InheritanceKind

+	 * @see #setInheritance(InheritanceKind)

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getAdvice_Inheritance()

+	 * @model

+	 * @generated

+	 */

+	InheritanceKind getInheritance();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.Advice#getInheritance <em>Inheritance</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Inheritance</em>' attribute.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.InheritanceKind

+	 * @see #getInheritance()

+	 * @generated

+	 */

+	void setInheritance(InheritanceKind value);

+

+} // Advice

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/AdviceBinding.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/AdviceBinding.java
index ffc522648a9..40b4054eb0f 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/AdviceBinding.java
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/AdviceBinding.java
@@ -6,8 +6,6 @@
  */

 package org.eclipse.papyrus.domaincontextcodegen;

 

-import org.eclipse.emf.ecore.EObject;

-

 /**

  * <!-- begin-user-doc -->

  * A representation of the model object '<em><b>Advice Binding</b></em>'.

@@ -16,11 +14,7 @@ import org.eclipse.emf.ecore.EObject;
  * <p>

  * The following features are supported:

  * <ul>

- * <li>{@link org.eclipse.papyrus.domaincontextcodegen.AdviceBinding#getAdvicePath <em>Advice Path</em>}</li>

- * <li>{@link org.eclipse.papyrus.domaincontextcodegen.AdviceBinding#getAdviceID <em>Advice ID</em>}</li>

- * <li>{@link org.eclipse.papyrus.domaincontextcodegen.AdviceBinding#getInheritance <em>Inheritance</em>}</li>

- * <li>{@link org.eclipse.papyrus.domaincontextcodegen.AdviceBinding#getElementTypeRef <em>Element Type Ref</em>}</li>

- * <li>{@link org.eclipse.papyrus.domaincontextcodegen.AdviceBinding#getElementTypeIDref <em>Element Type IDref</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.AdviceBinding#getRef <em>Ref</em>}</li>

  * </ul>

  * </p>

  * 

@@ -28,150 +22,34 @@ import org.eclipse.emf.ecore.EObject;
  * @model

  * @generated

  */

-public interface AdviceBinding extends EObject {

-

-	/**

-	 * Returns the value of the '<em><b>Advice Path</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Advice Path</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the value of the '<em>Advice Path</em>' attribute.

-	 * @see #setAdvicePath(String)

-	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getAdviceBinding_AdvicePath()

-	 * @model

-	 * @generated

-	 */

-	String getAdvicePath();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.AdviceBinding#getAdvicePath <em>Advice Path</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @param value

-	 *        the new value of the '<em>Advice Path</em>' attribute.

-	 * @see #getAdvicePath()

-	 * @generated

-	 */

-	void setAdvicePath(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Advice ID</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Advice ID</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the value of the '<em>Advice ID</em>' attribute.

-	 * @see #setAdviceID(String)

-	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getAdviceBinding_AdviceID()

-	 * @model

-	 * @generated

-	 */

-	String getAdviceID();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.AdviceBinding#getAdviceID <em>Advice ID</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @param value

-	 *        the new value of the '<em>Advice ID</em>' attribute.

-	 * @see #getAdviceID()

-	 * @generated

-	 */

-	void setAdviceID(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Inheritance</b></em>' attribute.

-	 * The literals are from the enumeration {@link org.eclipse.papyrus.domaincontextcodegen.InheritanceKind}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Inheritance</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the value of the '<em>Inheritance</em>' attribute.

-	 * @see org.eclipse.papyrus.domaincontextcodegen.InheritanceKind

-	 * @see #setInheritance(InheritanceKind)

-	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getAdviceBinding_Inheritance()

-	 * @model

-	 * @generated

-	 */

-	InheritanceKind getInheritance();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.AdviceBinding#getInheritance <em>Inheritance</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @param value

-	 *        the new value of the '<em>Inheritance</em>' attribute.

-	 * @see org.eclipse.papyrus.domaincontextcodegen.InheritanceKind

-	 * @see #getInheritance()

-	 * @generated

-	 */

-	void setInheritance(InheritanceKind value);

-

-	/**

-	 * Returns the value of the '<em><b>Element Type Ref</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Element Type Ref</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 Ref</em>' reference.

-	 * @see #setElementTypeRef(ElementType)

-	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getAdviceBinding_ElementTypeRef()

-	 * @model

-	 * @generated

-	 */

-	ElementType getElementTypeRef();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.AdviceBinding#getElementTypeRef <em>Element Type Ref</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @param value

-	 *        the new value of the '<em>Element Type Ref</em>' reference.

-	 * @see #getElementTypeRef()

-	 * @generated

-	 */

-	void setElementTypeRef(ElementType value);

+public interface AdviceBinding extends Binding {

 

 	/**

-	 * Returns the value of the '<em><b>Element Type IDref</b></em>' attribute.

+	 * Returns the value of the '<em><b>Ref</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Element Type IDref</em>' attribute isn't clear, there really should be more of a description here...

+	 * If the meaning of the '<em>Ref</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 IDref</em>' attribute.

-	 * @see #setElementTypeIDref(String)

-	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getAdviceBinding_ElementTypeIDref()

+	 * @return the value of the '<em>Ref</em>' reference.

+	 * @see #setRef(Advice)

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getAdviceBinding_Ref()

 	 * @model

 	 * @generated

 	 */

-	String getElementTypeIDref();

+	Advice getRef();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.AdviceBinding#getElementTypeIDref <em>Element Type IDref</em>}'

-	 * attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.AdviceBinding#getRef <em>Ref</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @param value

-	 *        the new value of the '<em>Element Type IDref</em>' attribute.

-	 * @see #getElementTypeIDref()

+	 *        the new value of the '<em>Ref</em>' reference.

+	 * @see #getRef()

 	 * @generated

 	 */

-	void setElementTypeIDref(String value);

+	void setRef(Advice value);

 

 } // AdviceBinding

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/Binding.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/Binding.java
index 3ca8762a7b9..30bc2bab622 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/Binding.java
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/Binding.java
@@ -16,100 +16,73 @@ import org.eclipse.emf.ecore.EObject;
  * <p>

  * The following features are supported:

  * <ul>

- * <li>{@link org.eclipse.papyrus.domaincontextcodegen.Binding#getAdvice <em>Advice</em>}</li>

- * <li>{@link org.eclipse.papyrus.domaincontextcodegen.Binding#getElementTypePattern <em>Element Type Pattern</em>}</li>

- * <li>{@link org.eclipse.papyrus.domaincontextcodegen.Binding#getAdviceID <em>Advice ID</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.Binding#getOwner <em>Owner</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.Binding#getPattern <em>Pattern</em>}</li>

  * </ul>

  * </p>

  * 

  * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getBinding()

- * @model

+ * @model abstract="true"

  * @generated

  */

 public interface Binding extends EObject {

 

 	/**

-	 * Returns the value of the '<em><b>Advice</b></em>' reference.

+	 * Returns the value of the '<em><b>Owner</b></em>' container reference.

+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.domaincontextcodegen.ElementTypeBindings#getBindings <em>Bindings</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Advice</em>' reference isn't clear, there really should be more of a description here...

+	 * If the meaning of the '<em>Owner</em>' container reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

 	 * 

-	 * @return the value of the '<em>Advice</em>' reference.

-	 * @see #setAdvice(AdviceBinding)

-	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getBinding_Advice()

-	 * @model

-	 * @generated

-	 */

-	AdviceBinding getAdvice();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.Binding#getAdvice <em>Advice</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @param value

-	 *        the new value of the '<em>Advice</em>' reference.

-	 * @see #getAdvice()

-	 * @generated

-	 */

-	void setAdvice(AdviceBinding value);

-

-	/**

-	 * Returns the value of the '<em><b>Element Type Pattern</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Element Type Pattern</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the value of the '<em>Element Type Pattern</em>' attribute.

-	 * @see #setElementTypePattern(String)

-	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getBinding_ElementTypePattern()

-	 * @model

+	 * @return the value of the '<em>Owner</em>' container reference.

+	 * @see #setOwner(ElementTypeBindings)

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getBinding_Owner()

+	 * @see org.eclipse.papyrus.domaincontextcodegen.ElementTypeBindings#getBindings

+	 * @model opposite="bindings" required="true" transient="false"

 	 * @generated

 	 */

-	String getElementTypePattern();

+	ElementTypeBindings getOwner();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.Binding#getElementTypePattern <em>Element Type Pattern</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.Binding#getOwner <em>Owner</em>}' container reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @param value

-	 *        the new value of the '<em>Element Type Pattern</em>' attribute.

-	 * @see #getElementTypePattern()

+	 *        the new value of the '<em>Owner</em>' container reference.

+	 * @see #getOwner()

 	 * @generated

 	 */

-	void setElementTypePattern(String value);

+	void setOwner(ElementTypeBindings value);

 

 	/**

-	 * Returns the value of the '<em><b>Advice ID</b></em>' attribute.

+	 * Returns the value of the '<em><b>Pattern</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Advice ID</em>' attribute isn't clear, there really should be more of a description here...

+	 * If the meaning of the '<em>Pattern</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

 	 * 

-	 * @return the value of the '<em>Advice ID</em>' attribute.

-	 * @see #setAdviceID(String)

-	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getBinding_AdviceID()

+	 * @return the value of the '<em>Pattern</em>' attribute.

+	 * @see #setPattern(String)

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getBinding_Pattern()

 	 * @model

 	 * @generated

 	 */

-	String getAdviceID();

+	String getPattern();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.Binding#getAdviceID <em>Advice ID</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.Binding#getPattern <em>Pattern</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @param value

-	 *        the new value of the '<em>Advice ID</em>' attribute.

-	 * @see #getAdviceID()

+	 *        the new value of the '<em>Pattern</em>' attribute.

+	 * @see #getPattern()

 	 * @generated

 	 */

-	void setAdviceID(String value);

+	void setPattern(String value);

 

 } // Binding

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/Command.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/Command.java
new file mode 100644
index 00000000000..34d025f0cdb
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/Command.java
@@ -0,0 +1,86 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.domaincontextcodegen;

+

+import org.eclipse.emf.ecore.EObject;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Command</b></em>'.

+ * <!-- end-user-doc -->

+ * 

+ * <p>

+ * The following features are supported:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.Command#getElementType <em>Element Type</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.Command#getIcon <em>Icon</em>}</li>

+ * </ul>

+ * </p>

+ * 

+ * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getCommand()

+ * @model

+ * @generated

+ */

+public interface Command extends EObject {

+

+	/**

+	 * Returns the value of the '<em><b>Element Type</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * 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</em>' reference.

+	 * @see #setElementType(ElementType)

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getCommand_ElementType()

+	 * @model

+	 * @generated

+	 */

+	ElementType getElementType();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.Command#getElementType <em>Element Type</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Element Type</em>' reference.

+	 * @see #getElementType()

+	 * @generated

+	 */

+	void setElementType(ElementType value);

+

+	/**

+	 * 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...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the value of the '<em>Icon</em>' attribute.

+	 * @see #setIcon(String)

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getCommand_Icon()

+	 * @model

+	 * @generated

+	 */

+	String getIcon();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.Command#getIcon <em>Icon</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Icon</em>' attribute.

+	 * @see #getIcon()

+	 * @generated

+	 */

+	void setIcon(String value);

+

+} // Command

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/CommandDeclaration.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/CommandDeclaration.java
new file mode 100644
index 00000000000..53c334e7580
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/CommandDeclaration.java
@@ -0,0 +1,46 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.domaincontextcodegen;

+

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.emf.ecore.EObject;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Command Declaration</b></em>'.

+ * <!-- end-user-doc -->

+ * 

+ * <p>

+ * The following features are supported:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.CommandDeclaration#getCommands <em>Commands</em>}</li>

+ * </ul>

+ * </p>

+ * 

+ * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getCommandDeclaration()

+ * @model

+ * @generated

+ */

+public interface CommandDeclaration extends EObject {

+

+	/**

+	 * Returns the value of the '<em><b>Commands</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.domaincontextcodegen.Command}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Commands</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>Commands</em>' containment reference list.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getCommandDeclaration_Commands()

+	 * @model containment="true"

+	 * @generated

+	 */

+	EList<Command> getCommands();

+

+} // CommandDeclaration

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/DomainContext.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/DomainContext.java
index ab300922b03..6dc8f1de955 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/DomainContext.java
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/DomainContext.java
@@ -25,13 +25,14 @@ import org.eclipse.emf.ecore.EPackage;
  * <li>{@link org.eclipse.papyrus.domaincontextcodegen.DomainContext#getSpecializationOf <em>Specialization Of</em>}</li>

  * <li>{@link org.eclipse.papyrus.domaincontextcodegen.DomainContext#getElementTypeIDPrefix <em>Element Type ID Prefix</em>}</li>

  * <li>{@link org.eclipse.papyrus.domaincontextcodegen.DomainContext#getElementTypeNamePrefix <em>Element Type Name Prefix</em>}</li>

- * <li>{@link org.eclipse.papyrus.domaincontextcodegen.DomainContext#getMatcherPatch <em>Matcher Patch</em>}</li>

  * <li>{@link org.eclipse.papyrus.domaincontextcodegen.DomainContext#getElementTypes <em>Element Types</em>}</li>

  * <li>{@link org.eclipse.papyrus.domaincontextcodegen.DomainContext#getDefaultHelperPath <em>Default Helper Path</em>}</li>

- * <li>{@link org.eclipse.papyrus.domaincontextcodegen.DomainContext#getAdvicebindings <em>Advicebindings</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.DomainContext#getAdvices <em>Advices</em>}</li>

  * <li>{@link org.eclipse.papyrus.domaincontextcodegen.DomainContext#getBindings <em>Bindings</em>}</li>

  * <li>{@link org.eclipse.papyrus.domaincontextcodegen.DomainContext#getGenHandlers <em>Gen Handlers</em>}</li>

  * <li>{@link org.eclipse.papyrus.domaincontextcodegen.DomainContext#getGeneratedSourceFolder <em>Generated Source Folder</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.DomainContext#getMenu <em>Menu</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.DomainContext#getCommand <em>Command</em>}</li>

  * </ul>

  * </p>

  * 

@@ -243,35 +244,8 @@ public interface DomainContext extends EObject {
 	void setElementTypeNamePrefix(String value);

 

 	/**

-	 * Returns the value of the '<em><b>Matcher Patch</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Matcher Patch</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the value of the '<em>Matcher Patch</em>' attribute.

-	 * @see #setMatcherPatch(String)

-	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getDomainContext_MatcherPatch()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getMatcherPatch();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.DomainContext#getMatcherPatch <em>Matcher Patch</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @param value

-	 *        the new value of the '<em>Matcher Patch</em>' attribute.

-	 * @see #getMatcherPatch()

-	 * @generated

-	 */

-	void setMatcherPatch(String value);

-

-	/**

 	 * Returns the value of the '<em><b>Element Types</b></em>' containment reference.

+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.domaincontextcodegen.ElementTypes#getDomain <em>Domain</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <p>

 	 * If the meaning of the '<em>Element Types</em>' containment reference list isn't clear, there really should be more of a description here...

@@ -281,7 +255,8 @@ public interface DomainContext extends EObject {
 	 * @return the value of the '<em>Element Types</em>' containment reference.

 	 * @see #setElementTypes(ElementTypes)

 	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getDomainContext_ElementTypes()

-	 * @model containment="true"

+	 * @see org.eclipse.papyrus.domaincontextcodegen.ElementTypes#getDomain

+	 * @model opposite="domain" containment="true"

 	 * @generated

 	 */

 	ElementTypes getElementTypes();

@@ -329,24 +304,24 @@ public interface DomainContext extends EObject {
 	void setDefaultHelperPath(String value);

 

 	/**

-	 * Returns the value of the '<em><b>Advicebindings</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.domaincontextcodegen.AdviceBinding}.

+	 * Returns the value of the '<em><b>Advices</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.domaincontextcodegen.Advice}.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Advicebindings</em>' reference list isn't clear, there really should be more of a description here...

+	 * If the meaning of the '<em>Advices</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>Advicebindings</em>' containment reference list.

-	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getDomainContext_Advicebindings()

+	 * @return the value of the '<em>Advices</em>' containment reference list.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getDomainContext_Advices()

 	 * @model containment="true"

 	 * @generated

 	 */

-	EList<AdviceBinding> getAdvicebindings();

+	EList<Advice> getAdvices();

 

 	/**

 	 * Returns the value of the '<em><b>Bindings</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.domaincontextcodegen.Binding}.

+	 * The list contents are of type {@link org.eclipse.papyrus.domaincontextcodegen.ElementTypeBindings}.

 	 * <!-- begin-user-doc -->

 	 * <p>

 	 * If the meaning of the '<em>Bindings</em>' reference list isn't clear, there really should be more of a description here...

@@ -358,7 +333,7 @@ public interface DomainContext extends EObject {
 	 * @model containment="true"

 	 * @generated

 	 */

-	EList<Binding> getBindings();

+	EList<ElementTypeBindings> getBindings();

 

 	/**

 	 * Returns the value of the '<em><b>Gen Handlers</b></em>' containment reference.

@@ -418,4 +393,36 @@ public interface DomainContext extends EObject {
 	 */

 	void setGeneratedSourceFolder(String value);

 

+	/**

+	 * Returns the value of the '<em><b>Menu</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.domaincontextcodegen.MenuDeclaration}.

+	 * <!-- 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...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the value of the '<em>Menu</em>' containment reference list.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getDomainContext_Menu()

+	 * @model containment="true"

+	 * @generated

+	 */

+	EList<MenuDeclaration> getMenu();

+

+	/**

+	 * Returns the value of the '<em><b>Command</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.domaincontextcodegen.CommandDeclaration}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Command</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>Command</em>' containment reference list.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getDomainContext_Command()

+	 * @model containment="true"

+	 * @generated

+	 */

+	EList<CommandDeclaration> getCommand();

+

 } // DomainContext

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/DomaincontextcodegenFactory.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/DomaincontextcodegenFactory.java
index 9f40e077237..fb4c2f4ced8 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/DomaincontextcodegenFactory.java
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/DomaincontextcodegenFactory.java
@@ -49,34 +49,64 @@ public interface DomaincontextcodegenFactory extends EFactory {
 	ElementTypes createElementTypes();

 

 	/**

-	 * Returns a new object of class '<em>Element Type</em>'.

+	 * Returns a new object of class '<em>Meta Class Type</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

-	 * @return a new object of class '<em>Element Type</em>'.

+	 * @return a new object of class '<em>Meta Class Type</em>'.

 	 * @generated

 	 */

-	ElementType createElementType();

+	MetaClassType createMetaClassType();

 

 	/**

-	 * Returns a new object of class '<em>Advice Binding</em>'.

+	 * Returns a new object of class '<em>Specialization Type</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

-	 * @return a new object of class '<em>Advice Binding</em>'.

+	 * @return a new object of class '<em>Specialization Type</em>'.

 	 * @generated

 	 */

-	AdviceBinding createAdviceBinding();

+	SpecializationType createSpecializationType();

+

+	/**

+	 * Returns a new object of class '<em>Advice</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return a new object of class '<em>Advice</em>'.

+	 * @generated

+	 */

+	Advice createAdvice();

 

 	/**

-	 * Returns a new object of class '<em>Binding</em>'.

+	 * Returns a new object of class '<em>Element Type Bindings</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

-	 * @return a new object of class '<em>Binding</em>'.

+	 * @return a new object of class '<em>Element Type Bindings</em>'.

 	 * @generated

 	 */

-	Binding createBinding();

+	ElementTypeBindings createElementTypeBindings();

+

+	/**

+	 * Returns a new object of class '<em>Element Type Binding</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return a new object of class '<em>Element Type Binding</em>'.

+	 * @generated

+	 */

+	ElementTypeBinding createElementTypeBinding();

+

+	/**

+	 * Returns a new object of class '<em>Advice Binding</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return a new object of class '<em>Advice Binding</em>'.

+	 * @generated

+	 */

+	AdviceBinding createAdviceBinding();

 

 	/**

 	 * Returns a new object of class '<em>Gen Handlers</em>'.

@@ -89,6 +119,56 @@ public interface DomaincontextcodegenFactory extends EFactory {
 	GenHandlers createGenHandlers();

 

 	/**

+	 * Returns a new object of class '<em>Stereotyped Element Matcher</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return a new object of class '<em>Stereotyped Element Matcher</em>'.

+	 * @generated

+	 */

+	StereotypedElementMatcher createStereotypedElementMatcher();

+

+	/**

+	 * Returns a new object of class '<em>Stereotyped Element Helper</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return a new object of class '<em>Stereotyped Element Helper</em>'.

+	 * @generated

+	 */

+	StereotypedElementHelper createStereotypedElementHelper();

+

+	/**

+	 * Returns a new object of class '<em>Menu Declaration</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return a new object of class '<em>Menu Declaration</em>'.

+	 * @generated

+	 */

+	MenuDeclaration createMenuDeclaration();

+

+	/**

+	 * Returns a new object of class '<em>Command Declaration</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return a new object of class '<em>Command Declaration</em>'.

+	 * @generated

+	 */

+	CommandDeclaration createCommandDeclaration();

+

+	/**

+	 * Returns a new object of class '<em>Command</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return a new object of class '<em>Command</em>'.

+	 * @generated

+	 */

+	Command createCommand();

+

+	/**

 	 * Returns the package supported by this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/DomaincontextcodegenPackage.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/DomaincontextcodegenPackage.java
index a31a0c43f46..937b11a9770 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/DomaincontextcodegenPackage.java
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/DomaincontextcodegenPackage.java
@@ -148,74 +148,84 @@ public interface DomaincontextcodegenPackage extends EPackage {
 	int DOMAIN_CONTEXT__ELEMENT_TYPE_NAME_PREFIX = 6;

 

 	/**

-	 * The feature id for the '<em><b>Matcher Patch</b></em>' attribute.

+	 * The feature id for the '<em><b>Element Types</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @generated

 	 * @ordered

 	 */

-	int DOMAIN_CONTEXT__MATCHER_PATCH = 7;

+	int DOMAIN_CONTEXT__ELEMENT_TYPES = 7;

 

 	/**

-	 * The feature id for the '<em><b>Element Types</b></em>' containment reference.

+	 * The feature id for the '<em><b>Default Helper Path</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @generated

 	 * @ordered

 	 */

-	int DOMAIN_CONTEXT__ELEMENT_TYPES = 8;

+	int DOMAIN_CONTEXT__DEFAULT_HELPER_PATH = 8;

 

 	/**

-	 * The feature id for the '<em><b>Default Helper Path</b></em>' attribute.

+	 * The feature id for the '<em><b>Advices</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @generated

 	 * @ordered

 	 */

-	int DOMAIN_CONTEXT__DEFAULT_HELPER_PATH = 9;

+	int DOMAIN_CONTEXT__ADVICES = 9;

 

 	/**

-	 * The feature id for the '<em><b>Advicebindings</b></em>' containment reference list.

+	 * The feature id for the '<em><b>Bindings</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @generated

 	 * @ordered

 	 */

-	int DOMAIN_CONTEXT__ADVICEBINDINGS = 10;

+	int DOMAIN_CONTEXT__BINDINGS = 10;

 

 	/**

-	 * The feature id for the '<em><b>Bindings</b></em>' containment reference list.

+	 * The feature id for the '<em><b>Gen Handlers</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @generated

 	 * @ordered

 	 */

-	int DOMAIN_CONTEXT__BINDINGS = 11;

+	int DOMAIN_CONTEXT__GEN_HANDLERS = 11;

 

 	/**

-	 * The feature id for the '<em><b>Gen Handlers</b></em>' containment reference.

+	 * The feature id for the '<em><b>Generated Source Folder</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @generated

 	 * @ordered

 	 */

-	int DOMAIN_CONTEXT__GEN_HANDLERS = 12;

+	int DOMAIN_CONTEXT__GENERATED_SOURCE_FOLDER = 12;

 

 	/**

-	 * The feature id for the '<em><b>Generated Source Folder</b></em>' attribute.

+	 * The feature id for the '<em><b>Menu</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int DOMAIN_CONTEXT__MENU = 13;

+

+	/**

+	 * The feature id for the '<em><b>Command</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @generated

 	 * @ordered

 	 */

-	int DOMAIN_CONTEXT__GENERATED_SOURCE_FOLDER = 13;

+	int DOMAIN_CONTEXT__COMMAND = 14;

 

 	/**

 	 * The number of structural features of the '<em>Domain Context</em>' class.

@@ -225,7 +235,7 @@ public interface DomaincontextcodegenPackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int DOMAIN_CONTEXT_FEATURE_COUNT = 14;

+	int DOMAIN_CONTEXT_FEATURE_COUNT = 15;

 

 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.domaincontextcodegen.impl.ElementTypesImpl <em>Element Types</em>}' class.

@@ -249,6 +259,16 @@ public interface DomaincontextcodegenPackage extends EPackage {
 	int ELEMENT_TYPES__TYPES = 0;

 

 	/**

+	 * The feature id for the '<em><b>Domain</b></em>' container reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int ELEMENT_TYPES__DOMAIN = 1;

+

+	/**

 	 * The number of structural features of the '<em>Element Types</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

@@ -256,7 +276,7 @@ public interface DomaincontextcodegenPackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int ELEMENT_TYPES_FEATURE_COUNT = 1;

+	int ELEMENT_TYPES_FEATURE_COUNT = 2;

 

 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.domaincontextcodegen.impl.ElementTypeImpl <em>Element Type</em>}' class.

@@ -270,6 +290,107 @@ public interface DomaincontextcodegenPackage extends EPackage {
 	int ELEMENT_TYPE = 2;

 

 	/**

+	 * The feature id for the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int ELEMENT_TYPE__NAME = 0;

+

+	/**

+	 * The feature id for the '<em><b>Helper</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int ELEMENT_TYPE__HELPER = 1;

+

+	/**

+	 * The feature id for the '<em><b>Owner</b></em>' container reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int ELEMENT_TYPE__OWNER = 2;

+

+	/**

+	 * The feature id for the '<em><b>Icon</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int ELEMENT_TYPE__ICON = 3;

+

+	/**

+	 * The number of structural features of the '<em>Element Type</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int ELEMENT_TYPE_FEATURE_COUNT = 4;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.domaincontextcodegen.impl.MetaClassTypeImpl <em>Meta Class Type</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see org.eclipse.papyrus.domaincontextcodegen.impl.MetaClassTypeImpl

+	 * @see org.eclipse.papyrus.domaincontextcodegen.impl.DomaincontextcodegenPackageImpl#getMetaClassType()

+	 * @generated

+	 */

+	int META_CLASS_TYPE = 3;

+

+	/**

+	 * The feature id for the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int META_CLASS_TYPE__NAME = ELEMENT_TYPE__NAME;

+

+	/**

+	 * The feature id for the '<em><b>Helper</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int META_CLASS_TYPE__HELPER = ELEMENT_TYPE__HELPER;

+

+	/**

+	 * The feature id for the '<em><b>Owner</b></em>' container reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int META_CLASS_TYPE__OWNER = ELEMENT_TYPE__OWNER;

+

+	/**

+	 * The feature id for the '<em><b>Icon</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int META_CLASS_TYPE__ICON = ELEMENT_TYPE__ICON;

+

+	/**

 	 * The feature id for the '<em><b>Meta Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

@@ -277,89 +398,129 @@ public interface DomaincontextcodegenPackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int ELEMENT_TYPE__META_CLASS = 0;

+	int META_CLASS_TYPE__META_CLASS = ELEMENT_TYPE_FEATURE_COUNT + 0;

 

 	/**

-	 * The feature id for the '<em><b>Specific Name</b></em>' attribute.

+	 * The number of structural features of the '<em>Meta Class Type</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @generated

 	 * @ordered

 	 */

-	int ELEMENT_TYPE__SPECIFIC_NAME = 1;

+	int META_CLASS_TYPE_FEATURE_COUNT = ELEMENT_TYPE_FEATURE_COUNT + 1;

 

 	/**

-	 * The feature id for the '<em><b>Edithelper Edit Helper Advice Path</b></em>' attribute.

+	 * The meta object id for the '{@link org.eclipse.papyrus.domaincontextcodegen.impl.SpecializationTypeImpl <em>Specialization Type</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see org.eclipse.papyrus.domaincontextcodegen.impl.SpecializationTypeImpl

+	 * @see org.eclipse.papyrus.domaincontextcodegen.impl.DomaincontextcodegenPackageImpl#getSpecializationType()

+	 * @generated

+	 */

+	int SPECIALIZATION_TYPE = 4;

+

+	/**

+	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @generated

 	 * @ordered

 	 */

-	int ELEMENT_TYPE__EDITHELPER_EDIT_HELPER_ADVICE_PATH = 2;

+	int SPECIALIZATION_TYPE__NAME = ELEMENT_TYPE__NAME;

 

 	/**

-	 * The feature id for the '<em><b>Kind</b></em>' attribute.

+	 * The feature id for the '<em><b>Helper</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @generated

 	 * @ordered

 	 */

-	int ELEMENT_TYPE__KIND = 3;

+	int SPECIALIZATION_TYPE__HELPER = ELEMENT_TYPE__HELPER;

 

 	/**

-	 * The feature id for the '<em><b>Specializationof</b></em>' reference.

+	 * The feature id for the '<em><b>Owner</b></em>' container reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @generated

 	 * @ordered

 	 */

-	int ELEMENT_TYPE__SPECIALIZATIONOF = 4;

+	int SPECIALIZATION_TYPE__OWNER = ELEMENT_TYPE__OWNER;

 

 	/**

-	 * The feature id for the '<em><b>Specialization IDof</b></em>' attribute.

+	 * The feature id for the '<em><b>Icon</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @generated

 	 * @ordered

 	 */

-	int ELEMENT_TYPE__SPECIALIZATION_IDOF = 5;

+	int SPECIALIZATION_TYPE__ICON = ELEMENT_TYPE__ICON;

 

 	/**

-	 * The number of structural features of the '<em>Element Type</em>' class.

+	 * The feature id for the '<em><b>Ref</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @generated

 	 * @ordered

 	 */

-	int ELEMENT_TYPE_FEATURE_COUNT = 6;

+	int SPECIALIZATION_TYPE__REF = ELEMENT_TYPE_FEATURE_COUNT + 0;

 

+	/**

+	 * The feature id for the '<em><b>Matcher</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int SPECIALIZATION_TYPE__MATCHER = ELEMENT_TYPE_FEATURE_COUNT + 1;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.domaincontextcodegen.impl.AdviceBindingImpl <em>Advice Binding</em>}' class.

+	 * The feature id for the '<em><b>Gen Matcher</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

-	 * @see org.eclipse.papyrus.domaincontextcodegen.impl.AdviceBindingImpl

-	 * @see org.eclipse.papyrus.domaincontextcodegen.impl.DomaincontextcodegenPackageImpl#getAdviceBinding()

 	 * @generated

+	 * @ordered

 	 */

-	int ADVICE_BINDING = 3;

+	int SPECIALIZATION_TYPE__GEN_MATCHER = ELEMENT_TYPE_FEATURE_COUNT + 2;

 

 	/**

-	 * The feature id for the '<em><b>Advice Path</b></em>' attribute.

+	 * The feature id for the '<em><b>Gen Helper</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @generated

 	 * @ordered

 	 */

-	int ADVICE_BINDING__ADVICE_PATH = 0;

+	int SPECIALIZATION_TYPE__GEN_HELPER = ELEMENT_TYPE_FEATURE_COUNT + 3;

+

+	/**

+	 * The number of structural features of the '<em>Specialization Type</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int SPECIALIZATION_TYPE_FEATURE_COUNT = ELEMENT_TYPE_FEATURE_COUNT + 4;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.domaincontextcodegen.impl.AdviceImpl <em>Advice</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see org.eclipse.papyrus.domaincontextcodegen.impl.AdviceImpl

+	 * @see org.eclipse.papyrus.domaincontextcodegen.impl.DomaincontextcodegenPackageImpl#getAdvice()

+	 * @generated

+	 */

+	int ADVICE = 5;

 

 	/**

 	 * The feature id for the '<em><b>Advice ID</b></em>' attribute.

@@ -369,7 +530,27 @@ public interface DomaincontextcodegenPackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int ADVICE_BINDING__ADVICE_ID = 1;

+	int ADVICE__ADVICE_ID = 0;

+

+	/**

+	 * The feature id for the '<em><b>Ref</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int ADVICE__REF = 1;

+

+	/**

+	 * The feature id for the '<em><b>Advice Path</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int ADVICE__ADVICE_PATH = 2;

 

 	/**

 	 * The feature id for the '<em><b>Inheritance</b></em>' attribute.

@@ -379,37 +560,70 @@ public interface DomaincontextcodegenPackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int ADVICE_BINDING__INHERITANCE = 2;

+	int ADVICE__INHERITANCE = 3;

 

 	/**

-	 * The feature id for the '<em><b>Element Type Ref</b></em>' reference.

+	 * The number of structural features of the '<em>Advice</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @generated

 	 * @ordered

 	 */

-	int ADVICE_BINDING__ELEMENT_TYPE_REF = 3;

+	int ADVICE_FEATURE_COUNT = 4;

 

 	/**

-	 * The feature id for the '<em><b>Element Type IDref</b></em>' attribute.

+	 * The meta object id for the '{@link org.eclipse.papyrus.domaincontextcodegen.impl.ElementTypeBindingsImpl <em>Element Type Bindings</em>}'

+	 * class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see org.eclipse.papyrus.domaincontextcodegen.impl.ElementTypeBindingsImpl

+	 * @see org.eclipse.papyrus.domaincontextcodegen.impl.DomaincontextcodegenPackageImpl#getElementTypeBindings()

+	 * @generated

+	 */

+	int ELEMENT_TYPE_BINDINGS = 6;

+

+	/**

+	 * The feature id for the '<em><b>Client Context ID</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @generated

 	 * @ordered

 	 */

-	int ADVICE_BINDING__ELEMENT_TYPE_IDREF = 4;

+	int ELEMENT_TYPE_BINDINGS__CLIENT_CONTEXT_ID = 0;

 

 	/**

-	 * The number of structural features of the '<em>Advice Binding</em>' class.

+	 * The feature id for the '<em><b>Bindings</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int ELEMENT_TYPE_BINDINGS__BINDINGS = 1;

+

+	/**

+	 * The number of structural features of the '<em>Element Type Bindings</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @generated

 	 * @ordered

 	 */

-	int ADVICE_BINDING_FEATURE_COUNT = 5;

+	int ELEMENT_TYPE_BINDINGS_FEATURE_COUNT = 2;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.domaincontextcodegen.impl.AdviceBindingImpl <em>Advice Binding</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see org.eclipse.papyrus.domaincontextcodegen.impl.AdviceBindingImpl

+	 * @see org.eclipse.papyrus.domaincontextcodegen.impl.DomaincontextcodegenPackageImpl#getAdviceBinding()

+	 * @generated

+	 */

+	int ADVICE_BINDING = 9;

 

 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.domaincontextcodegen.impl.BindingImpl <em>Binding</em>}' class.

@@ -420,47 +634,128 @@ public interface DomaincontextcodegenPackage extends EPackage {
 	 * @see org.eclipse.papyrus.domaincontextcodegen.impl.DomaincontextcodegenPackageImpl#getBinding()

 	 * @generated

 	 */

-	int BINDING = 4;

+	int BINDING = 7;

 

 	/**

-	 * The feature id for the '<em><b>Advice</b></em>' reference.

+	 * The feature id for the '<em><b>Owner</b></em>' container reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @generated

 	 * @ordered

 	 */

-	int BINDING__ADVICE = 0;

+	int BINDING__OWNER = 0;

 

 	/**

-	 * The feature id for the '<em><b>Element Type Pattern</b></em>' attribute.

+	 * The feature id for the '<em><b>Pattern</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @generated

 	 * @ordered

 	 */

-	int BINDING__ELEMENT_TYPE_PATTERN = 1;

+	int BINDING__PATTERN = 1;

 

 	/**

-	 * The feature id for the '<em><b>Advice ID</b></em>' attribute.

+	 * The number of structural features of the '<em>Binding</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @generated

 	 * @ordered

 	 */

-	int BINDING__ADVICE_ID = 2;

+	int BINDING_FEATURE_COUNT = 2;

 

 	/**

-	 * The number of structural features of the '<em>Binding</em>' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.domaincontextcodegen.impl.ElementTypeBindingImpl <em>Element Type Binding</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see org.eclipse.papyrus.domaincontextcodegen.impl.ElementTypeBindingImpl

+	 * @see org.eclipse.papyrus.domaincontextcodegen.impl.DomaincontextcodegenPackageImpl#getElementTypeBinding()

+	 * @generated

+	 */

+	int ELEMENT_TYPE_BINDING = 8;

+

+	/**

+	 * The feature id for the '<em><b>Owner</b></em>' container reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @generated

 	 * @ordered

 	 */

-	int BINDING_FEATURE_COUNT = 3;

+	int ELEMENT_TYPE_BINDING__OWNER = BINDING__OWNER;

+

+	/**

+	 * The feature id for the '<em><b>Pattern</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int ELEMENT_TYPE_BINDING__PATTERN = BINDING__PATTERN;

+

+	/**

+	 * The feature id for the '<em><b>Ref</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int ELEMENT_TYPE_BINDING__REF = BINDING_FEATURE_COUNT + 0;

+

+	/**

+	 * The number of structural features of the '<em>Element Type Binding</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int ELEMENT_TYPE_BINDING_FEATURE_COUNT = BINDING_FEATURE_COUNT + 1;

+

+	/**

+	 * The feature id for the '<em><b>Owner</b></em>' container reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int ADVICE_BINDING__OWNER = BINDING__OWNER;

+

+	/**

+	 * The feature id for the '<em><b>Pattern</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int ADVICE_BINDING__PATTERN = BINDING__PATTERN;

+

+	/**

+	 * The feature id for the '<em><b>Ref</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int ADVICE_BINDING__REF = BINDING_FEATURE_COUNT + 0;

+

+	/**

+	 * The number of structural features of the '<em>Advice Binding</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int ADVICE_BINDING_FEATURE_COUNT = BINDING_FEATURE_COUNT + 1;

 

 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.domaincontextcodegen.impl.GenHandlersImpl <em>Gen Handlers</em>}' class.

@@ -471,7 +766,7 @@ public interface DomaincontextcodegenPackage extends EPackage {
 	 * @see org.eclipse.papyrus.domaincontextcodegen.impl.DomaincontextcodegenPackageImpl#getGenHandlers()

 	 * @generated

 	 */

-	int GEN_HANDLERS = 5;

+	int GEN_HANDLERS = 10;

 

 	/**

 	 * The feature id for the '<em><b>Handler Package</b></em>' attribute.

@@ -524,6 +819,36 @@ public interface DomaincontextcodegenPackage extends EPackage {
 	int GEN_HANDLERS__ELEMENT_TYPE_ENUMERATOR_PACKAGE = 4;

 

 	/**

+	 * The feature id for the '<em><b>Visible Create Child Handlers</b></em>' reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int GEN_HANDLERS__VISIBLE_CREATE_CHILD_HANDLERS = 5;

+

+	/**

+	 * The feature id for the '<em><b>Parent Domain Create Child</b></em>' reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int GEN_HANDLERS__PARENT_DOMAIN_CREATE_CHILD = 6;

+

+	/**

+	 * The feature id for the '<em><b>Create Child Menu Location URI</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int GEN_HANDLERS__CREATE_CHILD_MENU_LOCATION_URI = 7;

+

+	/**

 	 * The number of structural features of the '<em>Gen Handlers</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

@@ -531,7 +856,326 @@ public interface DomaincontextcodegenPackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int GEN_HANDLERS_FEATURE_COUNT = 5;

+	int GEN_HANDLERS_FEATURE_COUNT = 8;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.domaincontextcodegen.impl.GenMatcherImpl <em>Gen Matcher</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see org.eclipse.papyrus.domaincontextcodegen.impl.GenMatcherImpl

+	 * @see org.eclipse.papyrus.domaincontextcodegen.impl.DomaincontextcodegenPackageImpl#getGenMatcher()

+	 * @generated

+	 */

+	int GEN_MATCHER = 11;

+

+	/**

+	 * The feature id for the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int GEN_MATCHER__NAME = 0;

+

+	/**

+	 * The number of structural features of the '<em>Gen Matcher</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int GEN_MATCHER_FEATURE_COUNT = 1;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.domaincontextcodegen.impl.GenHelperImpl <em>Gen Helper</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see org.eclipse.papyrus.domaincontextcodegen.impl.GenHelperImpl

+	 * @see org.eclipse.papyrus.domaincontextcodegen.impl.DomaincontextcodegenPackageImpl#getGenHelper()

+	 * @generated

+	 */

+	int GEN_HELPER = 12;

+

+	/**

+	 * The feature id for the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int GEN_HELPER__NAME = 0;

+

+	/**

+	 * The number of structural features of the '<em>Gen Helper</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int GEN_HELPER_FEATURE_COUNT = 1;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.domaincontextcodegen.impl.StereotypedElementMatcherImpl

+	 * <em>Stereotyped Element Matcher</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see org.eclipse.papyrus.domaincontextcodegen.impl.StereotypedElementMatcherImpl

+	 * @see org.eclipse.papyrus.domaincontextcodegen.impl.DomaincontextcodegenPackageImpl#getStereotypedElementMatcher()

+	 * @generated

+	 */

+	int STEREOTYPED_ELEMENT_MATCHER = 13;

+

+	/**

+	 * The feature id for the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int STEREOTYPED_ELEMENT_MATCHER__NAME = GEN_MATCHER__NAME;

+

+	/**

+	 * The feature id for the '<em><b>Stereotype Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int STEREOTYPED_ELEMENT_MATCHER__STEREOTYPE_NAME = GEN_MATCHER_FEATURE_COUNT + 0;

+

+	/**

+	 * The feature id for the '<em><b>Stereotype Package</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int STEREOTYPED_ELEMENT_MATCHER__STEREOTYPE_PACKAGE = GEN_MATCHER_FEATURE_COUNT + 1;

+

+	/**

+	 * The feature id for the '<em><b>Base Element Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int STEREOTYPED_ELEMENT_MATCHER__BASE_ELEMENT_NAME = GEN_MATCHER_FEATURE_COUNT + 2;

+

+	/**

+	 * The feature id for the '<em><b>Base Element Package</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int STEREOTYPED_ELEMENT_MATCHER__BASE_ELEMENT_PACKAGE = GEN_MATCHER_FEATURE_COUNT + 3;

+

+	/**

+	 * The number of structural features of the '<em>Stereotyped Element Matcher</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int STEREOTYPED_ELEMENT_MATCHER_FEATURE_COUNT = GEN_MATCHER_FEATURE_COUNT + 4;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.domaincontextcodegen.impl.StereotypedElementHelperImpl

+	 * <em>Stereotyped Element Helper</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see org.eclipse.papyrus.domaincontextcodegen.impl.StereotypedElementHelperImpl

+	 * @see org.eclipse.papyrus.domaincontextcodegen.impl.DomaincontextcodegenPackageImpl#getStereotypedElementHelper()

+	 * @generated

+	 */

+	int STEREOTYPED_ELEMENT_HELPER = 14;

+

+	/**

+	 * The feature id for the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int STEREOTYPED_ELEMENT_HELPER__NAME = GEN_HELPER__NAME;

+

+	/**

+	 * The feature id for the '<em><b>Stereotype Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int STEREOTYPED_ELEMENT_HELPER__STEREOTYPE_NAME = GEN_HELPER_FEATURE_COUNT + 0;

+

+	/**

+	 * The feature id for the '<em><b>Stereotype Package</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int STEREOTYPED_ELEMENT_HELPER__STEREOTYPE_PACKAGE = GEN_HELPER_FEATURE_COUNT + 1;

+

+	/**

+	 * The feature id for the '<em><b>Base Element Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int STEREOTYPED_ELEMENT_HELPER__BASE_ELEMENT_NAME = GEN_HELPER_FEATURE_COUNT + 2;

+

+	/**

+	 * The feature id for the '<em><b>Base Element Package</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int STEREOTYPED_ELEMENT_HELPER__BASE_ELEMENT_PACKAGE = GEN_HELPER_FEATURE_COUNT + 3;

+

+	/**

+	 * The number of structural features of the '<em>Stereotyped Element Helper</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int STEREOTYPED_ELEMENT_HELPER_FEATURE_COUNT = GEN_HELPER_FEATURE_COUNT + 4;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.domaincontextcodegen.impl.MenuDeclarationImpl <em>Menu Declaration</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see org.eclipse.papyrus.domaincontextcodegen.impl.MenuDeclarationImpl

+	 * @see org.eclipse.papyrus.domaincontextcodegen.impl.DomaincontextcodegenPackageImpl#getMenuDeclaration()

+	 * @generated

+	 */

+	int MENU_DECLARATION = 15;

+

+	/**

+	 * The feature id for the '<em><b>Location URI</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int MENU_DECLARATION__LOCATION_URI = 0;

+

+	/**

+	 * The feature id for the '<em><b>Commands</b></em>' reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int MENU_DECLARATION__COMMANDS = 1;

+

+	/**

+	 * The number of structural features of the '<em>Menu Declaration</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int MENU_DECLARATION_FEATURE_COUNT = 2;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.domaincontextcodegen.impl.CommandDeclarationImpl <em>Command Declaration</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see org.eclipse.papyrus.domaincontextcodegen.impl.CommandDeclarationImpl

+	 * @see org.eclipse.papyrus.domaincontextcodegen.impl.DomaincontextcodegenPackageImpl#getCommandDeclaration()

+	 * @generated

+	 */

+	int COMMAND_DECLARATION = 16;

+

+	/**

+	 * The feature id for the '<em><b>Commands</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int COMMAND_DECLARATION__COMMANDS = 0;

+

+	/**

+	 * The number of structural features of the '<em>Command Declaration</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int COMMAND_DECLARATION_FEATURE_COUNT = 1;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.domaincontextcodegen.impl.CommandImpl <em>Command</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see org.eclipse.papyrus.domaincontextcodegen.impl.CommandImpl

+	 * @see org.eclipse.papyrus.domaincontextcodegen.impl.DomaincontextcodegenPackageImpl#getCommand()

+	 * @generated

+	 */

+	int COMMAND = 17;

+

+	/**

+	 * The feature id for the '<em><b>Element Type</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int COMMAND__ELEMENT_TYPE = 0;

+

+	/**

+	 * The feature id for the '<em><b>Icon</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int COMMAND__ICON = 1;

+

+	/**

+	 * The number of structural features of the '<em>Command</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 * @ordered

+	 */

+	int COMMAND_FEATURE_COUNT = 2;

 

 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.domaincontextcodegen.InheritanceKind <em>Inheritance Kind</em>}' enum.

@@ -542,8 +1186,7 @@ public interface DomaincontextcodegenPackage extends EPackage {
 	 * @see org.eclipse.papyrus.domaincontextcodegen.impl.DomaincontextcodegenPackageImpl#getInheritanceKind()

 	 * @generated

 	 */

-	int INHERITANCE_KIND = 6;

-

+	int INHERITANCE_KIND = 18;

 

 	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.domaincontextcodegen.DomainContext <em>Domain Context</em>}'.

@@ -647,19 +1290,6 @@ public interface DomaincontextcodegenPackage extends EPackage {
 	EAttribute getDomainContext_ElementTypeNamePrefix();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.domaincontextcodegen.DomainContext#getMatcherPatch

-	 * <em>Matcher Patch</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the attribute '<em>Matcher Patch</em>'.

-	 * @see org.eclipse.papyrus.domaincontextcodegen.DomainContext#getMatcherPatch()

-	 * @see #getDomainContext()

-	 * @generated

-	 */

-	EAttribute getDomainContext_MatcherPatch();

-

-	/**

 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.domaincontextcodegen.DomainContext#getElementTypes

 	 * <em>Element Types</em>}'.

 	 * <!-- begin-user-doc -->

@@ -686,17 +1316,17 @@ public interface DomaincontextcodegenPackage extends EPackage {
 	EAttribute getDomainContext_DefaultHelperPath();

 

 	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.domaincontextcodegen.DomainContext#getAdvicebindings

-	 * <em>Advicebindings</em>}'.

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.domaincontextcodegen.DomainContext#getAdvices

+	 * <em>Advices</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

-	 * @return the meta object for the containment reference list '<em>Advicebindings</em>'.

-	 * @see org.eclipse.papyrus.domaincontextcodegen.DomainContext#getAdvicebindings()

+	 * @return the meta object for the containment reference list '<em>Advices</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomainContext#getAdvices()

 	 * @see #getDomainContext()

 	 * @generated

 	 */

-	EReference getDomainContext_Advicebindings();

+	EReference getDomainContext_Advices();

 

 	/**

 	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.domaincontextcodegen.DomainContext#getBindings

@@ -738,6 +1368,32 @@ public interface DomaincontextcodegenPackage extends EPackage {
 	EAttribute getDomainContext_GeneratedSourceFolder();

 

 	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.domaincontextcodegen.DomainContext#getMenu

+	 * <em>Menu</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for the containment reference list '<em>Menu</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomainContext#getMenu()

+	 * @see #getDomainContext()

+	 * @generated

+	 */

+	EReference getDomainContext_Menu();

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.domaincontextcodegen.DomainContext#getCommand

+	 * <em>Command</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for the containment reference list '<em>Command</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomainContext#getCommand()

+	 * @see #getDomainContext()

+	 * @generated

+	 */

+	EReference getDomainContext_Command();

+

+	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.domaincontextcodegen.ElementTypes <em>Element Types</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

@@ -762,6 +1418,18 @@ public interface DomaincontextcodegenPackage extends EPackage {
 	EReference getElementTypes_Types();

 

 	/**

+	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.domaincontextcodegen.ElementTypes#getDomain <em>Domain</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for the container reference '<em>Domain</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.ElementTypes#getDomain()

+	 * @see #getElementTypes()

+	 * @generated

+	 */

+	EReference getElementTypes_Domain();

+

+	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.domaincontextcodegen.ElementType <em>Element Type</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

@@ -773,153 +1441,255 @@ public interface DomaincontextcodegenPackage extends EPackage {
 	EClass getElementType();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.domaincontextcodegen.ElementType#getMetaClass <em>Meta Class</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.domaincontextcodegen.ElementType#getName <em>Name</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

-	 * @return the meta object for the reference '<em>Meta Class</em>'.

-	 * @see org.eclipse.papyrus.domaincontextcodegen.ElementType#getMetaClass()

+	 * @return the meta object for the attribute '<em>Name</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.ElementType#getName()

 	 * @see #getElementType()

 	 * @generated

 	 */

-	EReference getElementType_MetaClass();

+	EAttribute getElementType_Name();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.domaincontextcodegen.ElementType#getSpecificName <em>Specific Name</em>}

-	 * '.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.domaincontextcodegen.ElementType#getHelper <em>Helper</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

-	 * @return the meta object for the attribute '<em>Specific Name</em>'.

-	 * @see org.eclipse.papyrus.domaincontextcodegen.ElementType#getSpecificName()

+	 * @return the meta object for the attribute '<em>Helper</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.ElementType#getHelper()

 	 * @see #getElementType()

 	 * @generated

 	 */

-	EAttribute getElementType_SpecificName();

+	EAttribute getElementType_Helper();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.domaincontextcodegen.ElementType#getEdithelper_EditHelperAdvicePath

-	 * <em>Edithelper Edit Helper Advice Path</em>}'.

+	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.domaincontextcodegen.ElementType#getOwner <em>Owner</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

-	 * @return the meta object for the attribute '<em>Edithelper Edit Helper Advice Path</em>'.

-	 * @see org.eclipse.papyrus.domaincontextcodegen.ElementType#getEdithelper_EditHelperAdvicePath()

+	 * @return the meta object for the container reference '<em>Owner</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.ElementType#getOwner()

 	 * @see #getElementType()

 	 * @generated

 	 */

-	EAttribute getElementType_Edithelper_EditHelperAdvicePath();

+	EReference getElementType_Owner();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.domaincontextcodegen.ElementType#getKind <em>Kind</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.domaincontextcodegen.ElementType#getIcon <em>Icon</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

-	 * @return the meta object for the attribute '<em>Kind</em>'.

-	 * @see org.eclipse.papyrus.domaincontextcodegen.ElementType#getKind()

+	 * @return the meta object for the attribute '<em>Icon</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.ElementType#getIcon()

 	 * @see #getElementType()

 	 * @generated

 	 */

-	EAttribute getElementType_Kind();

+	EAttribute getElementType_Icon();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.domaincontextcodegen.ElementType#getSpecializationof

-	 * <em>Specializationof</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.domaincontextcodegen.MetaClassType <em>Meta Class Type</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

-	 * @return the meta object for the reference '<em>Specializationof</em>'.

-	 * @see org.eclipse.papyrus.domaincontextcodegen.ElementType#getSpecializationof()

-	 * @see #getElementType()

+	 * @return the meta object for class '<em>Meta Class Type</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.MetaClassType

 	 * @generated

 	 */

-	EReference getElementType_Specializationof();

+	EClass getMetaClassType();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.domaincontextcodegen.ElementType#getSpecializationIDof

-	 * <em>Specialization IDof</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.domaincontextcodegen.MetaClassType#getMetaClass <em>Meta Class</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

-	 * @return the meta object for the attribute '<em>Specialization IDof</em>'.

-	 * @see org.eclipse.papyrus.domaincontextcodegen.ElementType#getSpecializationIDof()

-	 * @see #getElementType()

+	 * @return the meta object for the reference '<em>Meta Class</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.MetaClassType#getMetaClass()

+	 * @see #getMetaClassType()

 	 * @generated

 	 */

-	EAttribute getElementType_SpecializationIDof();

+	EReference getMetaClassType_MetaClass();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.domaincontextcodegen.AdviceBinding <em>Advice Binding</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.domaincontextcodegen.SpecializationType <em>Specialization Type</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

-	 * @return the meta object for class '<em>Advice Binding</em>'.

-	 * @see org.eclipse.papyrus.domaincontextcodegen.AdviceBinding

+	 * @return the meta object for class '<em>Specialization Type</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.SpecializationType

 	 * @generated

 	 */

-	EClass getAdviceBinding();

+	EClass getSpecializationType();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.domaincontextcodegen.AdviceBinding#getAdvicePath <em>Advice Path</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.domaincontextcodegen.SpecializationType#getRef <em>Ref</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

-	 * @return the meta object for the attribute '<em>Advice Path</em>'.

-	 * @see org.eclipse.papyrus.domaincontextcodegen.AdviceBinding#getAdvicePath()

-	 * @see #getAdviceBinding()

+	 * @return the meta object for the reference '<em>Ref</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.SpecializationType#getRef()

+	 * @see #getSpecializationType()

+	 * @generated

+	 */

+	EReference getSpecializationType_Ref();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.domaincontextcodegen.SpecializationType#getMatcher <em>Matcher</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for the attribute '<em>Matcher</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.SpecializationType#getMatcher()

+	 * @see #getSpecializationType()

 	 * @generated

 	 */

-	EAttribute getAdviceBinding_AdvicePath();

+	EAttribute getSpecializationType_Matcher();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.domaincontextcodegen.AdviceBinding#getAdviceID <em>Advice ID</em>}'.

+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.domaincontextcodegen.SpecializationType#getGenMatcher

+	 * <em>Gen Matcher</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for the containment reference '<em>Gen Matcher</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.SpecializationType#getGenMatcher()

+	 * @see #getSpecializationType()

+	 * @generated

+	 */

+	EReference getSpecializationType_GenMatcher();

+

+	/**

+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.domaincontextcodegen.SpecializationType#getGenHelper

+	 * <em>Gen Helper</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for the containment reference '<em>Gen Helper</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.SpecializationType#getGenHelper()

+	 * @see #getSpecializationType()

+	 * @generated

+	 */

+	EReference getSpecializationType_GenHelper();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.domaincontextcodegen.Advice <em>Advice</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for class '<em>Advice</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.Advice

+	 * @generated

+	 */

+	EClass getAdvice();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.domaincontextcodegen.Advice#getAdviceID <em>Advice ID</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @return the meta object for the attribute '<em>Advice ID</em>'.

-	 * @see org.eclipse.papyrus.domaincontextcodegen.AdviceBinding#getAdviceID()

-	 * @see #getAdviceBinding()

+	 * @see org.eclipse.papyrus.domaincontextcodegen.Advice#getAdviceID()

+	 * @see #getAdvice()

 	 * @generated

 	 */

-	EAttribute getAdviceBinding_AdviceID();

+	EAttribute getAdvice_AdviceID();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.domaincontextcodegen.AdviceBinding#getInheritance <em>Inheritance</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.domaincontextcodegen.Advice#getRef <em>Ref</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for the reference '<em>Ref</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.Advice#getRef()

+	 * @see #getAdvice()

+	 * @generated

+	 */

+	EReference getAdvice_Ref();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.domaincontextcodegen.Advice#getAdvicePath <em>Advice Path</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for the attribute '<em>Advice Path</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.Advice#getAdvicePath()

+	 * @see #getAdvice()

+	 * @generated

+	 */

+	EAttribute getAdvice_AdvicePath();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.domaincontextcodegen.Advice#getInheritance <em>Inheritance</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @return the meta object for the attribute '<em>Inheritance</em>'.

-	 * @see org.eclipse.papyrus.domaincontextcodegen.AdviceBinding#getInheritance()

-	 * @see #getAdviceBinding()

+	 * @see org.eclipse.papyrus.domaincontextcodegen.Advice#getInheritance()

+	 * @see #getAdvice()

 	 * @generated

 	 */

-	EAttribute getAdviceBinding_Inheritance();

+	EAttribute getAdvice_Inheritance();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.domaincontextcodegen.AdviceBinding#getElementTypeRef

-	 * <em>Element Type Ref</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.domaincontextcodegen.ElementTypeBindings <em>Element Type Bindings</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

-	 * @return the meta object for the reference '<em>Element Type Ref</em>'.

-	 * @see org.eclipse.papyrus.domaincontextcodegen.AdviceBinding#getElementTypeRef()

-	 * @see #getAdviceBinding()

+	 * @return the meta object for class '<em>Element Type Bindings</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.ElementTypeBindings

 	 * @generated

 	 */

-	EReference getAdviceBinding_ElementTypeRef();

+	EClass getElementTypeBindings();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.domaincontextcodegen.AdviceBinding#getElementTypeIDref

-	 * <em>Element Type IDref</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.domaincontextcodegen.ElementTypeBindings#getClientContextID

+	 * <em>Client Context ID</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

-	 * @return the meta object for the attribute '<em>Element Type IDref</em>'.

-	 * @see org.eclipse.papyrus.domaincontextcodegen.AdviceBinding#getElementTypeIDref()

+	 * @return the meta object for the attribute '<em>Client Context ID</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.ElementTypeBindings#getClientContextID()

+	 * @see #getElementTypeBindings()

+	 * @generated

+	 */

+	EAttribute getElementTypeBindings_ClientContextID();

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.domaincontextcodegen.ElementTypeBindings#getBindings

+	 * <em>Bindings</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for the containment reference list '<em>Bindings</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.ElementTypeBindings#getBindings()

+	 * @see #getElementTypeBindings()

+	 * @generated

+	 */

+	EReference getElementTypeBindings_Bindings();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.domaincontextcodegen.AdviceBinding <em>Advice Binding</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for class '<em>Advice Binding</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.AdviceBinding

+	 * @generated

+	 */

+	EClass getAdviceBinding();

+

+	/**

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.domaincontextcodegen.AdviceBinding#getRef <em>Ref</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for the reference '<em>Ref</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.AdviceBinding#getRef()

 	 * @see #getAdviceBinding()

 	 * @generated

 	 */

-	EAttribute getAdviceBinding_ElementTypeIDref();

+	EReference getAdviceBinding_Ref();

 

 	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.domaincontextcodegen.Binding <em>Binding</em>}'.

@@ -933,41 +1703,51 @@ public interface DomaincontextcodegenPackage extends EPackage {
 	EClass getBinding();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.domaincontextcodegen.Binding#getAdvice <em>Advice</em>}'.

+	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.domaincontextcodegen.Binding#getOwner <em>Owner</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

-	 * @return the meta object for the reference '<em>Advice</em>'.

-	 * @see org.eclipse.papyrus.domaincontextcodegen.Binding#getAdvice()

+	 * @return the meta object for the container reference '<em>Owner</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.Binding#getOwner()

 	 * @see #getBinding()

 	 * @generated

 	 */

-	EReference getBinding_Advice();

+	EReference getBinding_Owner();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.domaincontextcodegen.Binding#getElementTypePattern

-	 * <em>Element Type Pattern</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.domaincontextcodegen.Binding#getPattern <em>Pattern</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

-	 * @return the meta object for the attribute '<em>Element Type Pattern</em>'.

-	 * @see org.eclipse.papyrus.domaincontextcodegen.Binding#getElementTypePattern()

+	 * @return the meta object for the attribute '<em>Pattern</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.Binding#getPattern()

 	 * @see #getBinding()

 	 * @generated

 	 */

-	EAttribute getBinding_ElementTypePattern();

+	EAttribute getBinding_Pattern();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.domaincontextcodegen.Binding#getAdviceID <em>Advice ID</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.domaincontextcodegen.ElementTypeBinding <em>Element Type Binding</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

-	 * @return the meta object for the attribute '<em>Advice ID</em>'.

-	 * @see org.eclipse.papyrus.domaincontextcodegen.Binding#getAdviceID()

-	 * @see #getBinding()

+	 * @return the meta object for class '<em>Element Type Binding</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.ElementTypeBinding

+	 * @generated

+	 */

+	EClass getElementTypeBinding();

+

+	/**

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.domaincontextcodegen.ElementTypeBinding#getRef <em>Ref</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for the reference '<em>Ref</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.ElementTypeBinding#getRef()

+	 * @see #getElementTypeBinding()

 	 * @generated

 	 */

-	EAttribute getBinding_AdviceID();

+	EReference getElementTypeBinding_Ref();

 

 	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.domaincontextcodegen.GenHandlers <em>Gen Handlers</em>}'.

@@ -1045,6 +1825,315 @@ public interface DomaincontextcodegenPackage extends EPackage {
 	EAttribute getGenHandlers_ElementTypeEnumeratorPackage();

 

 	/**

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.domaincontextcodegen.GenHandlers#getVisibleCreateChildHandlers

+	 * <em>Visible Create Child Handlers</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for the reference list '<em>Visible Create Child Handlers</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.GenHandlers#getVisibleCreateChildHandlers()

+	 * @see #getGenHandlers()

+	 * @generated

+	 */

+	EReference getGenHandlers_VisibleCreateChildHandlers();

+

+	/**

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.domaincontextcodegen.GenHandlers#getParentDomainCreateChild

+	 * <em>Parent Domain Create Child</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for the reference list '<em>Parent Domain Create Child</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.GenHandlers#getParentDomainCreateChild()

+	 * @see #getGenHandlers()

+	 * @generated

+	 */

+	EReference getGenHandlers_ParentDomainCreateChild();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.domaincontextcodegen.GenHandlers#getCreateChildMenuLocationURI

+	 * <em>Create Child Menu Location URI</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for the attribute '<em>Create Child Menu Location URI</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.GenHandlers#getCreateChildMenuLocationURI()

+	 * @see #getGenHandlers()

+	 * @generated

+	 */

+	EAttribute getGenHandlers_CreateChildMenuLocationURI();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.domaincontextcodegen.GenMatcher <em>Gen Matcher</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for class '<em>Gen Matcher</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.GenMatcher

+	 * @generated

+	 */

+	EClass getGenMatcher();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.domaincontextcodegen.GenMatcher#getName <em>Name</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for the attribute '<em>Name</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.GenMatcher#getName()

+	 * @see #getGenMatcher()

+	 * @generated

+	 */

+	EAttribute getGenMatcher_Name();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.domaincontextcodegen.GenHelper <em>Gen Helper</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for class '<em>Gen Helper</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.GenHelper

+	 * @generated

+	 */

+	EClass getGenHelper();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.domaincontextcodegen.GenHelper#getName <em>Name</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for the attribute '<em>Name</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.GenHelper#getName()

+	 * @see #getGenHelper()

+	 * @generated

+	 */

+	EAttribute getGenHelper_Name();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.domaincontextcodegen.StereotypedElementMatcher

+	 * <em>Stereotyped Element Matcher</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for class '<em>Stereotyped Element Matcher</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.StereotypedElementMatcher

+	 * @generated

+	 */

+	EClass getStereotypedElementMatcher();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.domaincontextcodegen.StereotypedElementMatcher#getStereotypeName

+	 * <em>Stereotype Name</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for the attribute '<em>Stereotype Name</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.StereotypedElementMatcher#getStereotypeName()

+	 * @see #getStereotypedElementMatcher()

+	 * @generated

+	 */

+	EAttribute getStereotypedElementMatcher_StereotypeName();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.domaincontextcodegen.StereotypedElementMatcher#getStereotypePackage

+	 * <em>Stereotype Package</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for the attribute '<em>Stereotype Package</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.StereotypedElementMatcher#getStereotypePackage()

+	 * @see #getStereotypedElementMatcher()

+	 * @generated

+	 */

+	EAttribute getStereotypedElementMatcher_StereotypePackage();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.domaincontextcodegen.StereotypedElementMatcher#getBaseElementName

+	 * <em>Base Element Name</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for the attribute '<em>Base Element Name</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.StereotypedElementMatcher#getBaseElementName()

+	 * @see #getStereotypedElementMatcher()

+	 * @generated

+	 */

+	EAttribute getStereotypedElementMatcher_BaseElementName();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.domaincontextcodegen.StereotypedElementMatcher#getBaseElementPackage

+	 * <em>Base Element Package</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for the attribute '<em>Base Element Package</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.StereotypedElementMatcher#getBaseElementPackage()

+	 * @see #getStereotypedElementMatcher()

+	 * @generated

+	 */

+	EAttribute getStereotypedElementMatcher_BaseElementPackage();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.domaincontextcodegen.StereotypedElementHelper

+	 * <em>Stereotyped Element Helper</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for class '<em>Stereotyped Element Helper</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.StereotypedElementHelper

+	 * @generated

+	 */

+	EClass getStereotypedElementHelper();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.domaincontextcodegen.StereotypedElementHelper#getStereotypeName

+	 * <em>Stereotype Name</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for the attribute '<em>Stereotype Name</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.StereotypedElementHelper#getStereotypeName()

+	 * @see #getStereotypedElementHelper()

+	 * @generated

+	 */

+	EAttribute getStereotypedElementHelper_StereotypeName();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.domaincontextcodegen.StereotypedElementHelper#getStereotypePackage

+	 * <em>Stereotype Package</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for the attribute '<em>Stereotype Package</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.StereotypedElementHelper#getStereotypePackage()

+	 * @see #getStereotypedElementHelper()

+	 * @generated

+	 */

+	EAttribute getStereotypedElementHelper_StereotypePackage();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.domaincontextcodegen.StereotypedElementHelper#getBaseElementName

+	 * <em>Base Element Name</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for the attribute '<em>Base Element Name</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.StereotypedElementHelper#getBaseElementName()

+	 * @see #getStereotypedElementHelper()

+	 * @generated

+	 */

+	EAttribute getStereotypedElementHelper_BaseElementName();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.domaincontextcodegen.StereotypedElementHelper#getBaseElementPackage

+	 * <em>Base Element Package</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for the attribute '<em>Base Element Package</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.StereotypedElementHelper#getBaseElementPackage()

+	 * @see #getStereotypedElementHelper()

+	 * @generated

+	 */

+	EAttribute getStereotypedElementHelper_BaseElementPackage();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.domaincontextcodegen.MenuDeclaration <em>Menu Declaration</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for class '<em>Menu Declaration</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.MenuDeclaration

+	 * @generated

+	 */

+	EClass getMenuDeclaration();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.domaincontextcodegen.MenuDeclaration#getLocationURI

+	 * <em>Location URI</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for the attribute '<em>Location URI</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.MenuDeclaration#getLocationURI()

+	 * @see #getMenuDeclaration()

+	 * @generated

+	 */

+	EAttribute getMenuDeclaration_LocationURI();

+

+	/**

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.domaincontextcodegen.MenuDeclaration#getCommands <em>Commands</em>}

+	 * '.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for the reference list '<em>Commands</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.MenuDeclaration#getCommands()

+	 * @see #getMenuDeclaration()

+	 * @generated

+	 */

+	EReference getMenuDeclaration_Commands();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.domaincontextcodegen.CommandDeclaration <em>Command Declaration</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for class '<em>Command Declaration</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.CommandDeclaration

+	 * @generated

+	 */

+	EClass getCommandDeclaration();

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.domaincontextcodegen.CommandDeclaration#getCommands

+	 * <em>Commands</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for the containment reference list '<em>Commands</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.CommandDeclaration#getCommands()

+	 * @see #getCommandDeclaration()

+	 * @generated

+	 */

+	EReference getCommandDeclaration_Commands();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.domaincontextcodegen.Command <em>Command</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for class '<em>Command</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.Command

+	 * @generated

+	 */

+	EClass getCommand();

+

+	/**

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.domaincontextcodegen.Command#getElementType <em>Element Type</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for the reference '<em>Element Type</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.Command#getElementType()

+	 * @see #getCommand()

+	 * @generated

+	 */

+	EReference getCommand_ElementType();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.domaincontextcodegen.Command#getIcon <em>Icon</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the meta object for the attribute '<em>Icon</em>'.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.Command#getIcon()

+	 * @see #getCommand()

+	 * @generated

+	 */

+	EAttribute getCommand_Icon();

+

+	/**

 	 * Returns the meta object for enum '{@link org.eclipse.papyrus.domaincontextcodegen.InheritanceKind <em>Inheritance Kind</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

@@ -1155,15 +2244,6 @@ public interface DomaincontextcodegenPackage extends EPackage {
 		EAttribute DOMAIN_CONTEXT__ELEMENT_TYPE_NAME_PREFIX = eINSTANCE.getDomainContext_ElementTypeNamePrefix();

 

 		/**

-		 * The meta object literal for the '<em><b>Matcher Patch</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EAttribute DOMAIN_CONTEXT__MATCHER_PATCH = eINSTANCE.getDomainContext_MatcherPatch();

-

-		/**

 		 * The meta object literal for the '<em><b>Element Types</b></em>' containment reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

@@ -1182,13 +2262,13 @@ public interface DomaincontextcodegenPackage extends EPackage {
 		EAttribute DOMAIN_CONTEXT__DEFAULT_HELPER_PATH = eINSTANCE.getDomainContext_DefaultHelperPath();

 

 		/**

-		 * The meta object literal for the '<em><b>Advicebindings</b></em>' containment reference list feature.

+		 * The meta object literal for the '<em><b>Advices</b></em>' containment reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

 		 * 

 		 * @generated

 		 */

-		EReference DOMAIN_CONTEXT__ADVICEBINDINGS = eINSTANCE.getDomainContext_Advicebindings();

+		EReference DOMAIN_CONTEXT__ADVICES = eINSTANCE.getDomainContext_Advices();

 

 		/**

 		 * The meta object literal for the '<em><b>Bindings</b></em>' containment reference list feature.

@@ -1218,6 +2298,24 @@ public interface DomaincontextcodegenPackage extends EPackage {
 		EAttribute DOMAIN_CONTEXT__GENERATED_SOURCE_FOLDER = eINSTANCE.getDomainContext_GeneratedSourceFolder();

 

 		/**

+		 * The meta object literal for the '<em><b>Menu</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @generated

+		 */

+		EReference DOMAIN_CONTEXT__MENU = eINSTANCE.getDomainContext_Menu();

+

+		/**

+		 * The meta object literal for the '<em><b>Command</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @generated

+		 */

+		EReference DOMAIN_CONTEXT__COMMAND = eINSTANCE.getDomainContext_Command();

+

+		/**

 		 * The meta object literal for the '{@link org.eclipse.papyrus.domaincontextcodegen.impl.ElementTypesImpl <em>Element Types</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

@@ -1238,6 +2336,15 @@ public interface DomaincontextcodegenPackage extends EPackage {
 		EReference ELEMENT_TYPES__TYPES = eINSTANCE.getElementTypes_Types();

 

 		/**

+		 * The meta object literal for the '<em><b>Domain</b></em>' container reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @generated

+		 */

+		EReference ELEMENT_TYPES__DOMAIN = eINSTANCE.getElementTypes_Domain();

+

+		/**

 		 * The meta object literal for the '{@link org.eclipse.papyrus.domaincontextcodegen.impl.ElementTypeImpl <em>Element Type</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

@@ -1249,78 +2356,119 @@ public interface DomaincontextcodegenPackage extends EPackage {
 		EClass ELEMENT_TYPE = eINSTANCE.getElementType();

 

 		/**

-		 * The meta object literal for the '<em><b>Meta Class</b></em>' reference feature.

+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

 		 * 

 		 * @generated

 		 */

-		EReference ELEMENT_TYPE__META_CLASS = eINSTANCE.getElementType_MetaClass();

+		EAttribute ELEMENT_TYPE__NAME = eINSTANCE.getElementType_Name();

 

 		/**

-		 * The meta object literal for the '<em><b>Specific Name</b></em>' attribute feature.

+		 * The meta object literal for the '<em><b>Helper</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

 		 * 

 		 * @generated

 		 */

-		EAttribute ELEMENT_TYPE__SPECIFIC_NAME = eINSTANCE.getElementType_SpecificName();

+		EAttribute ELEMENT_TYPE__HELPER = eINSTANCE.getElementType_Helper();

 

 		/**

-		 * The meta object literal for the '<em><b>Edithelper Edit Helper Advice Path</b></em>' attribute feature.

+		 * The meta object literal for the '<em><b>Owner</b></em>' container reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

 		 * 

 		 * @generated

 		 */

-		EAttribute ELEMENT_TYPE__EDITHELPER_EDIT_HELPER_ADVICE_PATH = eINSTANCE.getElementType_Edithelper_EditHelperAdvicePath();

+		EReference ELEMENT_TYPE__OWNER = eINSTANCE.getElementType_Owner();

 

 		/**

-		 * The meta object literal for the '<em><b>Kind</b></em>' attribute feature.

+		 * The meta object literal for the '<em><b>Icon</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

 		 * 

 		 * @generated

 		 */

-		EAttribute ELEMENT_TYPE__KIND = eINSTANCE.getElementType_Kind();

+		EAttribute ELEMENT_TYPE__ICON = eINSTANCE.getElementType_Icon();

 

 		/**

-		 * The meta object literal for the '<em><b>Specializationof</b></em>' reference feature.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.domaincontextcodegen.impl.MetaClassTypeImpl <em>Meta Class Type</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

 		 * 

+		 * @see org.eclipse.papyrus.domaincontextcodegen.impl.MetaClassTypeImpl

+		 * @see org.eclipse.papyrus.domaincontextcodegen.impl.DomaincontextcodegenPackageImpl#getMetaClassType()

 		 * @generated

 		 */

-		EReference ELEMENT_TYPE__SPECIALIZATIONOF = eINSTANCE.getElementType_Specializationof();

+		EClass META_CLASS_TYPE = eINSTANCE.getMetaClassType();

 

 		/**

-		 * The meta object literal for the '<em><b>Specialization IDof</b></em>' attribute feature.

+		 * The meta object literal for the '<em><b>Meta Class</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

 		 * 

 		 * @generated

 		 */

-		EAttribute ELEMENT_TYPE__SPECIALIZATION_IDOF = eINSTANCE.getElementType_SpecializationIDof();

+		EReference META_CLASS_TYPE__META_CLASS = eINSTANCE.getMetaClassType_MetaClass();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.domaincontextcodegen.impl.AdviceBindingImpl <em>Advice Binding</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.domaincontextcodegen.impl.SpecializationTypeImpl <em>Specialization Type</em>}'

+		 * class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

 		 * 

-		 * @see org.eclipse.papyrus.domaincontextcodegen.impl.AdviceBindingImpl

-		 * @see org.eclipse.papyrus.domaincontextcodegen.impl.DomaincontextcodegenPackageImpl#getAdviceBinding()

+		 * @see org.eclipse.papyrus.domaincontextcodegen.impl.SpecializationTypeImpl

+		 * @see org.eclipse.papyrus.domaincontextcodegen.impl.DomaincontextcodegenPackageImpl#getSpecializationType()

 		 * @generated

 		 */

-		EClass ADVICE_BINDING = eINSTANCE.getAdviceBinding();

+		EClass SPECIALIZATION_TYPE = eINSTANCE.getSpecializationType();

 

 		/**

-		 * The meta object literal for the '<em><b>Advice Path</b></em>' attribute feature.

+		 * The meta object literal for the '<em><b>Ref</b></em>' reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @generated

+		 */

+		EReference SPECIALIZATION_TYPE__REF = eINSTANCE.getSpecializationType_Ref();

+

+		/**

+		 * The meta object literal for the '<em><b>Matcher</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @generated

+		 */

+		EAttribute SPECIALIZATION_TYPE__MATCHER = eINSTANCE.getSpecializationType_Matcher();

+

+		/**

+		 * The meta object literal for the '<em><b>Gen Matcher</b></em>' containment reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @generated

+		 */

+		EReference SPECIALIZATION_TYPE__GEN_MATCHER = eINSTANCE.getSpecializationType_GenMatcher();

+

+		/**

+		 * The meta object literal for the '<em><b>Gen Helper</b></em>' containment reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @generated

+		 */

+		EReference SPECIALIZATION_TYPE__GEN_HELPER = eINSTANCE.getSpecializationType_GenHelper();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.domaincontextcodegen.impl.AdviceImpl <em>Advice</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

 		 * 

+		 * @see org.eclipse.papyrus.domaincontextcodegen.impl.AdviceImpl

+		 * @see org.eclipse.papyrus.domaincontextcodegen.impl.DomaincontextcodegenPackageImpl#getAdvice()

 		 * @generated

 		 */

-		EAttribute ADVICE_BINDING__ADVICE_PATH = eINSTANCE.getAdviceBinding_AdvicePath();

+		EClass ADVICE = eINSTANCE.getAdvice();

 

 		/**

 		 * The meta object literal for the '<em><b>Advice ID</b></em>' attribute feature.

@@ -1329,7 +2477,25 @@ public interface DomaincontextcodegenPackage extends EPackage {
 		 * 

 		 * @generated

 		 */

-		EAttribute ADVICE_BINDING__ADVICE_ID = eINSTANCE.getAdviceBinding_AdviceID();

+		EAttribute ADVICE__ADVICE_ID = eINSTANCE.getAdvice_AdviceID();

+

+		/**

+		 * The meta object literal for the '<em><b>Ref</b></em>' reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @generated

+		 */

+		EReference ADVICE__REF = eINSTANCE.getAdvice_Ref();

+

+		/**

+		 * The meta object literal for the '<em><b>Advice Path</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @generated

+		 */

+		EAttribute ADVICE__ADVICE_PATH = eINSTANCE.getAdvice_AdvicePath();

 

 		/**

 		 * The meta object literal for the '<em><b>Inheritance</b></em>' attribute feature.

@@ -1338,25 +2504,57 @@ public interface DomaincontextcodegenPackage extends EPackage {
 		 * 

 		 * @generated

 		 */

-		EAttribute ADVICE_BINDING__INHERITANCE = eINSTANCE.getAdviceBinding_Inheritance();

+		EAttribute ADVICE__INHERITANCE = eINSTANCE.getAdvice_Inheritance();

 

 		/**

-		 * The meta object literal for the '<em><b>Element Type Ref</b></em>' reference feature.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.domaincontextcodegen.impl.ElementTypeBindingsImpl

+		 * <em>Element Type Bindings</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

 		 * 

+		 * @see org.eclipse.papyrus.domaincontextcodegen.impl.ElementTypeBindingsImpl

+		 * @see org.eclipse.papyrus.domaincontextcodegen.impl.DomaincontextcodegenPackageImpl#getElementTypeBindings()

 		 * @generated

 		 */

-		EReference ADVICE_BINDING__ELEMENT_TYPE_REF = eINSTANCE.getAdviceBinding_ElementTypeRef();

+		EClass ELEMENT_TYPE_BINDINGS = eINSTANCE.getElementTypeBindings();

 

 		/**

-		 * The meta object literal for the '<em><b>Element Type IDref</b></em>' attribute feature.

+		 * The meta object literal for the '<em><b>Client Context ID</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

 		 * 

 		 * @generated

 		 */

-		EAttribute ADVICE_BINDING__ELEMENT_TYPE_IDREF = eINSTANCE.getAdviceBinding_ElementTypeIDref();

+		EAttribute ELEMENT_TYPE_BINDINGS__CLIENT_CONTEXT_ID = eINSTANCE.getElementTypeBindings_ClientContextID();

+

+		/**

+		 * The meta object literal for the '<em><b>Bindings</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @generated

+		 */

+		EReference ELEMENT_TYPE_BINDINGS__BINDINGS = eINSTANCE.getElementTypeBindings_Bindings();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.domaincontextcodegen.impl.AdviceBindingImpl <em>Advice Binding</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @see org.eclipse.papyrus.domaincontextcodegen.impl.AdviceBindingImpl

+		 * @see org.eclipse.papyrus.domaincontextcodegen.impl.DomaincontextcodegenPackageImpl#getAdviceBinding()

+		 * @generated

+		 */

+		EClass ADVICE_BINDING = eINSTANCE.getAdviceBinding();

+

+		/**

+		 * The meta object literal for the '<em><b>Ref</b></em>' reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @generated

+		 */

+		EReference ADVICE_BINDING__REF = eINSTANCE.getAdviceBinding_Ref();

 

 		/**

 		 * The meta object literal for the '{@link org.eclipse.papyrus.domaincontextcodegen.impl.BindingImpl <em>Binding</em>}' class.

@@ -1370,31 +2568,43 @@ public interface DomaincontextcodegenPackage extends EPackage {
 		EClass BINDING = eINSTANCE.getBinding();

 

 		/**

-		 * The meta object literal for the '<em><b>Advice</b></em>' reference feature.

+		 * The meta object literal for the '<em><b>Owner</b></em>' container reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

 		 * 

 		 * @generated

 		 */

-		EReference BINDING__ADVICE = eINSTANCE.getBinding_Advice();

+		EReference BINDING__OWNER = eINSTANCE.getBinding_Owner();

 

 		/**

-		 * The meta object literal for the '<em><b>Element Type Pattern</b></em>' attribute feature.

+		 * The meta object literal for the '<em><b>Pattern</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

 		 * 

 		 * @generated

 		 */

-		EAttribute BINDING__ELEMENT_TYPE_PATTERN = eINSTANCE.getBinding_ElementTypePattern();

+		EAttribute BINDING__PATTERN = eINSTANCE.getBinding_Pattern();

 

 		/**

-		 * The meta object literal for the '<em><b>Advice ID</b></em>' attribute feature.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.domaincontextcodegen.impl.ElementTypeBindingImpl <em>Element Type Binding</em>}

+		 * ' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

 		 * 

+		 * @see org.eclipse.papyrus.domaincontextcodegen.impl.ElementTypeBindingImpl

+		 * @see org.eclipse.papyrus.domaincontextcodegen.impl.DomaincontextcodegenPackageImpl#getElementTypeBinding()

 		 * @generated

 		 */

-		EAttribute BINDING__ADVICE_ID = eINSTANCE.getBinding_AdviceID();

+		EClass ELEMENT_TYPE_BINDING = eINSTANCE.getElementTypeBinding();

+

+		/**

+		 * The meta object literal for the '<em><b>Ref</b></em>' reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @generated

+		 */

+		EReference ELEMENT_TYPE_BINDING__REF = eINSTANCE.getElementTypeBinding_Ref();

 

 		/**

 		 * The meta object literal for the '{@link org.eclipse.papyrus.domaincontextcodegen.impl.GenHandlersImpl <em>Gen Handlers</em>}' class.

@@ -1453,6 +2663,249 @@ public interface DomaincontextcodegenPackage extends EPackage {
 		EAttribute GEN_HANDLERS__ELEMENT_TYPE_ENUMERATOR_PACKAGE = eINSTANCE.getGenHandlers_ElementTypeEnumeratorPackage();

 

 		/**

+		 * The meta object literal for the '<em><b>Visible Create Child Handlers</b></em>' reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @generated

+		 */

+		EReference GEN_HANDLERS__VISIBLE_CREATE_CHILD_HANDLERS = eINSTANCE.getGenHandlers_VisibleCreateChildHandlers();

+

+		/**

+		 * The meta object literal for the '<em><b>Parent Domain Create Child</b></em>' reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @generated

+		 */

+		EReference GEN_HANDLERS__PARENT_DOMAIN_CREATE_CHILD = eINSTANCE.getGenHandlers_ParentDomainCreateChild();

+

+		/**

+		 * The meta object literal for the '<em><b>Create Child Menu Location URI</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @generated

+		 */

+		EAttribute GEN_HANDLERS__CREATE_CHILD_MENU_LOCATION_URI = eINSTANCE.getGenHandlers_CreateChildMenuLocationURI();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.domaincontextcodegen.impl.GenMatcherImpl <em>Gen Matcher</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @see org.eclipse.papyrus.domaincontextcodegen.impl.GenMatcherImpl

+		 * @see org.eclipse.papyrus.domaincontextcodegen.impl.DomaincontextcodegenPackageImpl#getGenMatcher()

+		 * @generated

+		 */

+		EClass GEN_MATCHER = eINSTANCE.getGenMatcher();

+

+		/**

+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @generated

+		 */

+		EAttribute GEN_MATCHER__NAME = eINSTANCE.getGenMatcher_Name();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.domaincontextcodegen.impl.GenHelperImpl <em>Gen Helper</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @see org.eclipse.papyrus.domaincontextcodegen.impl.GenHelperImpl

+		 * @see org.eclipse.papyrus.domaincontextcodegen.impl.DomaincontextcodegenPackageImpl#getGenHelper()

+		 * @generated

+		 */

+		EClass GEN_HELPER = eINSTANCE.getGenHelper();

+

+		/**

+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @generated

+		 */

+		EAttribute GEN_HELPER__NAME = eINSTANCE.getGenHelper_Name();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.domaincontextcodegen.impl.StereotypedElementMatcherImpl

+		 * <em>Stereotyped Element Matcher</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @see org.eclipse.papyrus.domaincontextcodegen.impl.StereotypedElementMatcherImpl

+		 * @see org.eclipse.papyrus.domaincontextcodegen.impl.DomaincontextcodegenPackageImpl#getStereotypedElementMatcher()

+		 * @generated

+		 */

+		EClass STEREOTYPED_ELEMENT_MATCHER = eINSTANCE.getStereotypedElementMatcher();

+

+		/**

+		 * The meta object literal for the '<em><b>Stereotype Name</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @generated

+		 */

+		EAttribute STEREOTYPED_ELEMENT_MATCHER__STEREOTYPE_NAME = eINSTANCE.getStereotypedElementMatcher_StereotypeName();

+

+		/**

+		 * The meta object literal for the '<em><b>Stereotype Package</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @generated

+		 */

+		EAttribute STEREOTYPED_ELEMENT_MATCHER__STEREOTYPE_PACKAGE = eINSTANCE.getStereotypedElementMatcher_StereotypePackage();

+

+		/**

+		 * The meta object literal for the '<em><b>Base Element Name</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @generated

+		 */

+		EAttribute STEREOTYPED_ELEMENT_MATCHER__BASE_ELEMENT_NAME = eINSTANCE.getStereotypedElementMatcher_BaseElementName();

+

+		/**

+		 * The meta object literal for the '<em><b>Base Element Package</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @generated

+		 */

+		EAttribute STEREOTYPED_ELEMENT_MATCHER__BASE_ELEMENT_PACKAGE = eINSTANCE.getStereotypedElementMatcher_BaseElementPackage();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.domaincontextcodegen.impl.StereotypedElementHelperImpl

+		 * <em>Stereotyped Element Helper</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @see org.eclipse.papyrus.domaincontextcodegen.impl.StereotypedElementHelperImpl

+		 * @see org.eclipse.papyrus.domaincontextcodegen.impl.DomaincontextcodegenPackageImpl#getStereotypedElementHelper()

+		 * @generated

+		 */

+		EClass STEREOTYPED_ELEMENT_HELPER = eINSTANCE.getStereotypedElementHelper();

+

+		/**

+		 * The meta object literal for the '<em><b>Stereotype Name</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @generated

+		 */

+		EAttribute STEREOTYPED_ELEMENT_HELPER__STEREOTYPE_NAME = eINSTANCE.getStereotypedElementHelper_StereotypeName();

+

+		/**

+		 * The meta object literal for the '<em><b>Stereotype Package</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @generated

+		 */

+		EAttribute STEREOTYPED_ELEMENT_HELPER__STEREOTYPE_PACKAGE = eINSTANCE.getStereotypedElementHelper_StereotypePackage();

+

+		/**

+		 * The meta object literal for the '<em><b>Base Element Name</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @generated

+		 */

+		EAttribute STEREOTYPED_ELEMENT_HELPER__BASE_ELEMENT_NAME = eINSTANCE.getStereotypedElementHelper_BaseElementName();

+

+		/**

+		 * The meta object literal for the '<em><b>Base Element Package</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @generated

+		 */

+		EAttribute STEREOTYPED_ELEMENT_HELPER__BASE_ELEMENT_PACKAGE = eINSTANCE.getStereotypedElementHelper_BaseElementPackage();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.domaincontextcodegen.impl.MenuDeclarationImpl <em>Menu Declaration</em>}'

+		 * class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @see org.eclipse.papyrus.domaincontextcodegen.impl.MenuDeclarationImpl

+		 * @see org.eclipse.papyrus.domaincontextcodegen.impl.DomaincontextcodegenPackageImpl#getMenuDeclaration()

+		 * @generated

+		 */

+		EClass MENU_DECLARATION = eINSTANCE.getMenuDeclaration();

+

+		/**

+		 * The meta object literal for the '<em><b>Location URI</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @generated

+		 */

+		EAttribute MENU_DECLARATION__LOCATION_URI = eINSTANCE.getMenuDeclaration_LocationURI();

+

+		/**

+		 * The meta object literal for the '<em><b>Commands</b></em>' reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @generated

+		 */

+		EReference MENU_DECLARATION__COMMANDS = eINSTANCE.getMenuDeclaration_Commands();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.domaincontextcodegen.impl.CommandDeclarationImpl <em>Command Declaration</em>}'

+		 * class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @see org.eclipse.papyrus.domaincontextcodegen.impl.CommandDeclarationImpl

+		 * @see org.eclipse.papyrus.domaincontextcodegen.impl.DomaincontextcodegenPackageImpl#getCommandDeclaration()

+		 * @generated

+		 */

+		EClass COMMAND_DECLARATION = eINSTANCE.getCommandDeclaration();

+

+		/**

+		 * The meta object literal for the '<em><b>Commands</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @generated

+		 */

+		EReference COMMAND_DECLARATION__COMMANDS = eINSTANCE.getCommandDeclaration_Commands();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.domaincontextcodegen.impl.CommandImpl <em>Command</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @see org.eclipse.papyrus.domaincontextcodegen.impl.CommandImpl

+		 * @see org.eclipse.papyrus.domaincontextcodegen.impl.DomaincontextcodegenPackageImpl#getCommand()

+		 * @generated

+		 */

+		EClass COMMAND = eINSTANCE.getCommand();

+

+		/**

+		 * The meta object literal for the '<em><b>Element Type</b></em>' reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @generated

+		 */

+		EReference COMMAND__ELEMENT_TYPE = eINSTANCE.getCommand_ElementType();

+

+		/**

+		 * The meta object literal for the '<em><b>Icon</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * 

+		 * @generated

+		 */

+		EAttribute COMMAND__ICON = eINSTANCE.getCommand_Icon();

+

+		/**

 		 * The meta object literal for the '{@link org.eclipse.papyrus.domaincontextcodegen.InheritanceKind <em>Inheritance Kind</em>}' enum.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/ElementType.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/ElementType.java
index a3149fced91..8d42e23698f 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/ElementType.java
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/ElementType.java
@@ -6,7 +6,6 @@
  */

 package org.eclipse.papyrus.domaincontextcodegen;

 

-import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

 

 /**

@@ -17,189 +16,131 @@ import org.eclipse.emf.ecore.EObject;
  * <p>

  * The following features are supported:

  * <ul>

- * <li>{@link org.eclipse.papyrus.domaincontextcodegen.ElementType#getMetaClass <em>Meta Class</em>}</li>

- * <li>{@link org.eclipse.papyrus.domaincontextcodegen.ElementType#getSpecificName <em>Specific Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.domaincontextcodegen.ElementType#getEdithelper_EditHelperAdvicePath <em>Edithelper Edit Helper Advice Path</em>}</li>

- * <li>{@link org.eclipse.papyrus.domaincontextcodegen.ElementType#getKind <em>Kind</em>}</li>

- * <li>{@link org.eclipse.papyrus.domaincontextcodegen.ElementType#getSpecializationof <em>Specializationof</em>}</li>

- * <li>{@link org.eclipse.papyrus.domaincontextcodegen.ElementType#getSpecializationIDof <em>Specialization IDof</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.ElementType#getName <em>Name</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.ElementType#getHelper <em>Helper</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.ElementType#getOwner <em>Owner</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.ElementType#getIcon <em>Icon</em>}</li>

  * </ul>

  * </p>

  * 

  * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getElementType()

- * @model

+ * @model abstract="true"

  * @generated

  */

 public interface ElementType extends EObject {

 

 	/**

-	 * Returns the value of the '<em><b>Meta Class</b></em>' reference.

+	 * Returns the value of the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Meta Class</em>' reference isn't clear, there really should be more of a description here...

+	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

 	 * 

-	 * @return the value of the '<em>Meta Class</em>' reference.

-	 * @see #setMetaClass(EClass)

-	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getElementType_MetaClass()

-	 * @model required="true"

-	 * @generated

-	 */

-	EClass getMetaClass();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.ElementType#getMetaClass <em>Meta Class</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @param value

-	 *        the new value of the '<em>Meta Class</em>' reference.

-	 * @see #getMetaClass()

-	 * @generated

-	 */

-	void setMetaClass(EClass value);

-

-	/**

-	 * Returns the value of the '<em><b>Specific Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Specific Name</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the value of the '<em>Specific Name</em>' attribute.

-	 * @see #setSpecificName(String)

-	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getElementType_SpecificName()

-	 * @model

-	 * @generated

-	 */

-	String getSpecificName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.ElementType#getSpecificName <em>Specific Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @param value

-	 *        the new value of the '<em>Specific Name</em>' attribute.

-	 * @see #getSpecificName()

-	 * @generated

-	 */

-	void setSpecificName(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Edithelper Edit Helper Advice Path</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Edithelper Edit Helper Advice Path</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the value of the '<em>Edithelper Edit Helper Advice Path</em>' attribute.

-	 * @see #setEdithelper_EditHelperAdvicePath(String)

-	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getElementType_Edithelper_EditHelperAdvicePath()

+	 * @return the value of the '<em>Name</em>' attribute.

+	 * @see #setName(String)

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getElementType_Name()

 	 * @model

 	 * @generated

 	 */

-	String getEdithelper_EditHelperAdvicePath();

+	String getName();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.ElementType#getEdithelper_EditHelperAdvicePath

-	 * <em>Edithelper Edit Helper Advice Path</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.ElementType#getName <em>Name</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @param value

-	 *        the new value of the '<em>Edithelper Edit Helper Advice Path</em>' attribute.

-	 * @see #getEdithelper_EditHelperAdvicePath()

+	 *        the new value of the '<em>Name</em>' attribute.

+	 * @see #getName()

 	 * @generated

 	 */

-	void setEdithelper_EditHelperAdvicePath(String value);

+	void setName(String value);

 

 	/**

-	 * Returns the value of the '<em><b>Kind</b></em>' attribute.

+	 * Returns the value of the '<em><b>Helper</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Kind</em>' attribute isn't clear, there really should be more of a description here...

+	 * If the meaning of the '<em>Helper</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

 	 * 

-	 * @return the value of the '<em>Kind</em>' attribute.

-	 * @see #setKind(String)

-	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getElementType_Kind()

+	 * @return the value of the '<em>Helper</em>' attribute.

+	 * @see #setHelper(String)

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getElementType_Helper()

 	 * @model

 	 * @generated

 	 */

-	String getKind();

+	String getHelper();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.ElementType#getKind <em>Kind</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.ElementType#getHelper <em>Helper</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @param value

-	 *        the new value of the '<em>Kind</em>' attribute.

-	 * @see #getKind()

+	 *        the new value of the '<em>Helper</em>' attribute.

+	 * @see #getHelper()

 	 * @generated

 	 */

-	void setKind(String value);

+	void setHelper(String value);

 

 	/**

-	 * Returns the value of the '<em><b>Specializationof</b></em>' reference.

+	 * Returns the value of the '<em><b>Owner</b></em>' container reference.

+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.domaincontextcodegen.ElementTypes#getTypes <em>Types</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Specializationof</em>' reference isn't clear, there really should be more of a description here...

+	 * If the meaning of the '<em>Owner</em>' container reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

 	 * 

-	 * @return the value of the '<em>Specializationof</em>' reference.

-	 * @see #setSpecializationof(ElementType)

-	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getElementType_Specializationof()

-	 * @model

+	 * @return the value of the '<em>Owner</em>' container reference.

+	 * @see #setOwner(ElementTypes)

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getElementType_Owner()

+	 * @see org.eclipse.papyrus.domaincontextcodegen.ElementTypes#getTypes

+	 * @model opposite="types" transient="false"

 	 * @generated

 	 */

-	ElementType getSpecializationof();

+	ElementTypes getOwner();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.ElementType#getSpecializationof <em>Specializationof</em>}' reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.ElementType#getOwner <em>Owner</em>}' container reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @param value

-	 *        the new value of the '<em>Specializationof</em>' reference.

-	 * @see #getSpecializationof()

+	 *        the new value of the '<em>Owner</em>' container reference.

+	 * @see #getOwner()

 	 * @generated

 	 */

-	void setSpecializationof(ElementType value);

+	void setOwner(ElementTypes value);

 

 	/**

-	 * Returns the value of the '<em><b>Specialization IDof</b></em>' attribute.

+	 * Returns the value of the '<em><b>Icon</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Specialization IDof</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>Specialization IDof</em>' attribute.

-	 * @see #setSpecializationIDof(String)

-	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getElementType_SpecializationIDof()

+	 * @return the value of the '<em>Icon</em>' attribute.

+	 * @see #setIcon(String)

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getElementType_Icon()

 	 * @model

 	 * @generated

 	 */

-	String getSpecializationIDof();

+	String getIcon();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.ElementType#getSpecializationIDof <em>Specialization IDof</em>}'

-	 * attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.ElementType#getIcon <em>Icon</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

 	 * @param value

-	 *        the new value of the '<em>Specialization IDof</em>' attribute.

-	 * @see #getSpecializationIDof()

+	 *        the new value of the '<em>Icon</em>' attribute.

+	 * @see #getIcon()

 	 * @generated

 	 */

-	void setSpecializationIDof(String value);

+	void setIcon(String value);

 

 } // ElementType

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/ElementTypeBinding.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/ElementTypeBinding.java
new file mode 100644
index 00000000000..a89f734c158
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/ElementTypeBinding.java
@@ -0,0 +1,55 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.domaincontextcodegen;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Element Type Binding</b></em>'.

+ * <!-- end-user-doc -->

+ * 

+ * <p>

+ * The following features are supported:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.ElementTypeBinding#getRef <em>Ref</em>}</li>

+ * </ul>

+ * </p>

+ * 

+ * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getElementTypeBinding()

+ * @model

+ * @generated

+ */

+public interface ElementTypeBinding extends Binding {

+

+	/**

+	 * Returns the value of the '<em><b>Ref</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Ref</em>' reference isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the value of the '<em>Ref</em>' reference.

+	 * @see #setRef(ElementType)

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getElementTypeBinding_Ref()

+	 * @model

+	 * @generated

+	 */

+	ElementType getRef();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.ElementTypeBinding#getRef <em>Ref</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Ref</em>' reference.

+	 * @see #getRef()

+	 * @generated

+	 */

+	void setRef(ElementType value);

+

+} // ElementTypeBinding

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/ElementTypeBindings.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/ElementTypeBindings.java
new file mode 100644
index 00000000000..0184a6522f7
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/ElementTypeBindings.java
@@ -0,0 +1,78 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.domaincontextcodegen;

+

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.emf.ecore.EObject;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Element Type Bindings</b></em>'.

+ * <!-- end-user-doc -->

+ * 

+ * <p>

+ * The following features are supported:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.ElementTypeBindings#getClientContextID <em>Client Context ID</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.ElementTypeBindings#getBindings <em>Bindings</em>}</li>

+ * </ul>

+ * </p>

+ * 

+ * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getElementTypeBindings()

+ * @model

+ * @generated

+ */

+public interface ElementTypeBindings extends EObject {

+

+	/**

+	 * Returns the value of the '<em><b>Client Context ID</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Client Context ID</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the value of the '<em>Client Context ID</em>' attribute.

+	 * @see #setClientContextID(String)

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getElementTypeBindings_ClientContextID()

+	 * @model

+	 * @generated

+	 */

+	String getClientContextID();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.ElementTypeBindings#getClientContextID <em>Client Context ID</em>}'

+	 * attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Client Context ID</em>' attribute.

+	 * @see #getClientContextID()

+	 * @generated

+	 */

+	void setClientContextID(String value);

+

+	/**

+	 * Returns the value of the '<em><b>Bindings</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.domaincontextcodegen.Binding}.

+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.domaincontextcodegen.Binding#getOwner <em>Owner</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Bindings</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>Bindings</em>' containment reference list.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getElementTypeBindings_Bindings()

+	 * @see org.eclipse.papyrus.domaincontextcodegen.Binding#getOwner

+	 * @model opposite="owner" containment="true"

+	 * @generated

+	 */

+	EList<Binding> getBindings();

+

+} // ElementTypeBindings

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/ElementTypes.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/ElementTypes.java
index 65203f4edae..4b89dae0f5e 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/ElementTypes.java
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/ElementTypes.java
@@ -18,6 +18,7 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:

  * <ul>

  * <li>{@link org.eclipse.papyrus.domaincontextcodegen.ElementTypes#getTypes <em>Types</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.ElementTypes#getDomain <em>Domain</em>}</li>

  * </ul>

  * </p>

  * 

@@ -30,6 +31,7 @@ public interface ElementTypes extends EObject {
 	/**

 	 * Returns the value of the '<em><b>Types</b></em>' containment reference list.

 	 * The list contents are of type {@link org.eclipse.papyrus.domaincontextcodegen.ElementType}.

+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.domaincontextcodegen.ElementType#getOwner <em>Owner</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <p>

 	 * If the meaning of the '<em>Types</em>' containment reference list isn't clear, there really should be more of a description here...

@@ -38,9 +40,41 @@ public interface ElementTypes extends EObject {
 	 * 

 	 * @return the value of the '<em>Types</em>' containment reference list.

 	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getElementTypes_Types()

-	 * @model containment="true"

+	 * @see org.eclipse.papyrus.domaincontextcodegen.ElementType#getOwner

+	 * @model opposite="owner" containment="true"

 	 * @generated

 	 */

 	EList<ElementType> getTypes();

 

+	/**

+	 * Returns the value of the '<em><b>Domain</b></em>' container reference.

+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.domaincontextcodegen.DomainContext#getElementTypes <em>Element Types</em>}

+	 * '.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Domain</em>' container reference isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the value of the '<em>Domain</em>' container reference.

+	 * @see #setDomain(DomainContext)

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getElementTypes_Domain()

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomainContext#getElementTypes

+	 * @model opposite="elementTypes" transient="false"

+	 * @generated

+	 */

+	DomainContext getDomain();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.ElementTypes#getDomain <em>Domain</em>}' container reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Domain</em>' container reference.

+	 * @see #getDomain()

+	 * @generated

+	 */

+	void setDomain(DomainContext value);

+

 } // ElementTypes

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/GenHandlers.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/GenHandlers.java
index 3a334422512..58c6aebb46f 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/GenHandlers.java
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/GenHandlers.java
@@ -6,6 +6,7 @@
  */

 package org.eclipse.papyrus.domaincontextcodegen;

 

+import org.eclipse.emf.common.util.EList;

 import org.eclipse.emf.ecore.EObject;

 

 /**

@@ -21,6 +22,9 @@ import org.eclipse.emf.ecore.EObject;
  * <li>{@link org.eclipse.papyrus.domaincontextcodegen.GenHandlers#getSuperClassPackage <em>Super Class Package</em>}</li>

  * <li>{@link org.eclipse.papyrus.domaincontextcodegen.GenHandlers#getElementTypeEnumerator <em>Element Type Enumerator</em>}</li>

  * <li>{@link org.eclipse.papyrus.domaincontextcodegen.GenHandlers#getElementTypeEnumeratorPackage <em>Element Type Enumerator Package</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.GenHandlers#getVisibleCreateChildHandlers <em>Visible Create Child Handlers</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.GenHandlers#getParentDomainCreateChild <em>Parent Domain Create Child</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.GenHandlers#getCreateChildMenuLocationURI <em>Create Child Menu Location URI</em>}</li>

  * </ul>

  * </p>

  * 

@@ -173,4 +177,65 @@ public interface GenHandlers extends EObject {
 	 */

 	void setElementTypeEnumeratorPackage(String value);

 

+	/**

+	 * Returns the value of the '<em><b>Visible Create Child Handlers</b></em>' reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.domaincontextcodegen.ElementType}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Visible Create Child Handlers</em>' reference list isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the value of the '<em>Visible Create Child Handlers</em>' reference list.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getGenHandlers_VisibleCreateChildHandlers()

+	 * @model

+	 * @generated

+	 */

+	EList<ElementType> getVisibleCreateChildHandlers();

+

+	/**

+	 * Returns the value of the '<em><b>Parent Domain Create Child</b></em>' reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.domaincontextcodegen.ElementType}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Parent Domain Create Child</em>' reference list isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the value of the '<em>Parent Domain Create Child</em>' reference list.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getGenHandlers_ParentDomainCreateChild()

+	 * @model

+	 * @generated

+	 */

+	EList<ElementType> getParentDomainCreateChild();

+

+	/**

+	 * Returns the value of the '<em><b>Create Child Menu Location URI</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Create Child Menu Location URI</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the value of the '<em>Create Child Menu Location URI</em>' attribute.

+	 * @see #setCreateChildMenuLocationURI(String)

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getGenHandlers_CreateChildMenuLocationURI()

+	 * @model

+	 * @generated

+	 */

+	String getCreateChildMenuLocationURI();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.GenHandlers#getCreateChildMenuLocationURI

+	 * <em>Create Child Menu Location URI</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Create Child Menu Location URI</em>' attribute.

+	 * @see #getCreateChildMenuLocationURI()

+	 * @generated

+	 */

+	void setCreateChildMenuLocationURI(String value);

+

 } // GenHandlers

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/GenHelper.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/GenHelper.java
new file mode 100644
index 00000000000..72defc734f9
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/GenHelper.java
@@ -0,0 +1,57 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.domaincontextcodegen;

+

+import org.eclipse.emf.ecore.EObject;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Gen Helper</b></em>'.

+ * <!-- end-user-doc -->

+ * 

+ * <p>

+ * The following features are supported:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.GenHelper#getName <em>Name</em>}</li>

+ * </ul>

+ * </p>

+ * 

+ * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getGenHelper()

+ * @model abstract="true"

+ * @generated

+ */

+public interface GenHelper extends EObject {

+

+	/**

+	 * Returns the value of the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the value of the '<em>Name</em>' attribute.

+	 * @see #setName(String)

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getGenHelper_Name()

+	 * @model

+	 * @generated

+	 */

+	String getName();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.GenHelper#getName <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Name</em>' attribute.

+	 * @see #getName()

+	 * @generated

+	 */

+	void setName(String value);

+

+} // GenHelper

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/GenMatcher.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/GenMatcher.java
new file mode 100644
index 00000000000..8814df5b960
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/GenMatcher.java
@@ -0,0 +1,57 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.domaincontextcodegen;

+

+import org.eclipse.emf.ecore.EObject;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Gen Matcher</b></em>'.

+ * <!-- end-user-doc -->

+ * 

+ * <p>

+ * The following features are supported:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.GenMatcher#getName <em>Name</em>}</li>

+ * </ul>

+ * </p>

+ * 

+ * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getGenMatcher()

+ * @model abstract="true"

+ * @generated

+ */

+public interface GenMatcher extends EObject {

+

+	/**

+	 * Returns the value of the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the value of the '<em>Name</em>' attribute.

+	 * @see #setName(String)

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getGenMatcher_Name()

+	 * @model

+	 * @generated

+	 */

+	String getName();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.GenMatcher#getName <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Name</em>' attribute.

+	 * @see #getName()

+	 * @generated

+	 */

+	void setName(String value);

+

+} // GenMatcher

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/MenuDeclaration.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/MenuDeclaration.java
new file mode 100644
index 00000000000..c9222c74a45
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/MenuDeclaration.java
@@ -0,0 +1,75 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.domaincontextcodegen;

+

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.emf.ecore.EObject;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Menu Declaration</b></em>'.

+ * <!-- end-user-doc -->

+ * 

+ * <p>

+ * The following features are supported:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.MenuDeclaration#getLocationURI <em>Location URI</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.MenuDeclaration#getCommands <em>Commands</em>}</li>

+ * </ul>

+ * </p>

+ * 

+ * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getMenuDeclaration()

+ * @model

+ * @generated

+ */

+public interface MenuDeclaration extends EObject {

+

+	/**

+	 * Returns the value of the '<em><b>Location URI</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Location URI</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the value of the '<em>Location URI</em>' attribute.

+	 * @see #setLocationURI(String)

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getMenuDeclaration_LocationURI()

+	 * @model

+	 * @generated

+	 */

+	String getLocationURI();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.MenuDeclaration#getLocationURI <em>Location URI</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Location URI</em>' attribute.

+	 * @see #getLocationURI()

+	 * @generated

+	 */

+	void setLocationURI(String value);

+

+	/**

+	 * Returns the value of the '<em><b>Commands</b></em>' reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.domaincontextcodegen.Command}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Commands</em>' reference list isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the value of the '<em>Commands</em>' reference list.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getMenuDeclaration_Commands()

+	 * @model

+	 * @generated

+	 */

+	EList<Command> getCommands();

+

+} // MenuDeclaration

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/MetaClassType.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/MetaClassType.java
new file mode 100644
index 00000000000..814872a62e3
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/MetaClassType.java
@@ -0,0 +1,57 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.domaincontextcodegen;

+

+import org.eclipse.emf.ecore.EClass;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Meta Class Type</b></em>'.

+ * <!-- end-user-doc -->

+ * 

+ * <p>

+ * The following features are supported:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.MetaClassType#getMetaClass <em>Meta Class</em>}</li>

+ * </ul>

+ * </p>

+ * 

+ * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getMetaClassType()

+ * @model

+ * @generated

+ */

+public interface MetaClassType extends ElementType {

+

+	/**

+	 * Returns the value of the '<em><b>Meta Class</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Meta Class</em>' reference isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the value of the '<em>Meta Class</em>' reference.

+	 * @see #setMetaClass(EClass)

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getMetaClassType_MetaClass()

+	 * @model required="true"

+	 * @generated

+	 */

+	EClass getMetaClass();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.MetaClassType#getMetaClass <em>Meta Class</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Meta Class</em>' reference.

+	 * @see #getMetaClass()

+	 * @generated

+	 */

+	void setMetaClass(EClass value);

+

+} // MetaClassType

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/SpecializationType.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/SpecializationType.java
new file mode 100644
index 00000000000..fae5f6d3519
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/SpecializationType.java
@@ -0,0 +1,144 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.domaincontextcodegen;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Specialization Type</b></em>'.

+ * <!-- end-user-doc -->

+ * 

+ * <p>

+ * The following features are supported:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.SpecializationType#getRef <em>Ref</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.SpecializationType#getMatcher <em>Matcher</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.SpecializationType#getGenMatcher <em>Gen Matcher</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.SpecializationType#getGenHelper <em>Gen Helper</em>}</li>

+ * </ul>

+ * </p>

+ * 

+ * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getSpecializationType()

+ * @model

+ * @generated

+ */

+public interface SpecializationType extends ElementType {

+

+	/**

+	 * Returns the value of the '<em><b>Ref</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Ref</em>' reference isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the value of the '<em>Ref</em>' reference.

+	 * @see #setRef(ElementType)

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getSpecializationType_Ref()

+	 * @model

+	 * @generated

+	 */

+	ElementType getRef();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.SpecializationType#getRef <em>Ref</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Ref</em>' reference.

+	 * @see #getRef()

+	 * @generated

+	 */

+	void setRef(ElementType value);

+

+	/**

+	 * Returns the value of the '<em><b>Matcher</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Matcher</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the value of the '<em>Matcher</em>' attribute.

+	 * @see #setMatcher(String)

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getSpecializationType_Matcher()

+	 * @model

+	 * @generated

+	 */

+	String getMatcher();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.SpecializationType#getMatcher <em>Matcher</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Matcher</em>' attribute.

+	 * @see #getMatcher()

+	 * @generated

+	 */

+	void setMatcher(String value);

+

+	/**

+	 * Returns the value of the '<em><b>Gen Matcher</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Gen Matcher</em>' containment reference isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the value of the '<em>Gen Matcher</em>' containment reference.

+	 * @see #setGenMatcher(GenMatcher)

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getSpecializationType_GenMatcher()

+	 * @model containment="true"

+	 * @generated

+	 */

+	GenMatcher getGenMatcher();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.SpecializationType#getGenMatcher <em>Gen Matcher</em>}' containment

+	 * reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Gen Matcher</em>' containment reference.

+	 * @see #getGenMatcher()

+	 * @generated

+	 */

+	void setGenMatcher(GenMatcher value);

+

+	/**

+	 * Returns the value of the '<em><b>Gen Helper</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Gen Helper</em>' containment reference isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the value of the '<em>Gen Helper</em>' containment reference.

+	 * @see #setGenHelper(GenHelper)

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getSpecializationType_GenHelper()

+	 * @model containment="true"

+	 * @generated

+	 */

+	GenHelper getGenHelper();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.SpecializationType#getGenHelper <em>Gen Helper</em>}' containment

+	 * reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Gen Helper</em>' containment reference.

+	 * @see #getGenHelper()

+	 * @generated

+	 */

+	void setGenHelper(GenHelper value);

+

+} // SpecializationType

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/StereotypedElementHelper.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/StereotypedElementHelper.java
new file mode 100644
index 00000000000..1ee8a53df29
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/StereotypedElementHelper.java
@@ -0,0 +1,146 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.domaincontextcodegen;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Stereotyped Element Helper</b></em>'.

+ * <!-- end-user-doc -->

+ * 

+ * <p>

+ * The following features are supported:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.StereotypedElementHelper#getStereotypeName <em>Stereotype Name</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.StereotypedElementHelper#getStereotypePackage <em>Stereotype Package</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.StereotypedElementHelper#getBaseElementName <em>Base Element Name</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.StereotypedElementHelper#getBaseElementPackage <em>Base Element Package</em>}</li>

+ * </ul>

+ * </p>

+ * 

+ * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getStereotypedElementHelper()

+ * @model

+ * @generated

+ */

+public interface StereotypedElementHelper extends GenHelper {

+

+	/**

+	 * Returns the value of the '<em><b>Stereotype Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Stereotype Name</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the value of the '<em>Stereotype Name</em>' attribute.

+	 * @see #setStereotypeName(String)

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getStereotypedElementHelper_StereotypeName()

+	 * @model

+	 * @generated

+	 */

+	String getStereotypeName();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.StereotypedElementHelper#getStereotypeName <em>Stereotype Name</em>}'

+	 * attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Stereotype Name</em>' attribute.

+	 * @see #getStereotypeName()

+	 * @generated

+	 */

+	void setStereotypeName(String value);

+

+	/**

+	 * Returns the value of the '<em><b>Stereotype Package</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Stereotype Package</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the value of the '<em>Stereotype Package</em>' attribute.

+	 * @see #setStereotypePackage(String)

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getStereotypedElementHelper_StereotypePackage()

+	 * @model

+	 * @generated

+	 */

+	String getStereotypePackage();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.StereotypedElementHelper#getStereotypePackage

+	 * <em>Stereotype Package</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Stereotype Package</em>' attribute.

+	 * @see #getStereotypePackage()

+	 * @generated

+	 */

+	void setStereotypePackage(String value);

+

+	/**

+	 * Returns the value of the '<em><b>Base Element Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Base Element Name</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the value of the '<em>Base Element Name</em>' attribute.

+	 * @see #setBaseElementName(String)

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getStereotypedElementHelper_BaseElementName()

+	 * @model

+	 * @generated

+	 */

+	String getBaseElementName();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.StereotypedElementHelper#getBaseElementName <em>Base Element Name</em>}'

+	 * attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Base Element Name</em>' attribute.

+	 * @see #getBaseElementName()

+	 * @generated

+	 */

+	void setBaseElementName(String value);

+

+	/**

+	 * Returns the value of the '<em><b>Base Element Package</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Base Element Package</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the value of the '<em>Base Element Package</em>' attribute.

+	 * @see #setBaseElementPackage(String)

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getStereotypedElementHelper_BaseElementPackage()

+	 * @model

+	 * @generated

+	 */

+	String getBaseElementPackage();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.StereotypedElementHelper#getBaseElementPackage

+	 * <em>Base Element Package</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Base Element Package</em>' attribute.

+	 * @see #getBaseElementPackage()

+	 * @generated

+	 */

+	void setBaseElementPackage(String value);

+

+} // StereotypedElementHelper

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/StereotypedElementMatcher.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/StereotypedElementMatcher.java
new file mode 100644
index 00000000000..90c8aa43382
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/StereotypedElementMatcher.java
@@ -0,0 +1,146 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.domaincontextcodegen;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Stereotyped Element Matcher</b></em>'.

+ * <!-- end-user-doc -->

+ * 

+ * <p>

+ * The following features are supported:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.StereotypedElementMatcher#getStereotypeName <em>Stereotype Name</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.StereotypedElementMatcher#getStereotypePackage <em>Stereotype Package</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.StereotypedElementMatcher#getBaseElementName <em>Base Element Name</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.StereotypedElementMatcher#getBaseElementPackage <em>Base Element Package</em>}</li>

+ * </ul>

+ * </p>

+ * 

+ * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getStereotypedElementMatcher()

+ * @model

+ * @generated

+ */

+public interface StereotypedElementMatcher extends GenMatcher {

+

+	/**

+	 * Returns the value of the '<em><b>Stereotype Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Stereotype Name</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the value of the '<em>Stereotype Name</em>' attribute.

+	 * @see #setStereotypeName(String)

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getStereotypedElementMatcher_StereotypeName()

+	 * @model

+	 * @generated

+	 */

+	String getStereotypeName();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.StereotypedElementMatcher#getStereotypeName <em>Stereotype Name</em>}'

+	 * attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Stereotype Name</em>' attribute.

+	 * @see #getStereotypeName()

+	 * @generated

+	 */

+	void setStereotypeName(String value);

+

+	/**

+	 * Returns the value of the '<em><b>Stereotype Package</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Stereotype Package</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the value of the '<em>Stereotype Package</em>' attribute.

+	 * @see #setStereotypePackage(String)

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getStereotypedElementMatcher_StereotypePackage()

+	 * @model

+	 * @generated

+	 */

+	String getStereotypePackage();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.StereotypedElementMatcher#getStereotypePackage

+	 * <em>Stereotype Package</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Stereotype Package</em>' attribute.

+	 * @see #getStereotypePackage()

+	 * @generated

+	 */

+	void setStereotypePackage(String value);

+

+	/**

+	 * Returns the value of the '<em><b>Base Element Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Base Element Name</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the value of the '<em>Base Element Name</em>' attribute.

+	 * @see #setBaseElementName(String)

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getStereotypedElementMatcher_BaseElementName()

+	 * @model

+	 * @generated

+	 */

+	String getBaseElementName();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.StereotypedElementMatcher#getBaseElementName <em>Base Element Name</em>}

+	 * ' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Base Element Name</em>' attribute.

+	 * @see #getBaseElementName()

+	 * @generated

+	 */

+	void setBaseElementName(String value);

+

+	/**

+	 * Returns the value of the '<em><b>Base Element Package</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Base Element Package</em>' attribute isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the value of the '<em>Base Element Package</em>' attribute.

+	 * @see #setBaseElementPackage(String)

+	 * @see org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage#getStereotypedElementMatcher_BaseElementPackage()

+	 * @model

+	 * @generated

+	 */

+	String getBaseElementPackage();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.domaincontextcodegen.StereotypedElementMatcher#getBaseElementPackage

+	 * <em>Base Element Package</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Base Element Package</em>' attribute.

+	 * @see #getBaseElementPackage()

+	 * @generated

+	 */

+	void setBaseElementPackage(String value);

+

+} // StereotypedElementMatcher

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/AdviceBindingImpl.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/AdviceBindingImpl.java
index 08c344c4367..c0c2915ec09 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/AdviceBindingImpl.java
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/AdviceBindingImpl.java
@@ -10,11 +10,9 @@ 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.emf.ecore.impl.EObjectImpl;

+import org.eclipse.papyrus.domaincontextcodegen.Advice;

 import org.eclipse.papyrus.domaincontextcodegen.AdviceBinding;

 import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage;

-import org.eclipse.papyrus.domaincontextcodegen.ElementType;

-import org.eclipse.papyrus.domaincontextcodegen.InheritanceKind;

 

 /**

  * <!-- begin-user-doc -->

@@ -23,116 +21,24 @@ import org.eclipse.papyrus.domaincontextcodegen.InheritanceKind;
  * <p>

  * The following features are implemented:

  * <ul>

- * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.AdviceBindingImpl#getAdvicePath <em>Advice Path</em>}</li>

- * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.AdviceBindingImpl#getAdviceID <em>Advice ID</em>}</li>

- * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.AdviceBindingImpl#getInheritance <em>Inheritance</em>}</li>

- * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.AdviceBindingImpl#getElementTypeRef <em>Element Type Ref</em>}</li>

- * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.AdviceBindingImpl#getElementTypeIDref <em>Element Type IDref</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.AdviceBindingImpl#getRef <em>Ref</em>}</li>

  * </ul>

  * </p>

  * 

  * @generated

  */

-public class AdviceBindingImpl extends EObjectImpl implements AdviceBinding {

+public class AdviceBindingImpl extends BindingImpl implements AdviceBinding {

 

 	/**

-	 * The default value of the '{@link #getAdvicePath() <em>Advice Path</em>}' attribute.

+	 * The cached value of the '{@link #getRef() <em>Ref</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

-	 * @see #getAdvicePath()

+	 * @see #getRef()

 	 * @generated

 	 * @ordered

 	 */

-	protected static final String ADVICE_PATH_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getAdvicePath() <em>Advice Path</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getAdvicePath()

-	 * @generated

-	 * @ordered

-	 */

-	protected String advicePath = ADVICE_PATH_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getAdviceID() <em>Advice ID</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getAdviceID()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String ADVICE_ID_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getAdviceID() <em>Advice ID</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getAdviceID()

-	 * @generated

-	 * @ordered

-	 */

-	protected String adviceID = ADVICE_ID_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getInheritance() <em>Inheritance</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getInheritance()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final InheritanceKind INHERITANCE_EDEFAULT = InheritanceKind.NONE;

-

-	/**

-	 * The cached value of the '{@link #getInheritance() <em>Inheritance</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getInheritance()

-	 * @generated

-	 * @ordered

-	 */

-	protected InheritanceKind inheritance = INHERITANCE_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getElementTypeRef() <em>Element Type Ref</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getElementTypeRef()

-	 * @generated

-	 * @ordered

-	 */

-	protected ElementType elementTypeRef;

-

-	/**

-	 * The default value of the '{@link #getElementTypeIDref() <em>Element Type IDref</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getElementTypeIDref()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String ELEMENT_TYPE_IDREF_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getElementTypeIDref() <em>Element Type IDref</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getElementTypeIDref()

-	 * @generated

-	 * @ordered

-	 */

-	protected String elementTypeIDref = ELEMENT_TYPE_IDREF_EDEFAULT;

+	protected Advice ref;

 

 	/**

 	 * <!-- begin-user-doc -->

@@ -161,108 +67,16 @@ public class AdviceBindingImpl extends EObjectImpl implements AdviceBinding {
 	 * 

 	 * @generated

 	 */

-	public String getAdvicePath() {

-		return advicePath;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setAdvicePath(String newAdvicePath) {

-		String oldAdvicePath = advicePath;

-		advicePath = newAdvicePath;

-		if(eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.ADVICE_BINDING__ADVICE_PATH, oldAdvicePath, advicePath));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public String getAdviceID() {

-		return adviceID;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setAdviceID(String newAdviceID) {

-		String oldAdviceID = adviceID;

-		adviceID = newAdviceID;

-		if(eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.ADVICE_BINDING__ADVICE_ID, oldAdviceID, adviceID));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public InheritanceKind getInheritance() {

-		return inheritance;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setInheritance(InheritanceKind newInheritance) {

-		InheritanceKind oldInheritance = inheritance;

-		inheritance = newInheritance == null ? INHERITANCE_EDEFAULT : newInheritance;

-		if(eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.ADVICE_BINDING__INHERITANCE, oldInheritance, inheritance));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public ElementType getElementTypeRef() {

-		if(elementTypeRef != null && elementTypeRef.eIsProxy()) {

-			InternalEObject oldElementTypeRef = (InternalEObject)elementTypeRef;

-			elementTypeRef = (ElementType)eResolveProxy(oldElementTypeRef);

-			if(elementTypeRef != oldElementTypeRef) {

+	public Advice getRef() {

+		if(ref != null && ref.eIsProxy()) {

+			InternalEObject oldRef = (InternalEObject)ref;

+			ref = (Advice)eResolveProxy(oldRef);

+			if(ref != oldRef) {

 				if(eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DomaincontextcodegenPackage.ADVICE_BINDING__ELEMENT_TYPE_REF, oldElementTypeRef, elementTypeRef));

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DomaincontextcodegenPackage.ADVICE_BINDING__REF, oldRef, ref));

 			}

 		}

-		return elementTypeRef;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public ElementType basicGetElementTypeRef() {

-		return elementTypeRef;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setElementTypeRef(ElementType newElementTypeRef) {

-		ElementType oldElementTypeRef = elementTypeRef;

-		elementTypeRef = newElementTypeRef;

-		if(eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.ADVICE_BINDING__ELEMENT_TYPE_REF, oldElementTypeRef, elementTypeRef));

+		return ref;

 	}

 

 	/**

@@ -271,8 +85,8 @@ public class AdviceBindingImpl extends EObjectImpl implements AdviceBinding {
 	 * 

 	 * @generated

 	 */

-	public String getElementTypeIDref() {

-		return elementTypeIDref;

+	public Advice basicGetRef() {

+		return ref;

 	}

 

 	/**

@@ -281,11 +95,11 @@ public class AdviceBindingImpl extends EObjectImpl implements AdviceBinding {
 	 * 

 	 * @generated

 	 */

-	public void setElementTypeIDref(String newElementTypeIDref) {

-		String oldElementTypeIDref = elementTypeIDref;

-		elementTypeIDref = newElementTypeIDref;

+	public void setRef(Advice newRef) {

+		Advice oldRef = ref;

+		ref = newRef;

 		if(eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.ADVICE_BINDING__ELEMENT_TYPE_IDREF, oldElementTypeIDref, elementTypeIDref));

+			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.ADVICE_BINDING__REF, oldRef, ref));

 	}

 

 	/**

@@ -297,18 +111,10 @@ public class AdviceBindingImpl extends EObjectImpl implements AdviceBinding {
 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

 		switch(featureID) {

-		case DomaincontextcodegenPackage.ADVICE_BINDING__ADVICE_PATH:

-			return getAdvicePath();

-		case DomaincontextcodegenPackage.ADVICE_BINDING__ADVICE_ID:

-			return getAdviceID();

-		case DomaincontextcodegenPackage.ADVICE_BINDING__INHERITANCE:

-			return getInheritance();

-		case DomaincontextcodegenPackage.ADVICE_BINDING__ELEMENT_TYPE_REF:

+		case DomaincontextcodegenPackage.ADVICE_BINDING__REF:

 			if(resolve)

-				return getElementTypeRef();

-			return basicGetElementTypeRef();

-		case DomaincontextcodegenPackage.ADVICE_BINDING__ELEMENT_TYPE_IDREF:

-			return getElementTypeIDref();

+				return getRef();

+			return basicGetRef();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -322,20 +128,8 @@ public class AdviceBindingImpl extends EObjectImpl implements AdviceBinding {
 	@Override

 	public void eSet(int featureID, Object newValue) {

 		switch(featureID) {

-		case DomaincontextcodegenPackage.ADVICE_BINDING__ADVICE_PATH:

-			setAdvicePath((String)newValue);

-			return;

-		case DomaincontextcodegenPackage.ADVICE_BINDING__ADVICE_ID:

-			setAdviceID((String)newValue);

-			return;

-		case DomaincontextcodegenPackage.ADVICE_BINDING__INHERITANCE:

-			setInheritance((InheritanceKind)newValue);

-			return;

-		case DomaincontextcodegenPackage.ADVICE_BINDING__ELEMENT_TYPE_REF:

-			setElementTypeRef((ElementType)newValue);

-			return;

-		case DomaincontextcodegenPackage.ADVICE_BINDING__ELEMENT_TYPE_IDREF:

-			setElementTypeIDref((String)newValue);

+		case DomaincontextcodegenPackage.ADVICE_BINDING__REF:

+			setRef((Advice)newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -350,20 +144,8 @@ public class AdviceBindingImpl extends EObjectImpl implements AdviceBinding {
 	@Override

 	public void eUnset(int featureID) {

 		switch(featureID) {

-		case DomaincontextcodegenPackage.ADVICE_BINDING__ADVICE_PATH:

-			setAdvicePath(ADVICE_PATH_EDEFAULT);

-			return;

-		case DomaincontextcodegenPackage.ADVICE_BINDING__ADVICE_ID:

-			setAdviceID(ADVICE_ID_EDEFAULT);

-			return;

-		case DomaincontextcodegenPackage.ADVICE_BINDING__INHERITANCE:

-			setInheritance(INHERITANCE_EDEFAULT);

-			return;

-		case DomaincontextcodegenPackage.ADVICE_BINDING__ELEMENT_TYPE_REF:

-			setElementTypeRef((ElementType)null);

-			return;

-		case DomaincontextcodegenPackage.ADVICE_BINDING__ELEMENT_TYPE_IDREF:

-			setElementTypeIDref(ELEMENT_TYPE_IDREF_EDEFAULT);

+		case DomaincontextcodegenPackage.ADVICE_BINDING__REF:

+			setRef((Advice)null);

 			return;

 		}

 		super.eUnset(featureID);

@@ -378,42 +160,10 @@ public class AdviceBindingImpl extends EObjectImpl implements AdviceBinding {
 	@Override

 	public boolean eIsSet(int featureID) {

 		switch(featureID) {

-		case DomaincontextcodegenPackage.ADVICE_BINDING__ADVICE_PATH:

-			return ADVICE_PATH_EDEFAULT == null ? advicePath != null : !ADVICE_PATH_EDEFAULT.equals(advicePath);

-		case DomaincontextcodegenPackage.ADVICE_BINDING__ADVICE_ID:

-			return ADVICE_ID_EDEFAULT == null ? adviceID != null : !ADVICE_ID_EDEFAULT.equals(adviceID);

-		case DomaincontextcodegenPackage.ADVICE_BINDING__INHERITANCE:

-			return inheritance != INHERITANCE_EDEFAULT;

-		case DomaincontextcodegenPackage.ADVICE_BINDING__ELEMENT_TYPE_REF:

-			return elementTypeRef != null;

-		case DomaincontextcodegenPackage.ADVICE_BINDING__ELEMENT_TYPE_IDREF:

-			return ELEMENT_TYPE_IDREF_EDEFAULT == null ? elementTypeIDref != null : !ELEMENT_TYPE_IDREF_EDEFAULT.equals(elementTypeIDref);

+		case DomaincontextcodegenPackage.ADVICE_BINDING__REF:

+			return ref != null;

 		}

 		return super.eIsSet(featureID);

 	}

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if(eIsProxy())

-			return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (advicePath: ");

-		result.append(advicePath);

-		result.append(", adviceID: ");

-		result.append(adviceID);

-		result.append(", inheritance: ");

-		result.append(inheritance);

-		result.append(", elementTypeIDref: ");

-		result.append(elementTypeIDref);

-		result.append(')');

-		return result.toString();

-	}

-

 } //AdviceBindingImpl

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/AdviceImpl.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/AdviceImpl.java
new file mode 100644
index 00000000000..028b06c2f8d
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/AdviceImpl.java
@@ -0,0 +1,361 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.domaincontextcodegen.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.emf.ecore.impl.EObjectImpl;

+import org.eclipse.papyrus.domaincontextcodegen.Advice;

+import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage;

+import org.eclipse.papyrus.domaincontextcodegen.ElementType;

+import org.eclipse.papyrus.domaincontextcodegen.InheritanceKind;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Advice</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.AdviceImpl#getAdviceID <em>Advice ID</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.AdviceImpl#getRef <em>Ref</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.AdviceImpl#getAdvicePath <em>Advice Path</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.AdviceImpl#getInheritance <em>Inheritance</em>}</li>

+ * </ul>

+ * </p>

+ * 

+ * @generated

+ */

+public class AdviceImpl extends EObjectImpl implements Advice {

+

+	/**

+	 * The default value of the '{@link #getAdviceID() <em>Advice ID</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getAdviceID()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String ADVICE_ID_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getAdviceID() <em>Advice ID</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getAdviceID()

+	 * @generated

+	 * @ordered

+	 */

+	protected String adviceID = ADVICE_ID_EDEFAULT;

+

+	/**

+	 * The cached value of the '{@link #getRef() <em>Ref</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getRef()

+	 * @generated

+	 * @ordered

+	 */

+	protected ElementType ref;

+

+	/**

+	 * The default value of the '{@link #getAdvicePath() <em>Advice Path</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getAdvicePath()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String ADVICE_PATH_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getAdvicePath() <em>Advice Path</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getAdvicePath()

+	 * @generated

+	 * @ordered

+	 */

+	protected String advicePath = ADVICE_PATH_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getInheritance() <em>Inheritance</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getInheritance()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final InheritanceKind INHERITANCE_EDEFAULT = InheritanceKind.NONE;

+

+	/**

+	 * The cached value of the '{@link #getInheritance() <em>Inheritance</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getInheritance()

+	 * @generated

+	 * @ordered

+	 */

+	protected InheritanceKind inheritance = INHERITANCE_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected AdviceImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return DomaincontextcodegenPackage.Literals.ADVICE;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public String getAdviceID() {

+		return adviceID;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public void setAdviceID(String newAdviceID) {

+		String oldAdviceID = adviceID;

+		adviceID = newAdviceID;

+		if(eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.ADVICE__ADVICE_ID, oldAdviceID, adviceID));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public ElementType getRef() {

+		if(ref != null && ref.eIsProxy()) {

+			InternalEObject oldRef = (InternalEObject)ref;

+			ref = (ElementType)eResolveProxy(oldRef);

+			if(ref != oldRef) {

+				if(eNotificationRequired())

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DomaincontextcodegenPackage.ADVICE__REF, oldRef, ref));

+			}

+		}

+		return ref;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public ElementType basicGetRef() {

+		return ref;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public void setRef(ElementType newRef) {

+		ElementType oldRef = ref;

+		ref = newRef;

+		if(eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.ADVICE__REF, oldRef, ref));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public String getAdvicePath() {

+		return advicePath;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public void setAdvicePath(String newAdvicePath) {

+		String oldAdvicePath = advicePath;

+		advicePath = newAdvicePath;

+		if(eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.ADVICE__ADVICE_PATH, oldAdvicePath, advicePath));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public InheritanceKind getInheritance() {

+		return inheritance;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public void setInheritance(InheritanceKind newInheritance) {

+		InheritanceKind oldInheritance = inheritance;

+		inheritance = newInheritance == null ? INHERITANCE_EDEFAULT : newInheritance;

+		if(eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.ADVICE__INHERITANCE, oldInheritance, inheritance));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.ADVICE__ADVICE_ID:

+			return getAdviceID();

+		case DomaincontextcodegenPackage.ADVICE__REF:

+			if(resolve)

+				return getRef();

+			return basicGetRef();

+		case DomaincontextcodegenPackage.ADVICE__ADVICE_PATH:

+			return getAdvicePath();

+		case DomaincontextcodegenPackage.ADVICE__INHERITANCE:

+			return getInheritance();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.ADVICE__ADVICE_ID:

+			setAdviceID((String)newValue);

+			return;

+		case DomaincontextcodegenPackage.ADVICE__REF:

+			setRef((ElementType)newValue);

+			return;

+		case DomaincontextcodegenPackage.ADVICE__ADVICE_PATH:

+			setAdvicePath((String)newValue);

+			return;

+		case DomaincontextcodegenPackage.ADVICE__INHERITANCE:

+			setInheritance((InheritanceKind)newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.ADVICE__ADVICE_ID:

+			setAdviceID(ADVICE_ID_EDEFAULT);

+			return;

+		case DomaincontextcodegenPackage.ADVICE__REF:

+			setRef((ElementType)null);

+			return;

+		case DomaincontextcodegenPackage.ADVICE__ADVICE_PATH:

+			setAdvicePath(ADVICE_PATH_EDEFAULT);

+			return;

+		case DomaincontextcodegenPackage.ADVICE__INHERITANCE:

+			setInheritance(INHERITANCE_EDEFAULT);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.ADVICE__ADVICE_ID:

+			return ADVICE_ID_EDEFAULT == null ? adviceID != null : !ADVICE_ID_EDEFAULT.equals(adviceID);

+		case DomaincontextcodegenPackage.ADVICE__REF:

+			return ref != null;

+		case DomaincontextcodegenPackage.ADVICE__ADVICE_PATH:

+			return ADVICE_PATH_EDEFAULT == null ? advicePath != null : !ADVICE_PATH_EDEFAULT.equals(advicePath);

+		case DomaincontextcodegenPackage.ADVICE__INHERITANCE:

+			return inheritance != INHERITANCE_EDEFAULT;

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		if(eIsProxy())

+			return super.toString();

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (adviceID: ");

+		result.append(adviceID);

+		result.append(", advicePath: ");

+		result.append(advicePath);

+		result.append(", inheritance: ");

+		result.append(inheritance);

+		result.append(')');

+		return result.toString();

+	}

+

+} //AdviceImpl

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/BindingImpl.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/BindingImpl.java
index c359f226f6d..0a407d6430c 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/BindingImpl.java
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/BindingImpl.java
@@ -7,13 +7,15 @@
 package org.eclipse.papyrus.domaincontextcodegen.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.EObjectImpl;

-import org.eclipse.papyrus.domaincontextcodegen.AdviceBinding;

+import org.eclipse.emf.ecore.util.EcoreUtil;

 import org.eclipse.papyrus.domaincontextcodegen.Binding;

 import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage;

+import org.eclipse.papyrus.domaincontextcodegen.ElementTypeBindings;

 

 /**

  * <!-- begin-user-doc -->

@@ -22,70 +24,46 @@ import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage;
  * <p>

  * The following features are implemented:

  * <ul>

- * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.BindingImpl#getAdvice <em>Advice</em>}</li>

- * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.BindingImpl#getElementTypePattern <em>Element Type Pattern</em>}</li>

- * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.BindingImpl#getAdviceID <em>Advice ID</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.BindingImpl#getOwner <em>Owner</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.BindingImpl#getPattern <em>Pattern</em>}</li>

  * </ul>

  * </p>

  * 

  * @generated

  */

-public class BindingImpl extends EObjectImpl implements Binding {

+public abstract class BindingImpl extends EObjectImpl implements Binding {

 

 	/**

-	 * The cached value of the '{@link #getAdvice() <em>Advice</em>}' reference.

+	 * The default value of the '{@link #getPattern() <em>Pattern</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

-	 * @see #getAdvice()

+	 * @see #getPattern()

 	 * @generated

 	 * @ordered

 	 */

-	protected AdviceBinding advice;

+	protected static final String PATTERN_EDEFAULT = null;

 

 	/**

-	 * The default value of the '{@link #getElementTypePattern() <em>Element Type Pattern</em>}' attribute.

+	 * The cached value of the '{@link #getPattern() <em>Pattern</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

-	 * @see #getElementTypePattern()

+	 * @see #getPattern()

 	 * @generated

 	 * @ordered

 	 */

-	protected static final String ELEMENT_TYPE_PATTERN_EDEFAULT = null;

+	protected String pattern = PATTERN_EDEFAULT;

 

 	/**

-	 * The cached value of the '{@link #getElementTypePattern() <em>Element Type Pattern</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

-	 * @see #getElementTypePattern()

 	 * @generated

-	 * @ordered

-	 */

-	protected String elementTypePattern = ELEMENT_TYPE_PATTERN_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getAdviceID() <em>Advice ID</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getAdviceID()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String ADVICE_ID_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getAdviceID() <em>Advice ID</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getAdviceID()

-	 * @generated

-	 * @ordered

 	 */

-	protected String adviceID = ADVICE_ID_EDEFAULT;

+	protected BindingImpl() {

+		super();

+	}

 

 	/**

 	 * <!-- begin-user-doc -->

@@ -93,8 +71,9 @@ public class BindingImpl extends EObjectImpl implements Binding {
 	 * 

 	 * @generated

 	 */

-	protected BindingImpl() {

-		super();

+	@Override

+	protected EClass eStaticClass() {

+		return DomaincontextcodegenPackage.Literals.BINDING;

 	}

 

 	/**

@@ -103,9 +82,10 @@ public class BindingImpl extends EObjectImpl implements Binding {
 	 * 

 	 * @generated

 	 */

-	@Override

-	protected EClass eStaticClass() {

-		return DomaincontextcodegenPackage.Literals.BINDING;

+	public ElementTypeBindings getOwner() {

+		if(eContainerFeatureID() != DomaincontextcodegenPackage.BINDING__OWNER)

+			return null;

+		return (ElementTypeBindings)eContainer();

 	}

 

 	/**

@@ -114,16 +94,9 @@ public class BindingImpl extends EObjectImpl implements Binding {
 	 * 

 	 * @generated

 	 */

-	public AdviceBinding getAdvice() {

-		if(advice != null && advice.eIsProxy()) {

-			InternalEObject oldAdvice = (InternalEObject)advice;

-			advice = (AdviceBinding)eResolveProxy(oldAdvice);

-			if(advice != oldAdvice) {

-				if(eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DomaincontextcodegenPackage.BINDING__ADVICE, oldAdvice, advice));

-			}

-		}

-		return advice;

+	public NotificationChain basicSetOwner(ElementTypeBindings newOwner, NotificationChain msgs) {

+		msgs = eBasicSetContainer((InternalEObject)newOwner, DomaincontextcodegenPackage.BINDING__OWNER, msgs);

+		return msgs;

 	}

 

 	/**

@@ -132,8 +105,20 @@ public class BindingImpl extends EObjectImpl implements Binding {
 	 * 

 	 * @generated

 	 */

-	public AdviceBinding basicGetAdvice() {

-		return advice;

+	public void setOwner(ElementTypeBindings newOwner) {

+		if(newOwner != eInternalContainer() || (eContainerFeatureID() != DomaincontextcodegenPackage.BINDING__OWNER && newOwner != null)) {

+			if(EcoreUtil.isAncestor(this, newOwner))

+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());

+			NotificationChain msgs = null;

+			if(eInternalContainer() != null)

+				msgs = eBasicRemoveFromContainer(msgs);

+			if(newOwner != null)

+				msgs = ((InternalEObject)newOwner).eInverseAdd(this, DomaincontextcodegenPackage.ELEMENT_TYPE_BINDINGS__BINDINGS, ElementTypeBindings.class, msgs);

+			msgs = basicSetOwner(newOwner, msgs);

+			if(msgs != null)

+				msgs.dispatch();

+		} else if(eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.BINDING__OWNER, newOwner, newOwner));

 	}

 

 	/**

@@ -142,11 +127,8 @@ public class BindingImpl extends EObjectImpl implements Binding {
 	 * 

 	 * @generated

 	 */

-	public void setAdvice(AdviceBinding newAdvice) {

-		AdviceBinding oldAdvice = advice;

-		advice = newAdvice;

-		if(eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.BINDING__ADVICE, oldAdvice, advice));

+	public String getPattern() {

+		return pattern;

 	}

 

 	/**

@@ -155,8 +137,11 @@ public class BindingImpl extends EObjectImpl implements Binding {
 	 * 

 	 * @generated

 	 */

-	public String getElementTypePattern() {

-		return elementTypePattern;

+	public void setPattern(String newPattern) {

+		String oldPattern = pattern;

+		pattern = newPattern;

+		if(eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.BINDING__PATTERN, oldPattern, pattern));

 	}

 

 	/**

@@ -165,11 +150,15 @@ public class BindingImpl extends EObjectImpl implements Binding {
 	 * 

 	 * @generated

 	 */

-	public void setElementTypePattern(String newElementTypePattern) {

-		String oldElementTypePattern = elementTypePattern;

-		elementTypePattern = newElementTypePattern;

-		if(eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.BINDING__ELEMENT_TYPE_PATTERN, oldElementTypePattern, elementTypePattern));

+	@Override

+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.BINDING__OWNER:

+			if(eInternalContainer() != null)

+				msgs = eBasicRemoveFromContainer(msgs);

+			return basicSetOwner((ElementTypeBindings)otherEnd, msgs);

+		}

+		return super.eInverseAdd(otherEnd, featureID, msgs);

 	}

 

 	/**

@@ -178,8 +167,13 @@ public class BindingImpl extends EObjectImpl implements Binding {
 	 * 

 	 * @generated

 	 */

-	public String getAdviceID() {

-		return adviceID;

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.BINDING__OWNER:

+			return basicSetOwner(null, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

 	}

 

 	/**

@@ -188,11 +182,13 @@ public class BindingImpl extends EObjectImpl implements Binding {
 	 * 

 	 * @generated

 	 */

-	public void setAdviceID(String newAdviceID) {

-		String oldAdviceID = adviceID;

-		adviceID = newAdviceID;

-		if(eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.BINDING__ADVICE_ID, oldAdviceID, adviceID));

+	@Override

+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {

+		switch(eContainerFeatureID()) {

+		case DomaincontextcodegenPackage.BINDING__OWNER:

+			return eInternalContainer().eInverseRemove(this, DomaincontextcodegenPackage.ELEMENT_TYPE_BINDINGS__BINDINGS, ElementTypeBindings.class, msgs);

+		}

+		return super.eBasicRemoveFromContainerFeature(msgs);

 	}

 

 	/**

@@ -204,14 +200,10 @@ public class BindingImpl extends EObjectImpl implements Binding {
 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

 		switch(featureID) {

-		case DomaincontextcodegenPackage.BINDING__ADVICE:

-			if(resolve)

-				return getAdvice();

-			return basicGetAdvice();

-		case DomaincontextcodegenPackage.BINDING__ELEMENT_TYPE_PATTERN:

-			return getElementTypePattern();

-		case DomaincontextcodegenPackage.BINDING__ADVICE_ID:

-			return getAdviceID();

+		case DomaincontextcodegenPackage.BINDING__OWNER:

+			return getOwner();

+		case DomaincontextcodegenPackage.BINDING__PATTERN:

+			return getPattern();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -225,14 +217,11 @@ public class BindingImpl extends EObjectImpl implements Binding {
 	@Override

 	public void eSet(int featureID, Object newValue) {

 		switch(featureID) {

-		case DomaincontextcodegenPackage.BINDING__ADVICE:

-			setAdvice((AdviceBinding)newValue);

+		case DomaincontextcodegenPackage.BINDING__OWNER:

+			setOwner((ElementTypeBindings)newValue);

 			return;

-		case DomaincontextcodegenPackage.BINDING__ELEMENT_TYPE_PATTERN:

-			setElementTypePattern((String)newValue);

-			return;

-		case DomaincontextcodegenPackage.BINDING__ADVICE_ID:

-			setAdviceID((String)newValue);

+		case DomaincontextcodegenPackage.BINDING__PATTERN:

+			setPattern((String)newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -247,14 +236,11 @@ public class BindingImpl extends EObjectImpl implements Binding {
 	@Override

 	public void eUnset(int featureID) {

 		switch(featureID) {

-		case DomaincontextcodegenPackage.BINDING__ADVICE:

-			setAdvice((AdviceBinding)null);

-			return;

-		case DomaincontextcodegenPackage.BINDING__ELEMENT_TYPE_PATTERN:

-			setElementTypePattern(ELEMENT_TYPE_PATTERN_EDEFAULT);

+		case DomaincontextcodegenPackage.BINDING__OWNER:

+			setOwner((ElementTypeBindings)null);

 			return;

-		case DomaincontextcodegenPackage.BINDING__ADVICE_ID:

-			setAdviceID(ADVICE_ID_EDEFAULT);

+		case DomaincontextcodegenPackage.BINDING__PATTERN:

+			setPattern(PATTERN_EDEFAULT);

 			return;

 		}

 		super.eUnset(featureID);

@@ -269,12 +255,10 @@ public class BindingImpl extends EObjectImpl implements Binding {
 	@Override

 	public boolean eIsSet(int featureID) {

 		switch(featureID) {

-		case DomaincontextcodegenPackage.BINDING__ADVICE:

-			return advice != null;

-		case DomaincontextcodegenPackage.BINDING__ELEMENT_TYPE_PATTERN:

-			return ELEMENT_TYPE_PATTERN_EDEFAULT == null ? elementTypePattern != null : !ELEMENT_TYPE_PATTERN_EDEFAULT.equals(elementTypePattern);

-		case DomaincontextcodegenPackage.BINDING__ADVICE_ID:

-			return ADVICE_ID_EDEFAULT == null ? adviceID != null : !ADVICE_ID_EDEFAULT.equals(adviceID);

+		case DomaincontextcodegenPackage.BINDING__OWNER:

+			return getOwner() != null;

+		case DomaincontextcodegenPackage.BINDING__PATTERN:

+			return PATTERN_EDEFAULT == null ? pattern != null : !PATTERN_EDEFAULT.equals(pattern);

 		}

 		return super.eIsSet(featureID);

 	}

@@ -291,10 +275,8 @@ public class BindingImpl extends EObjectImpl implements Binding {
 			return super.toString();

 

 		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (elementTypePattern: ");

-		result.append(elementTypePattern);

-		result.append(", adviceID: ");

-		result.append(adviceID);

+		result.append(" (pattern: ");

+		result.append(pattern);

 		result.append(')');

 		return result.toString();

 	}

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/CommandDeclarationImpl.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/CommandDeclarationImpl.java
new file mode 100644
index 00000000000..c1293058e3d
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/CommandDeclarationImpl.java
@@ -0,0 +1,161 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.domaincontextcodegen.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.impl.EObjectImpl;

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+import org.eclipse.papyrus.domaincontextcodegen.Command;

+import org.eclipse.papyrus.domaincontextcodegen.CommandDeclaration;

+import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Command Declaration</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.CommandDeclarationImpl#getCommands <em>Commands</em>}</li>

+ * </ul>

+ * </p>

+ * 

+ * @generated

+ */

+public class CommandDeclarationImpl extends EObjectImpl implements CommandDeclaration {

+

+	/**

+	 * The cached value of the '{@link #getCommands() <em>Commands</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getCommands()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<Command> commands;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected CommandDeclarationImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return DomaincontextcodegenPackage.Literals.COMMAND_DECLARATION;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EList<Command> getCommands() {

+		if(commands == null) {

+			commands = new EObjectContainmentEList<Command>(Command.class, this, DomaincontextcodegenPackage.COMMAND_DECLARATION__COMMANDS);

+		}

+		return commands;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.COMMAND_DECLARATION__COMMANDS:

+			return ((InternalEList<?>)getCommands()).basicRemove(otherEnd, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.COMMAND_DECLARATION__COMMANDS:

+			return getCommands();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.COMMAND_DECLARATION__COMMANDS:

+			getCommands().clear();

+			getCommands().addAll((Collection<? extends Command>)newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.COMMAND_DECLARATION__COMMANDS:

+			getCommands().clear();

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.COMMAND_DECLARATION__COMMANDS:

+			return commands != null && !commands.isEmpty();

+		}

+		return super.eIsSet(featureID);

+	}

+

+} //CommandDeclarationImpl

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/CommandImpl.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/CommandImpl.java
new file mode 100644
index 00000000000..1e16821c27b
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/CommandImpl.java
@@ -0,0 +1,244 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.domaincontextcodegen.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.emf.ecore.impl.EObjectImpl;

+import org.eclipse.papyrus.domaincontextcodegen.Command;

+import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage;

+import org.eclipse.papyrus.domaincontextcodegen.ElementType;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Command</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.CommandImpl#getElementType <em>Element Type</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.CommandImpl#getIcon <em>Icon</em>}</li>

+ * </ul>

+ * </p>

+ * 

+ * @generated

+ */

+public class CommandImpl extends EObjectImpl implements Command {

+

+	/**

+	 * The cached value of the '{@link #getElementType() <em>Element Type</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getElementType()

+	 * @generated

+	 * @ordered

+	 */

+	protected ElementType elementType;

+

+	/**

+	 * The default value of the '{@link #getIcon() <em>Icon</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getIcon()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String ICON_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getIcon() <em>Icon</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getIcon()

+	 * @generated

+	 * @ordered

+	 */

+	protected String icon = ICON_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected CommandImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return DomaincontextcodegenPackage.Literals.COMMAND;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public ElementType getElementType() {

+		if(elementType != null && elementType.eIsProxy()) {

+			InternalEObject oldElementType = (InternalEObject)elementType;

+			elementType = (ElementType)eResolveProxy(oldElementType);

+			if(elementType != oldElementType) {

+				if(eNotificationRequired())

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DomaincontextcodegenPackage.COMMAND__ELEMENT_TYPE, oldElementType, elementType));

+			}

+		}

+		return elementType;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public ElementType basicGetElementType() {

+		return elementType;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public void setElementType(ElementType newElementType) {

+		ElementType oldElementType = elementType;

+		elementType = newElementType;

+		if(eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.COMMAND__ELEMENT_TYPE, oldElementType, elementType));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public String getIcon() {

+		return icon;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public void setIcon(String newIcon) {

+		String oldIcon = icon;

+		icon = newIcon;

+		if(eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.COMMAND__ICON, oldIcon, icon));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.COMMAND__ELEMENT_TYPE:

+			if(resolve)

+				return getElementType();

+			return basicGetElementType();

+		case DomaincontextcodegenPackage.COMMAND__ICON:

+			return getIcon();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.COMMAND__ELEMENT_TYPE:

+			setElementType((ElementType)newValue);

+			return;

+		case DomaincontextcodegenPackage.COMMAND__ICON:

+			setIcon((String)newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.COMMAND__ELEMENT_TYPE:

+			setElementType((ElementType)null);

+			return;

+		case DomaincontextcodegenPackage.COMMAND__ICON:

+			setIcon(ICON_EDEFAULT);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.COMMAND__ELEMENT_TYPE:

+			return elementType != null;

+		case DomaincontextcodegenPackage.COMMAND__ICON:

+			return ICON_EDEFAULT == null ? icon != null : !ICON_EDEFAULT.equals(icon);

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		if(eIsProxy())

+			return super.toString();

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (icon: ");

+		result.append(icon);

+		result.append(')');

+		return result.toString();

+	}

+

+} //CommandImpl

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/DomainContextImpl.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/DomainContextImpl.java
index 1b4484b475c..0d78c526a65 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/DomainContextImpl.java
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/DomainContextImpl.java
@@ -18,12 +18,14 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;

 import org.eclipse.emf.ecore.util.EObjectContainmentEList;

 import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.domaincontextcodegen.AdviceBinding;

-import org.eclipse.papyrus.domaincontextcodegen.Binding;

+import org.eclipse.papyrus.domaincontextcodegen.Advice;

+import org.eclipse.papyrus.domaincontextcodegen.CommandDeclaration;

 import org.eclipse.papyrus.domaincontextcodegen.DomainContext;

 import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage;

+import org.eclipse.papyrus.domaincontextcodegen.ElementTypeBindings;

 import org.eclipse.papyrus.domaincontextcodegen.ElementTypes;

 import org.eclipse.papyrus.domaincontextcodegen.GenHandlers;

+import org.eclipse.papyrus.domaincontextcodegen.MenuDeclaration;

 

 /**

  * <!-- begin-user-doc -->

@@ -39,13 +41,14 @@ import org.eclipse.papyrus.domaincontextcodegen.GenHandlers;
  * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.DomainContextImpl#getSpecializationOf <em>Specialization Of</em>}</li>

  * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.DomainContextImpl#getElementTypeIDPrefix <em>Element Type ID Prefix</em>}</li>

  * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.DomainContextImpl#getElementTypeNamePrefix <em>Element Type Name Prefix</em>}</li>

- * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.DomainContextImpl#getMatcherPatch <em>Matcher Patch</em>}</li>

  * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.DomainContextImpl#getElementTypes <em>Element Types</em>}</li>

  * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.DomainContextImpl#getDefaultHelperPath <em>Default Helper Path</em>}</li>

- * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.DomainContextImpl#getAdvicebindings <em>Advicebindings</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.DomainContextImpl#getAdvices <em>Advices</em>}</li>

  * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.DomainContextImpl#getBindings <em>Bindings</em>}</li>

  * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.DomainContextImpl#getGenHandlers <em>Gen Handlers</em>}</li>

  * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.DomainContextImpl#getGeneratedSourceFolder <em>Generated Source Folder</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.DomainContextImpl#getMenu <em>Menu</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.DomainContextImpl#getCommand <em>Command</em>}</li>

  * </ul>

  * </p>

  * 

@@ -186,28 +189,6 @@ public class DomainContextImpl extends EObjectImpl implements DomainContext {
 	protected String elementTypeNamePrefix = ELEMENT_TYPE_NAME_PREFIX_EDEFAULT;

 

 	/**

-	 * The default value of the '{@link #getMatcherPatch() <em>Matcher Patch</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getMatcherPatch()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String MATCHER_PATCH_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getMatcherPatch() <em>Matcher Patch</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getMatcherPatch()

-	 * @generated

-	 * @ordered

-	 */

-	protected String matcherPatch = MATCHER_PATCH_EDEFAULT;

-

-	/**

 	 * The cached value of the '{@link #getElementTypes() <em>Element Types</em>}' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

@@ -241,15 +222,15 @@ public class DomainContextImpl extends EObjectImpl implements DomainContext {
 	protected String defaultHelperPath = DEFAULT_HELPER_PATH_EDEFAULT;

 

 	/**

-	 * The cached value of the '{@link #getAdvicebindings() <em>Advicebindings</em>}' containment reference list.

+	 * The cached value of the '{@link #getAdvices() <em>Advices</em>}' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

-	 * @see #getAdvicebindings()

+	 * @see #getAdvices()

 	 * @generated

 	 * @ordered

 	 */

-	protected EList<AdviceBinding> advicebindings;

+	protected EList<Advice> advices;

 

 	/**

 	 * The cached value of the '{@link #getBindings() <em>Bindings</em>}' containment reference list.

@@ -260,7 +241,7 @@ public class DomainContextImpl extends EObjectImpl implements DomainContext {
 	 * @generated

 	 * @ordered

 	 */

-	protected EList<Binding> bindings;

+	protected EList<ElementTypeBindings> bindings;

 

 	/**

 	 * The cached value of the '{@link #getGenHandlers() <em>Gen Handlers</em>}' containment reference.

@@ -296,6 +277,28 @@ public class DomainContextImpl extends EObjectImpl implements DomainContext {
 	protected String generatedSourceFolder = GENERATED_SOURCE_FOLDER_EDEFAULT;

 

 	/**

+	 * The cached value of the '{@link #getMenu() <em>Menu</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getMenu()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<MenuDeclaration> menu;

+

+	/**

+	 * The cached value of the '{@link #getCommand() <em>Command</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getCommand()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<CommandDeclaration> command;

+

+	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

@@ -519,29 +522,6 @@ public class DomainContextImpl extends EObjectImpl implements DomainContext {
 	 * 

 	 * @generated

 	 */

-	public String getMatcherPatch() {

-		return matcherPatch;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setMatcherPatch(String newMatcherPatch) {

-		String oldMatcherPatch = matcherPatch;

-		matcherPatch = newMatcherPatch;

-		if(eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.DOMAIN_CONTEXT__MATCHER_PATCH, oldMatcherPatch, matcherPatch));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

 	public ElementTypes getElementTypes() {

 		return elementTypes;

 	}

@@ -575,9 +555,9 @@ public class DomainContextImpl extends EObjectImpl implements DomainContext {
 		if(newElementTypes != elementTypes) {

 			NotificationChain msgs = null;

 			if(elementTypes != null)

-				msgs = ((InternalEObject)elementTypes).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DomaincontextcodegenPackage.DOMAIN_CONTEXT__ELEMENT_TYPES, null, msgs);

+				msgs = ((InternalEObject)elementTypes).eInverseRemove(this, DomaincontextcodegenPackage.ELEMENT_TYPES__DOMAIN, ElementTypes.class, msgs);

 			if(newElementTypes != null)

-				msgs = ((InternalEObject)newElementTypes).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DomaincontextcodegenPackage.DOMAIN_CONTEXT__ELEMENT_TYPES, null, msgs);

+				msgs = ((InternalEObject)newElementTypes).eInverseAdd(this, DomaincontextcodegenPackage.ELEMENT_TYPES__DOMAIN, ElementTypes.class, msgs);

 			msgs = basicSetElementTypes(newElementTypes, msgs);

 			if(msgs != null)

 				msgs.dispatch();

@@ -614,11 +594,11 @@ public class DomainContextImpl extends EObjectImpl implements DomainContext {
 	 * 

 	 * @generated

 	 */

-	public EList<AdviceBinding> getAdvicebindings() {

-		if(advicebindings == null) {

-			advicebindings = new EObjectContainmentEList<AdviceBinding>(AdviceBinding.class, this, DomaincontextcodegenPackage.DOMAIN_CONTEXT__ADVICEBINDINGS);

+	public EList<Advice> getAdvices() {

+		if(advices == null) {

+			advices = new EObjectContainmentEList<Advice>(Advice.class, this, DomaincontextcodegenPackage.DOMAIN_CONTEXT__ADVICES);

 		}

-		return advicebindings;

+		return advices;

 	}

 

 	/**

@@ -627,9 +607,9 @@ public class DomainContextImpl extends EObjectImpl implements DomainContext {
 	 * 

 	 * @generated

 	 */

-	public EList<Binding> getBindings() {

+	public EList<ElementTypeBindings> getBindings() {

 		if(bindings == null) {

-			bindings = new EObjectContainmentEList<Binding>(Binding.class, this, DomaincontextcodegenPackage.DOMAIN_CONTEXT__BINDINGS);

+			bindings = new EObjectContainmentEList<ElementTypeBindings>(ElementTypeBindings.class, this, DomaincontextcodegenPackage.DOMAIN_CONTEXT__BINDINGS);

 		}

 		return bindings;

 	}

@@ -712,17 +692,64 @@ public class DomainContextImpl extends EObjectImpl implements DomainContext {
 	 * 

 	 * @generated

 	 */

+	public EList<MenuDeclaration> getMenu() {

+		if(menu == null) {

+			menu = new EObjectContainmentEList<MenuDeclaration>(MenuDeclaration.class, this, DomaincontextcodegenPackage.DOMAIN_CONTEXT__MENU);

+		}

+		return menu;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EList<CommandDeclaration> getCommand() {

+		if(command == null) {

+			command = new EObjectContainmentEList<CommandDeclaration>(CommandDeclaration.class, this, DomaincontextcodegenPackage.DOMAIN_CONTEXT__COMMAND);

+		}

+		return command;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__ELEMENT_TYPES:

+			if(elementTypes != null)

+				msgs = ((InternalEObject)elementTypes).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DomaincontextcodegenPackage.DOMAIN_CONTEXT__ELEMENT_TYPES, null, msgs);

+			return basicSetElementTypes((ElementTypes)otherEnd, msgs);

+		}

+		return super.eInverseAdd(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

 	@Override

 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

 		switch(featureID) {

 		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__ELEMENT_TYPES:

 			return basicSetElementTypes(null, msgs);

-		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__ADVICEBINDINGS:

-			return ((InternalEList<?>)getAdvicebindings()).basicRemove(otherEnd, msgs);

+		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__ADVICES:

+			return ((InternalEList<?>)getAdvices()).basicRemove(otherEnd, msgs);

 		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__BINDINGS:

 			return ((InternalEList<?>)getBindings()).basicRemove(otherEnd, msgs);

 		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__GEN_HANDLERS:

 			return basicSetGenHandlers(null, msgs);

+		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__MENU:

+			return ((InternalEList<?>)getMenu()).basicRemove(otherEnd, msgs);

+		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__COMMAND:

+			return ((InternalEList<?>)getCommand()).basicRemove(otherEnd, msgs);

 		}

 		return super.eInverseRemove(otherEnd, featureID, msgs);

 	}

@@ -754,20 +781,22 @@ public class DomainContextImpl extends EObjectImpl implements DomainContext {
 			return getElementTypeIDPrefix();

 		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__ELEMENT_TYPE_NAME_PREFIX:

 			return getElementTypeNamePrefix();

-		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__MATCHER_PATCH:

-			return getMatcherPatch();

 		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__ELEMENT_TYPES:

 			return getElementTypes();

 		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__DEFAULT_HELPER_PATH:

 			return getDefaultHelperPath();

-		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__ADVICEBINDINGS:

-			return getAdvicebindings();

+		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__ADVICES:

+			return getAdvices();

 		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__BINDINGS:

 			return getBindings();

 		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__GEN_HANDLERS:

 			return getGenHandlers();

 		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__GENERATED_SOURCE_FOLDER:

 			return getGeneratedSourceFolder();

+		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__MENU:

+			return getMenu();

+		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__COMMAND:

+			return getCommand();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -803,22 +832,19 @@ public class DomainContextImpl extends EObjectImpl implements DomainContext {
 		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__ELEMENT_TYPE_NAME_PREFIX:

 			setElementTypeNamePrefix((String)newValue);

 			return;

-		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__MATCHER_PATCH:

-			setMatcherPatch((String)newValue);

-			return;

 		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__ELEMENT_TYPES:

 			setElementTypes((ElementTypes)newValue);

 			return;

 		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__DEFAULT_HELPER_PATH:

 			setDefaultHelperPath((String)newValue);

 			return;

-		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__ADVICEBINDINGS:

-			getAdvicebindings().clear();

-			getAdvicebindings().addAll((Collection<? extends AdviceBinding>)newValue);

+		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__ADVICES:

+			getAdvices().clear();

+			getAdvices().addAll((Collection<? extends Advice>)newValue);

 			return;

 		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__BINDINGS:

 			getBindings().clear();

-			getBindings().addAll((Collection<? extends Binding>)newValue);

+			getBindings().addAll((Collection<? extends ElementTypeBindings>)newValue);

 			return;

 		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__GEN_HANDLERS:

 			setGenHandlers((GenHandlers)newValue);

@@ -826,6 +852,14 @@ public class DomainContextImpl extends EObjectImpl implements DomainContext {
 		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__GENERATED_SOURCE_FOLDER:

 			setGeneratedSourceFolder((String)newValue);

 			return;

+		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__MENU:

+			getMenu().clear();

+			getMenu().addAll((Collection<? extends MenuDeclaration>)newValue);

+			return;

+		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__COMMAND:

+			getCommand().clear();

+			getCommand().addAll((Collection<? extends CommandDeclaration>)newValue);

+			return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -860,17 +894,14 @@ public class DomainContextImpl extends EObjectImpl implements DomainContext {
 		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__ELEMENT_TYPE_NAME_PREFIX:

 			setElementTypeNamePrefix(ELEMENT_TYPE_NAME_PREFIX_EDEFAULT);

 			return;

-		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__MATCHER_PATCH:

-			setMatcherPatch(MATCHER_PATCH_EDEFAULT);

-			return;

 		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__ELEMENT_TYPES:

 			setElementTypes((ElementTypes)null);

 			return;

 		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__DEFAULT_HELPER_PATH:

 			setDefaultHelperPath(DEFAULT_HELPER_PATH_EDEFAULT);

 			return;

-		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__ADVICEBINDINGS:

-			getAdvicebindings().clear();

+		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__ADVICES:

+			getAdvices().clear();

 			return;

 		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__BINDINGS:

 			getBindings().clear();

@@ -881,6 +912,12 @@ public class DomainContextImpl extends EObjectImpl implements DomainContext {
 		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__GENERATED_SOURCE_FOLDER:

 			setGeneratedSourceFolder(GENERATED_SOURCE_FOLDER_EDEFAULT);

 			return;

+		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__MENU:

+			getMenu().clear();

+			return;

+		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__COMMAND:

+			getCommand().clear();

+			return;

 		}

 		super.eUnset(featureID);

 	}

@@ -908,20 +945,22 @@ public class DomainContextImpl extends EObjectImpl implements DomainContext {
 			return ELEMENT_TYPE_ID_PREFIX_EDEFAULT == null ? elementTypeIDPrefix != null : !ELEMENT_TYPE_ID_PREFIX_EDEFAULT.equals(elementTypeIDPrefix);

 		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__ELEMENT_TYPE_NAME_PREFIX:

 			return ELEMENT_TYPE_NAME_PREFIX_EDEFAULT == null ? elementTypeNamePrefix != null : !ELEMENT_TYPE_NAME_PREFIX_EDEFAULT.equals(elementTypeNamePrefix);

-		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__MATCHER_PATCH:

-			return MATCHER_PATCH_EDEFAULT == null ? matcherPatch != null : !MATCHER_PATCH_EDEFAULT.equals(matcherPatch);

 		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__ELEMENT_TYPES:

 			return elementTypes != null;

 		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__DEFAULT_HELPER_PATH:

 			return DEFAULT_HELPER_PATH_EDEFAULT == null ? defaultHelperPath != null : !DEFAULT_HELPER_PATH_EDEFAULT.equals(defaultHelperPath);

-		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__ADVICEBINDINGS:

-			return advicebindings != null && !advicebindings.isEmpty();

+		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__ADVICES:

+			return advices != null && !advices.isEmpty();

 		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__BINDINGS:

 			return bindings != null && !bindings.isEmpty();

 		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__GEN_HANDLERS:

 			return genHandlers != null;

 		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__GENERATED_SOURCE_FOLDER:

 			return GENERATED_SOURCE_FOLDER_EDEFAULT == null ? generatedSourceFolder != null : !GENERATED_SOURCE_FOLDER_EDEFAULT.equals(generatedSourceFolder);

+		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__MENU:

+			return menu != null && !menu.isEmpty();

+		case DomaincontextcodegenPackage.DOMAIN_CONTEXT__COMMAND:

+			return command != null && !command.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

@@ -948,8 +987,6 @@ public class DomainContextImpl extends EObjectImpl implements DomainContext {
 		result.append(elementTypeIDPrefix);

 		result.append(", elementTypeNamePrefix: ");

 		result.append(elementTypeNamePrefix);

-		result.append(", matcherPatch: ");

-		result.append(matcherPatch);

 		result.append(", defaultHelperPath: ");

 		result.append(defaultHelperPath);

 		result.append(", generatedSourceFolder: ");

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/DomaincontextcodegenFactoryImpl.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/DomaincontextcodegenFactoryImpl.java
index 302940d5f26..3ce9d717561 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/DomaincontextcodegenFactoryImpl.java
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/DomaincontextcodegenFactoryImpl.java
@@ -12,15 +12,23 @@ 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.domaincontextcodegen.Advice;

 import org.eclipse.papyrus.domaincontextcodegen.AdviceBinding;

-import org.eclipse.papyrus.domaincontextcodegen.Binding;

+import org.eclipse.papyrus.domaincontextcodegen.Command;

+import org.eclipse.papyrus.domaincontextcodegen.CommandDeclaration;

 import org.eclipse.papyrus.domaincontextcodegen.DomainContext;

 import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenFactory;

 import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage;

-import org.eclipse.papyrus.domaincontextcodegen.ElementType;

+import org.eclipse.papyrus.domaincontextcodegen.ElementTypeBinding;

+import org.eclipse.papyrus.domaincontextcodegen.ElementTypeBindings;

 import org.eclipse.papyrus.domaincontextcodegen.ElementTypes;

 import org.eclipse.papyrus.domaincontextcodegen.GenHandlers;

 import org.eclipse.papyrus.domaincontextcodegen.InheritanceKind;

+import org.eclipse.papyrus.domaincontextcodegen.MenuDeclaration;

+import org.eclipse.papyrus.domaincontextcodegen.MetaClassType;

+import org.eclipse.papyrus.domaincontextcodegen.SpecializationType;

+import org.eclipse.papyrus.domaincontextcodegen.StereotypedElementHelper;

+import org.eclipse.papyrus.domaincontextcodegen.StereotypedElementMatcher;

 

 /**

  * <!-- begin-user-doc -->

@@ -74,14 +82,30 @@ public class DomaincontextcodegenFactoryImpl extends EFactoryImpl implements Dom
 			return createDomainContext();

 		case DomaincontextcodegenPackage.ELEMENT_TYPES:

 			return createElementTypes();

-		case DomaincontextcodegenPackage.ELEMENT_TYPE:

-			return createElementType();

+		case DomaincontextcodegenPackage.META_CLASS_TYPE:

+			return createMetaClassType();

+		case DomaincontextcodegenPackage.SPECIALIZATION_TYPE:

+			return createSpecializationType();

+		case DomaincontextcodegenPackage.ADVICE:

+			return createAdvice();

+		case DomaincontextcodegenPackage.ELEMENT_TYPE_BINDINGS:

+			return createElementTypeBindings();

+		case DomaincontextcodegenPackage.ELEMENT_TYPE_BINDING:

+			return createElementTypeBinding();

 		case DomaincontextcodegenPackage.ADVICE_BINDING:

 			return createAdviceBinding();

-		case DomaincontextcodegenPackage.BINDING:

-			return createBinding();

 		case DomaincontextcodegenPackage.GEN_HANDLERS:

 			return createGenHandlers();

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_MATCHER:

+			return createStereotypedElementMatcher();

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_HELPER:

+			return createStereotypedElementHelper();

+		case DomaincontextcodegenPackage.MENU_DECLARATION:

+			return createMenuDeclaration();

+		case DomaincontextcodegenPackage.COMMAND_DECLARATION:

+			return createCommandDeclaration();

+		case DomaincontextcodegenPackage.COMMAND:

+			return createCommand();

 		default:

 			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

 		}

@@ -147,9 +171,9 @@ public class DomaincontextcodegenFactoryImpl extends EFactoryImpl implements Dom
 	 * 

 	 * @generated

 	 */

-	public ElementType createElementType() {

-		ElementTypeImpl elementType = new ElementTypeImpl();

-		return elementType;

+	public MetaClassType createMetaClassType() {

+		MetaClassTypeImpl metaClassType = new MetaClassTypeImpl();

+		return metaClassType;

 	}

 

 	/**

@@ -158,9 +182,20 @@ public class DomaincontextcodegenFactoryImpl extends EFactoryImpl implements Dom
 	 * 

 	 * @generated

 	 */

-	public AdviceBinding createAdviceBinding() {

-		AdviceBindingImpl adviceBinding = new AdviceBindingImpl();

-		return adviceBinding;

+	public SpecializationType createSpecializationType() {

+		SpecializationTypeImpl specializationType = new SpecializationTypeImpl();

+		return specializationType;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public Advice createAdvice() {

+		AdviceImpl advice = new AdviceImpl();

+		return advice;

 	}

 

 	/**

@@ -169,9 +204,31 @@ public class DomaincontextcodegenFactoryImpl extends EFactoryImpl implements Dom
 	 * 

 	 * @generated

 	 */

-	public Binding createBinding() {

-		BindingImpl binding = new BindingImpl();

-		return binding;

+	public ElementTypeBindings createElementTypeBindings() {

+		ElementTypeBindingsImpl elementTypeBindings = new ElementTypeBindingsImpl();

+		return elementTypeBindings;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public ElementTypeBinding createElementTypeBinding() {

+		ElementTypeBindingImpl elementTypeBinding = new ElementTypeBindingImpl();

+		return elementTypeBinding;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public AdviceBinding createAdviceBinding() {

+		AdviceBindingImpl adviceBinding = new AdviceBindingImpl();

+		return adviceBinding;

 	}

 

 	/**

@@ -191,6 +248,61 @@ public class DomaincontextcodegenFactoryImpl extends EFactoryImpl implements Dom
 	 * 

 	 * @generated

 	 */

+	public StereotypedElementMatcher createStereotypedElementMatcher() {

+		StereotypedElementMatcherImpl stereotypedElementMatcher = new StereotypedElementMatcherImpl();

+		return stereotypedElementMatcher;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public StereotypedElementHelper createStereotypedElementHelper() {

+		StereotypedElementHelperImpl stereotypedElementHelper = new StereotypedElementHelperImpl();

+		return stereotypedElementHelper;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public MenuDeclaration createMenuDeclaration() {

+		MenuDeclarationImpl menuDeclaration = new MenuDeclarationImpl();

+		return menuDeclaration;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public CommandDeclaration createCommandDeclaration() {

+		CommandDeclarationImpl commandDeclaration = new CommandDeclarationImpl();

+		return commandDeclaration;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public Command createCommand() {

+		CommandImpl command = new CommandImpl();

+		return command;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

 	public InheritanceKind createInheritanceKindFromString(EDataType eDataType, String initialValue) {

 		InheritanceKind result = InheritanceKind.get(initialValue);

 		if(result == null)

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/DomaincontextcodegenPackageImpl.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/DomaincontextcodegenPackageImpl.java
index 9c731fb89c8..8deaf37093c 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/DomaincontextcodegenPackageImpl.java
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/DomaincontextcodegenPackageImpl.java
@@ -13,15 +13,27 @@ import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;

 import org.eclipse.emf.ecore.EcorePackage;

 import org.eclipse.emf.ecore.impl.EPackageImpl;

+import org.eclipse.papyrus.domaincontextcodegen.Advice;

 import org.eclipse.papyrus.domaincontextcodegen.AdviceBinding;

 import org.eclipse.papyrus.domaincontextcodegen.Binding;

+import org.eclipse.papyrus.domaincontextcodegen.Command;

+import org.eclipse.papyrus.domaincontextcodegen.CommandDeclaration;

 import org.eclipse.papyrus.domaincontextcodegen.DomainContext;

 import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenFactory;

 import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage;

 import org.eclipse.papyrus.domaincontextcodegen.ElementType;

+import org.eclipse.papyrus.domaincontextcodegen.ElementTypeBinding;

+import org.eclipse.papyrus.domaincontextcodegen.ElementTypeBindings;

 import org.eclipse.papyrus.domaincontextcodegen.ElementTypes;

 import org.eclipse.papyrus.domaincontextcodegen.GenHandlers;

+import org.eclipse.papyrus.domaincontextcodegen.GenHelper;

+import org.eclipse.papyrus.domaincontextcodegen.GenMatcher;

 import org.eclipse.papyrus.domaincontextcodegen.InheritanceKind;

+import org.eclipse.papyrus.domaincontextcodegen.MenuDeclaration;

+import org.eclipse.papyrus.domaincontextcodegen.MetaClassType;

+import org.eclipse.papyrus.domaincontextcodegen.SpecializationType;

+import org.eclipse.papyrus.domaincontextcodegen.StereotypedElementHelper;

+import org.eclipse.papyrus.domaincontextcodegen.StereotypedElementMatcher;

 

 /**

  * <!-- begin-user-doc -->

@@ -62,6 +74,38 @@ public class DomaincontextcodegenPackageImpl extends EPackageImpl implements Dom
 	 * 

 	 * @generated

 	 */

+	private EClass metaClassTypeEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	private EClass specializationTypeEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	private EClass adviceEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	private EClass elementTypeBindingsEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

 	private EClass adviceBindingEClass = null;

 

 	/**

@@ -78,6 +122,14 @@ public class DomaincontextcodegenPackageImpl extends EPackageImpl implements Dom
 	 * 

 	 * @generated

 	 */

+	private EClass elementTypeBindingEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

 	private EClass genHandlersEClass = null;

 

 	/**

@@ -86,6 +138,62 @@ public class DomaincontextcodegenPackageImpl extends EPackageImpl implements Dom
 	 * 

 	 * @generated

 	 */

+	private EClass genMatcherEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	private EClass genHelperEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	private EClass stereotypedElementMatcherEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	private EClass stereotypedElementHelperEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	private EClass menuDeclarationEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	private EClass commandDeclarationEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	private EClass commandEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

 	private EEnum inheritanceKindEEnum = null;

 

 	/**

@@ -146,7 +254,6 @@ public class DomaincontextcodegenPackageImpl extends EPackageImpl implements Dom
 		// Mark meta-data to indicate it can't be changed

 		theDomaincontextcodegenPackage.freeze();

 

-

 		// Update the registry and return the package

 		EPackage.Registry.INSTANCE.put(DomaincontextcodegenPackage.eNS_URI, theDomaincontextcodegenPackage);

 		return theDomaincontextcodegenPackage;

@@ -238,8 +345,8 @@ public class DomaincontextcodegenPackageImpl extends EPackageImpl implements Dom
 	 * 

 	 * @generated

 	 */

-	public EAttribute getDomainContext_MatcherPatch() {

-		return (EAttribute)domainContextEClass.getEStructuralFeatures().get(7);

+	public EReference getDomainContext_ElementTypes() {

+		return (EReference)domainContextEClass.getEStructuralFeatures().get(7);

 	}

 

 	/**

@@ -248,8 +355,8 @@ public class DomaincontextcodegenPackageImpl extends EPackageImpl implements Dom
 	 * 

 	 * @generated

 	 */

-	public EReference getDomainContext_ElementTypes() {

-		return (EReference)domainContextEClass.getEStructuralFeatures().get(8);

+	public EAttribute getDomainContext_DefaultHelperPath() {

+		return (EAttribute)domainContextEClass.getEStructuralFeatures().get(8);

 	}

 

 	/**

@@ -258,8 +365,8 @@ public class DomaincontextcodegenPackageImpl extends EPackageImpl implements Dom
 	 * 

 	 * @generated

 	 */

-	public EAttribute getDomainContext_DefaultHelperPath() {

-		return (EAttribute)domainContextEClass.getEStructuralFeatures().get(9);

+	public EReference getDomainContext_Advices() {

+		return (EReference)domainContextEClass.getEStructuralFeatures().get(9);

 	}

 

 	/**

@@ -268,7 +375,7 @@ public class DomaincontextcodegenPackageImpl extends EPackageImpl implements Dom
 	 * 

 	 * @generated

 	 */

-	public EReference getDomainContext_Advicebindings() {

+	public EReference getDomainContext_Bindings() {

 		return (EReference)domainContextEClass.getEStructuralFeatures().get(10);

 	}

 

@@ -278,7 +385,7 @@ public class DomaincontextcodegenPackageImpl extends EPackageImpl implements Dom
 	 * 

 	 * @generated

 	 */

-	public EReference getDomainContext_Bindings() {

+	public EReference getDomainContext_GenHandlers() {

 		return (EReference)domainContextEClass.getEStructuralFeatures().get(11);

 	}

 

@@ -288,8 +395,8 @@ public class DomaincontextcodegenPackageImpl extends EPackageImpl implements Dom
 	 * 

 	 * @generated

 	 */

-	public EReference getDomainContext_GenHandlers() {

-		return (EReference)domainContextEClass.getEStructuralFeatures().get(12);

+	public EAttribute getDomainContext_GeneratedSourceFolder() {

+		return (EAttribute)domainContextEClass.getEStructuralFeatures().get(12);

 	}

 

 	/**

@@ -298,8 +405,18 @@ public class DomaincontextcodegenPackageImpl extends EPackageImpl implements Dom
 	 * 

 	 * @generated

 	 */

-	public EAttribute getDomainContext_GeneratedSourceFolder() {

-		return (EAttribute)domainContextEClass.getEStructuralFeatures().get(13);

+	public EReference getDomainContext_Menu() {

+		return (EReference)domainContextEClass.getEStructuralFeatures().get(13);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EReference getDomainContext_Command() {

+		return (EReference)domainContextEClass.getEStructuralFeatures().get(14);

 	}

 

 	/**

@@ -328,6 +445,16 @@ public class DomaincontextcodegenPackageImpl extends EPackageImpl implements Dom
 	 * 

 	 * @generated

 	 */

+	public EReference getElementTypes_Domain() {

+		return (EReference)elementTypesEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

 	public EClass getElementType() {

 		return elementTypeEClass;

 	}

@@ -338,8 +465,8 @@ public class DomaincontextcodegenPackageImpl extends EPackageImpl implements Dom
 	 * 

 	 * @generated

 	 */

-	public EReference getElementType_MetaClass() {

-		return (EReference)elementTypeEClass.getEStructuralFeatures().get(0);

+	public EAttribute getElementType_Name() {

+		return (EAttribute)elementTypeEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

@@ -348,7 +475,7 @@ public class DomaincontextcodegenPackageImpl extends EPackageImpl implements Dom
 	 * 

 	 * @generated

 	 */

-	public EAttribute getElementType_SpecificName() {

+	public EAttribute getElementType_Helper() {

 		return (EAttribute)elementTypeEClass.getEStructuralFeatures().get(1);

 	}

 

@@ -358,8 +485,8 @@ public class DomaincontextcodegenPackageImpl extends EPackageImpl implements Dom
 	 * 

 	 * @generated

 	 */

-	public EAttribute getElementType_Edithelper_EditHelperAdvicePath() {

-		return (EAttribute)elementTypeEClass.getEStructuralFeatures().get(2);

+	public EReference getElementType_Owner() {

+		return (EReference)elementTypeEClass.getEStructuralFeatures().get(2);

 	}

 

 	/**

@@ -368,7 +495,7 @@ public class DomaincontextcodegenPackageImpl extends EPackageImpl implements Dom
 	 * 

 	 * @generated

 	 */

-	public EAttribute getElementType_Kind() {

+	public EAttribute getElementType_Icon() {

 		return (EAttribute)elementTypeEClass.getEStructuralFeatures().get(3);

 	}

 

@@ -378,8 +505,8 @@ public class DomaincontextcodegenPackageImpl extends EPackageImpl implements Dom
 	 * 

 	 * @generated

 	 */

-	public EReference getElementType_Specializationof() {

-		return (EReference)elementTypeEClass.getEStructuralFeatures().get(4);

+	public EClass getMetaClassType() {

+		return metaClassTypeEClass;

 	}

 

 	/**

@@ -388,8 +515,8 @@ public class DomaincontextcodegenPackageImpl extends EPackageImpl implements Dom
 	 * 

 	 * @generated

 	 */

-	public EAttribute getElementType_SpecializationIDof() {

-		return (EAttribute)elementTypeEClass.getEStructuralFeatures().get(5);

+	public EReference getMetaClassType_MetaClass() {

+		return (EReference)metaClassTypeEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

@@ -398,8 +525,98 @@ public class DomaincontextcodegenPackageImpl extends EPackageImpl implements Dom
 	 * 

 	 * @generated

 	 */

-	public EClass getAdviceBinding() {

-		return adviceBindingEClass;

+	public EClass getSpecializationType() {

+		return specializationTypeEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EReference getSpecializationType_Ref() {

+		return (EReference)specializationTypeEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EAttribute getSpecializationType_Matcher() {

+		return (EAttribute)specializationTypeEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EReference getSpecializationType_GenMatcher() {

+		return (EReference)specializationTypeEClass.getEStructuralFeatures().get(2);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EReference getSpecializationType_GenHelper() {

+		return (EReference)specializationTypeEClass.getEStructuralFeatures().get(3);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EClass getAdvice() {

+		return adviceEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EAttribute getAdvice_AdviceID() {

+		return (EAttribute)adviceEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EReference getAdvice_Ref() {

+		return (EReference)adviceEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EAttribute getAdvice_AdvicePath() {

+		return (EAttribute)adviceEClass.getEStructuralFeatures().get(2);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EAttribute getAdvice_Inheritance() {

+		return (EAttribute)adviceEClass.getEStructuralFeatures().get(3);

 	}

 

 	/**

@@ -408,8 +625,8 @@ public class DomaincontextcodegenPackageImpl extends EPackageImpl implements Dom
 	 * 

 	 * @generated

 	 */

-	public EAttribute getAdviceBinding_AdvicePath() {

-		return (EAttribute)adviceBindingEClass.getEStructuralFeatures().get(0);

+	public EClass getElementTypeBindings() {

+		return elementTypeBindingsEClass;

 	}

 

 	/**

@@ -418,8 +635,8 @@ public class DomaincontextcodegenPackageImpl extends EPackageImpl implements Dom
 	 * 

 	 * @generated

 	 */

-	public EAttribute getAdviceBinding_AdviceID() {

-		return (EAttribute)adviceBindingEClass.getEStructuralFeatures().get(1);

+	public EAttribute getElementTypeBindings_ClientContextID() {

+		return (EAttribute)elementTypeBindingsEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

@@ -428,8 +645,8 @@ public class DomaincontextcodegenPackageImpl extends EPackageImpl implements Dom
 	 * 

 	 * @generated

 	 */

-	public EAttribute getAdviceBinding_Inheritance() {

-		return (EAttribute)adviceBindingEClass.getEStructuralFeatures().get(2);

+	public EReference getElementTypeBindings_Bindings() {

+		return (EReference)elementTypeBindingsEClass.getEStructuralFeatures().get(1);

 	}

 

 	/**

@@ -438,8 +655,8 @@ public class DomaincontextcodegenPackageImpl extends EPackageImpl implements Dom
 	 * 

 	 * @generated

 	 */

-	public EReference getAdviceBinding_ElementTypeRef() {

-		return (EReference)adviceBindingEClass.getEStructuralFeatures().get(3);

+	public EClass getAdviceBinding() {

+		return adviceBindingEClass;

 	}

 

 	/**

@@ -448,8 +665,8 @@ public class DomaincontextcodegenPackageImpl extends EPackageImpl implements Dom
 	 * 

 	 * @generated

 	 */

-	public EAttribute getAdviceBinding_ElementTypeIDref() {

-		return (EAttribute)adviceBindingEClass.getEStructuralFeatures().get(4);

+	public EReference getAdviceBinding_Ref() {

+		return (EReference)adviceBindingEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

@@ -468,7 +685,7 @@ public class DomaincontextcodegenPackageImpl extends EPackageImpl implements Dom
 	 * 

 	 * @generated

 	 */

-	public EReference getBinding_Advice() {

+	public EReference getBinding_Owner() {

 		return (EReference)bindingEClass.getEStructuralFeatures().get(0);

 	}

 

@@ -478,7 +695,7 @@ public class DomaincontextcodegenPackageImpl extends EPackageImpl implements Dom
 	 * 

 	 * @generated

 	 */

-	public EAttribute getBinding_ElementTypePattern() {

+	public EAttribute getBinding_Pattern() {

 		return (EAttribute)bindingEClass.getEStructuralFeatures().get(1);

 	}

 

@@ -488,8 +705,18 @@ public class DomaincontextcodegenPackageImpl extends EPackageImpl implements Dom
 	 * 

 	 * @generated

 	 */

-	public EAttribute getBinding_AdviceID() {

-		return (EAttribute)bindingEClass.getEStructuralFeatures().get(2);

+	public EClass getElementTypeBinding() {

+		return elementTypeBindingEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EReference getElementTypeBinding_Ref() {

+		return (EReference)elementTypeBindingEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

@@ -558,6 +785,256 @@ public class DomaincontextcodegenPackageImpl extends EPackageImpl implements Dom
 	 * 

 	 * @generated

 	 */

+	public EReference getGenHandlers_VisibleCreateChildHandlers() {

+		return (EReference)genHandlersEClass.getEStructuralFeatures().get(5);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EReference getGenHandlers_ParentDomainCreateChild() {

+		return (EReference)genHandlersEClass.getEStructuralFeatures().get(6);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EAttribute getGenHandlers_CreateChildMenuLocationURI() {

+		return (EAttribute)genHandlersEClass.getEStructuralFeatures().get(7);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EClass getGenMatcher() {

+		return genMatcherEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EAttribute getGenMatcher_Name() {

+		return (EAttribute)genMatcherEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EClass getGenHelper() {

+		return genHelperEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EAttribute getGenHelper_Name() {

+		return (EAttribute)genHelperEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EClass getStereotypedElementMatcher() {

+		return stereotypedElementMatcherEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EAttribute getStereotypedElementMatcher_StereotypeName() {

+		return (EAttribute)stereotypedElementMatcherEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EAttribute getStereotypedElementMatcher_StereotypePackage() {

+		return (EAttribute)stereotypedElementMatcherEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EAttribute getStereotypedElementMatcher_BaseElementName() {

+		return (EAttribute)stereotypedElementMatcherEClass.getEStructuralFeatures().get(2);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EAttribute getStereotypedElementMatcher_BaseElementPackage() {

+		return (EAttribute)stereotypedElementMatcherEClass.getEStructuralFeatures().get(3);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EClass getStereotypedElementHelper() {

+		return stereotypedElementHelperEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EAttribute getStereotypedElementHelper_StereotypeName() {

+		return (EAttribute)stereotypedElementHelperEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EAttribute getStereotypedElementHelper_StereotypePackage() {

+		return (EAttribute)stereotypedElementHelperEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EAttribute getStereotypedElementHelper_BaseElementName() {

+		return (EAttribute)stereotypedElementHelperEClass.getEStructuralFeatures().get(2);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EAttribute getStereotypedElementHelper_BaseElementPackage() {

+		return (EAttribute)stereotypedElementHelperEClass.getEStructuralFeatures().get(3);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EClass getMenuDeclaration() {

+		return menuDeclarationEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EAttribute getMenuDeclaration_LocationURI() {

+		return (EAttribute)menuDeclarationEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EReference getMenuDeclaration_Commands() {

+		return (EReference)menuDeclarationEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EClass getCommandDeclaration() {

+		return commandDeclarationEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EReference getCommandDeclaration_Commands() {

+		return (EReference)commandDeclarationEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EClass getCommand() {

+		return commandEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EReference getCommand_ElementType() {

+		return (EReference)commandEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EAttribute getCommand_Icon() {

+		return (EAttribute)commandEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

 	public EEnum getInheritanceKind() {

 		return inheritanceKindEEnum;

 	}

@@ -602,36 +1079,53 @@ public class DomaincontextcodegenPackageImpl extends EPackageImpl implements Dom
 		createEReference(domainContextEClass, DOMAIN_CONTEXT__SPECIALIZATION_OF);

 		createEAttribute(domainContextEClass, DOMAIN_CONTEXT__ELEMENT_TYPE_ID_PREFIX);

 		createEAttribute(domainContextEClass, DOMAIN_CONTEXT__ELEMENT_TYPE_NAME_PREFIX);

-		createEAttribute(domainContextEClass, DOMAIN_CONTEXT__MATCHER_PATCH);

 		createEReference(domainContextEClass, DOMAIN_CONTEXT__ELEMENT_TYPES);

 		createEAttribute(domainContextEClass, DOMAIN_CONTEXT__DEFAULT_HELPER_PATH);

-		createEReference(domainContextEClass, DOMAIN_CONTEXT__ADVICEBINDINGS);

+		createEReference(domainContextEClass, DOMAIN_CONTEXT__ADVICES);

 		createEReference(domainContextEClass, DOMAIN_CONTEXT__BINDINGS);

 		createEReference(domainContextEClass, DOMAIN_CONTEXT__GEN_HANDLERS);

 		createEAttribute(domainContextEClass, DOMAIN_CONTEXT__GENERATED_SOURCE_FOLDER);

+		createEReference(domainContextEClass, DOMAIN_CONTEXT__MENU);

+		createEReference(domainContextEClass, DOMAIN_CONTEXT__COMMAND);

 

 		elementTypesEClass = createEClass(ELEMENT_TYPES);

 		createEReference(elementTypesEClass, ELEMENT_TYPES__TYPES);

+		createEReference(elementTypesEClass, ELEMENT_TYPES__DOMAIN);

 

 		elementTypeEClass = createEClass(ELEMENT_TYPE);

-		createEReference(elementTypeEClass, ELEMENT_TYPE__META_CLASS);

-		createEAttribute(elementTypeEClass, ELEMENT_TYPE__SPECIFIC_NAME);

-		createEAttribute(elementTypeEClass, ELEMENT_TYPE__EDITHELPER_EDIT_HELPER_ADVICE_PATH);

-		createEAttribute(elementTypeEClass, ELEMENT_TYPE__KIND);

-		createEReference(elementTypeEClass, ELEMENT_TYPE__SPECIALIZATIONOF);

-		createEAttribute(elementTypeEClass, ELEMENT_TYPE__SPECIALIZATION_IDOF);

-

-		adviceBindingEClass = createEClass(ADVICE_BINDING);

-		createEAttribute(adviceBindingEClass, ADVICE_BINDING__ADVICE_PATH);

-		createEAttribute(adviceBindingEClass, ADVICE_BINDING__ADVICE_ID);

-		createEAttribute(adviceBindingEClass, ADVICE_BINDING__INHERITANCE);

-		createEReference(adviceBindingEClass, ADVICE_BINDING__ELEMENT_TYPE_REF);

-		createEAttribute(adviceBindingEClass, ADVICE_BINDING__ELEMENT_TYPE_IDREF);

+		createEAttribute(elementTypeEClass, ELEMENT_TYPE__NAME);

+		createEAttribute(elementTypeEClass, ELEMENT_TYPE__HELPER);

+		createEReference(elementTypeEClass, ELEMENT_TYPE__OWNER);

+		createEAttribute(elementTypeEClass, ELEMENT_TYPE__ICON);

+

+		metaClassTypeEClass = createEClass(META_CLASS_TYPE);

+		createEReference(metaClassTypeEClass, META_CLASS_TYPE__META_CLASS);

+

+		specializationTypeEClass = createEClass(SPECIALIZATION_TYPE);

+		createEReference(specializationTypeEClass, SPECIALIZATION_TYPE__REF);

+		createEAttribute(specializationTypeEClass, SPECIALIZATION_TYPE__MATCHER);

+		createEReference(specializationTypeEClass, SPECIALIZATION_TYPE__GEN_MATCHER);

+		createEReference(specializationTypeEClass, SPECIALIZATION_TYPE__GEN_HELPER);

+

+		adviceEClass = createEClass(ADVICE);

+		createEAttribute(adviceEClass, ADVICE__ADVICE_ID);

+		createEReference(adviceEClass, ADVICE__REF);

+		createEAttribute(adviceEClass, ADVICE__ADVICE_PATH);

+		createEAttribute(adviceEClass, ADVICE__INHERITANCE);

+

+		elementTypeBindingsEClass = createEClass(ELEMENT_TYPE_BINDINGS);

+		createEAttribute(elementTypeBindingsEClass, ELEMENT_TYPE_BINDINGS__CLIENT_CONTEXT_ID);

+		createEReference(elementTypeBindingsEClass, ELEMENT_TYPE_BINDINGS__BINDINGS);

 

 		bindingEClass = createEClass(BINDING);

-		createEReference(bindingEClass, BINDING__ADVICE);

-		createEAttribute(bindingEClass, BINDING__ELEMENT_TYPE_PATTERN);

-		createEAttribute(bindingEClass, BINDING__ADVICE_ID);

+		createEReference(bindingEClass, BINDING__OWNER);

+		createEAttribute(bindingEClass, BINDING__PATTERN);

+

+		elementTypeBindingEClass = createEClass(ELEMENT_TYPE_BINDING);

+		createEReference(elementTypeBindingEClass, ELEMENT_TYPE_BINDING__REF);

+

+		adviceBindingEClass = createEClass(ADVICE_BINDING);

+		createEReference(adviceBindingEClass, ADVICE_BINDING__REF);

 

 		genHandlersEClass = createEClass(GEN_HANDLERS);

 		createEAttribute(genHandlersEClass, GEN_HANDLERS__HANDLER_PACKAGE);

@@ -639,6 +1133,38 @@ public class DomaincontextcodegenPackageImpl extends EPackageImpl implements Dom
 		createEAttribute(genHandlersEClass, GEN_HANDLERS__SUPER_CLASS_PACKAGE);

 		createEAttribute(genHandlersEClass, GEN_HANDLERS__ELEMENT_TYPE_ENUMERATOR);

 		createEAttribute(genHandlersEClass, GEN_HANDLERS__ELEMENT_TYPE_ENUMERATOR_PACKAGE);

+		createEReference(genHandlersEClass, GEN_HANDLERS__VISIBLE_CREATE_CHILD_HANDLERS);

+		createEReference(genHandlersEClass, GEN_HANDLERS__PARENT_DOMAIN_CREATE_CHILD);

+		createEAttribute(genHandlersEClass, GEN_HANDLERS__CREATE_CHILD_MENU_LOCATION_URI);

+

+		genMatcherEClass = createEClass(GEN_MATCHER);

+		createEAttribute(genMatcherEClass, GEN_MATCHER__NAME);

+

+		genHelperEClass = createEClass(GEN_HELPER);

+		createEAttribute(genHelperEClass, GEN_HELPER__NAME);

+

+		stereotypedElementMatcherEClass = createEClass(STEREOTYPED_ELEMENT_MATCHER);

+		createEAttribute(stereotypedElementMatcherEClass, STEREOTYPED_ELEMENT_MATCHER__STEREOTYPE_NAME);

+		createEAttribute(stereotypedElementMatcherEClass, STEREOTYPED_ELEMENT_MATCHER__STEREOTYPE_PACKAGE);

+		createEAttribute(stereotypedElementMatcherEClass, STEREOTYPED_ELEMENT_MATCHER__BASE_ELEMENT_NAME);

+		createEAttribute(stereotypedElementMatcherEClass, STEREOTYPED_ELEMENT_MATCHER__BASE_ELEMENT_PACKAGE);

+

+		stereotypedElementHelperEClass = createEClass(STEREOTYPED_ELEMENT_HELPER);

+		createEAttribute(stereotypedElementHelperEClass, STEREOTYPED_ELEMENT_HELPER__STEREOTYPE_NAME);

+		createEAttribute(stereotypedElementHelperEClass, STEREOTYPED_ELEMENT_HELPER__STEREOTYPE_PACKAGE);

+		createEAttribute(stereotypedElementHelperEClass, STEREOTYPED_ELEMENT_HELPER__BASE_ELEMENT_NAME);

+		createEAttribute(stereotypedElementHelperEClass, STEREOTYPED_ELEMENT_HELPER__BASE_ELEMENT_PACKAGE);

+

+		menuDeclarationEClass = createEClass(MENU_DECLARATION);

+		createEAttribute(menuDeclarationEClass, MENU_DECLARATION__LOCATION_URI);

+		createEReference(menuDeclarationEClass, MENU_DECLARATION__COMMANDS);

+

+		commandDeclarationEClass = createEClass(COMMAND_DECLARATION);

+		createEReference(commandDeclarationEClass, COMMAND_DECLARATION__COMMANDS);

+

+		commandEClass = createEClass(COMMAND);

+		createEReference(commandEClass, COMMAND__ELEMENT_TYPE);

+		createEAttribute(commandEClass, COMMAND__ICON);

 

 		// Create enums

 		inheritanceKindEEnum = createEEnum(INHERITANCE_KIND);

@@ -670,11 +1196,20 @@ public class DomaincontextcodegenPackageImpl extends EPackageImpl implements Dom
 		setNsPrefix(eNS_PREFIX);

 		setNsURI(eNS_URI);

 

+		// Obtain other dependent packages

+		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);

+

 		// Create type parameters

 

 		// Set bounds for type parameters

 

 		// Add supertypes to classes

+		metaClassTypeEClass.getESuperTypes().add(this.getElementType());

+		specializationTypeEClass.getESuperTypes().add(this.getElementType());

+		elementTypeBindingEClass.getESuperTypes().add(this.getBinding());

+		adviceBindingEClass.getESuperTypes().add(this.getBinding());

+		stereotypedElementMatcherEClass.getESuperTypes().add(this.getGenMatcher());

+		stereotypedElementHelperEClass.getESuperTypes().add(this.getGenHelper());

 

 		// Initialize classes and features; add operations and parameters

 		initEClass(domainContextEClass, DomainContext.class, "DomainContext", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

@@ -685,36 +1220,53 @@ public class DomaincontextcodegenPackageImpl extends EPackageImpl implements Dom
 		initEReference(getDomainContext_SpecializationOf(), this.getDomainContext(), null, "specializationOf", null, 0, 1, DomainContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 		initEAttribute(getDomainContext_ElementTypeIDPrefix(), ecorePackage.getEString(), "elementTypeIDPrefix", null, 1, 1, DomainContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 		initEAttribute(getDomainContext_ElementTypeNamePrefix(), ecorePackage.getEString(), "elementTypeNamePrefix", null, 1, 1, DomainContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getDomainContext_MatcherPatch(), ecorePackage.getEString(), "matcherPatch", null, 1, 1, DomainContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getDomainContext_ElementTypes(), this.getElementTypes(), null, "elementTypes", null, 0, 1, DomainContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getDomainContext_ElementTypes(), this.getElementTypes(), this.getElementTypes_Domain(), "elementTypes", null, 0, 1, DomainContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 		initEAttribute(getDomainContext_DefaultHelperPath(), ecorePackage.getEString(), "defaultHelperPath", null, 1, 1, DomainContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getDomainContext_Advicebindings(), this.getAdviceBinding(), null, "advicebindings", null, 0, -1, DomainContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getDomainContext_Bindings(), this.getBinding(), null, "bindings", null, 0, -1, DomainContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getDomainContext_Advices(), this.getAdvice(), null, "advices", null, 0, -1, DomainContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getDomainContext_Bindings(), this.getElementTypeBindings(), null, "bindings", null, 0, -1, DomainContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 		initEReference(getDomainContext_GenHandlers(), this.getGenHandlers(), null, "genHandlers", null, 0, 1, DomainContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 		initEAttribute(getDomainContext_GeneratedSourceFolder(), ecorePackage.getEString(), "generatedSourceFolder", null, 1, 1, DomainContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getDomainContext_Menu(), this.getMenuDeclaration(), null, "menu", null, 0, -1, DomainContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getDomainContext_Command(), this.getCommandDeclaration(), null, "command", null, 0, -1, DomainContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

 		initEClass(elementTypesEClass, ElementTypes.class, "ElementTypes", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getElementTypes_Types(), this.getElementType(), null, "types", null, 0, -1, ElementTypes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getElementTypes_Types(), this.getElementType(), this.getElementType_Owner(), "types", null, 0, -1, ElementTypes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getElementTypes_Domain(), this.getDomainContext(), this.getDomainContext_ElementTypes(), "domain", null, 0, 1, ElementTypes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

-		initEClass(elementTypeEClass, ElementType.class, "ElementType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getElementType_MetaClass(), ecorePackage.getEClass(), null, "metaClass", null, 1, 1, ElementType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getElementType_SpecificName(), ecorePackage.getEString(), "specificName", null, 0, 1, ElementType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getElementType_Edithelper_EditHelperAdvicePath(), ecorePackage.getEString(), "edithelper_EditHelperAdvicePath", null, 0, 1, ElementType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getElementType_Kind(), ecorePackage.getEString(), "kind", null, 0, 1, ElementType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getElementType_Specializationof(), this.getElementType(), null, "specializationof", null, 0, 1, ElementType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getElementType_SpecializationIDof(), ecorePackage.getEString(), "specializationIDof", null, 0, 1, ElementType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEClass(elementTypeEClass, ElementType.class, "ElementType", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getElementType_Name(), ecorePackage.getEString(), "name", null, 0, 1, ElementType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getElementType_Helper(), ecorePackage.getEString(), "helper", null, 0, 1, ElementType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getElementType_Owner(), this.getElementTypes(), this.getElementTypes_Types(), "owner", null, 0, 1, ElementType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getElementType_Icon(), theEcorePackage.getEString(), "icon", null, 0, 1, ElementType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

-		initEClass(adviceBindingEClass, AdviceBinding.class, "AdviceBinding", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getAdviceBinding_AdvicePath(), ecorePackage.getEString(), "advicePath", null, 0, 1, AdviceBinding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getAdviceBinding_AdviceID(), ecorePackage.getEString(), "adviceID", null, 0, 1, AdviceBinding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getAdviceBinding_Inheritance(), this.getInheritanceKind(), "inheritance", null, 0, 1, AdviceBinding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getAdviceBinding_ElementTypeRef(), this.getElementType(), null, "elementTypeRef", null, 0, 1, AdviceBinding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getAdviceBinding_ElementTypeIDref(), ecorePackage.getEString(), "elementTypeIDref", null, 0, 1, AdviceBinding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEClass(metaClassTypeEClass, MetaClassType.class, "MetaClassType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getMetaClassType_MetaClass(), ecorePackage.getEClass(), null, "metaClass", null, 1, 1, MetaClassType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

-		initEClass(bindingEClass, Binding.class, "Binding", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getBinding_Advice(), this.getAdviceBinding(), null, "advice", null, 0, 1, Binding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getBinding_ElementTypePattern(), ecorePackage.getEString(), "elementTypePattern", null, 0, 1, Binding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getBinding_AdviceID(), ecorePackage.getEString(), "adviceID", null, 0, 1, Binding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEClass(specializationTypeEClass, SpecializationType.class, "SpecializationType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getSpecializationType_Ref(), this.getElementType(), null, "ref", null, 0, 1, SpecializationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getSpecializationType_Matcher(), ecorePackage.getEString(), "matcher", null, 0, 1, SpecializationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getSpecializationType_GenMatcher(), this.getGenMatcher(), null, "genMatcher", null, 0, 1, SpecializationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getSpecializationType_GenHelper(), this.getGenHelper(), null, "genHelper", null, 0, 1, SpecializationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(adviceEClass, Advice.class, "Advice", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getAdvice_AdviceID(), ecorePackage.getEString(), "adviceID", null, 0, 1, Advice.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getAdvice_Ref(), this.getElementType(), null, "ref", null, 0, 1, Advice.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getAdvice_AdvicePath(), ecorePackage.getEString(), "advicePath", null, 0, 1, Advice.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getAdvice_Inheritance(), this.getInheritanceKind(), "inheritance", null, 0, 1, Advice.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(elementTypeBindingsEClass, ElementTypeBindings.class, "ElementTypeBindings", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getElementTypeBindings_ClientContextID(), ecorePackage.getEString(), "clientContextID", null, 0, 1, ElementTypeBindings.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getElementTypeBindings_Bindings(), this.getBinding(), this.getBinding_Owner(), "bindings", null, 0, -1, ElementTypeBindings.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(bindingEClass, Binding.class, "Binding", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getBinding_Owner(), this.getElementTypeBindings(), this.getElementTypeBindings_Bindings(), "owner", null, 1, 1, Binding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getBinding_Pattern(), ecorePackage.getEString(), "pattern", null, 0, 1, Binding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(elementTypeBindingEClass, ElementTypeBinding.class, "ElementTypeBinding", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getElementTypeBinding_Ref(), this.getElementType(), null, "ref", null, 0, 1, ElementTypeBinding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(adviceBindingEClass, AdviceBinding.class, "AdviceBinding", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getAdviceBinding_Ref(), this.getAdvice(), null, "ref", null, 0, 1, AdviceBinding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

 		initEClass(genHandlersEClass, GenHandlers.class, "GenHandlers", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

 		initEAttribute(getGenHandlers_HandlerPackage(), ecorePackage.getEString(), "handlerPackage", null, 0, 1, GenHandlers.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

@@ -722,6 +1274,38 @@ public class DomaincontextcodegenPackageImpl extends EPackageImpl implements Dom
 		initEAttribute(getGenHandlers_SuperClassPackage(), ecorePackage.getEString(), "superClassPackage", null, 0, 1, GenHandlers.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 		initEAttribute(getGenHandlers_ElementTypeEnumerator(), ecorePackage.getEString(), "elementTypeEnumerator", null, 0, 1, GenHandlers.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 		initEAttribute(getGenHandlers_ElementTypeEnumeratorPackage(), ecorePackage.getEString(), "elementTypeEnumeratorPackage", null, 0, 1, GenHandlers.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getGenHandlers_VisibleCreateChildHandlers(), this.getElementType(), null, "visibleCreateChildHandlers", null, 0, -1, GenHandlers.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getGenHandlers_ParentDomainCreateChild(), this.getElementType(), null, "parentDomainCreateChild", null, 0, -1, GenHandlers.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getGenHandlers_CreateChildMenuLocationURI(), theEcorePackage.getEString(), "createChildMenuLocationURI", null, 0, 1, GenHandlers.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(genMatcherEClass, GenMatcher.class, "GenMatcher", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getGenMatcher_Name(), ecorePackage.getEString(), "name", null, 0, 1, GenMatcher.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(genHelperEClass, GenHelper.class, "GenHelper", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getGenHelper_Name(), ecorePackage.getEString(), "name", null, 0, 1, GenHelper.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(stereotypedElementMatcherEClass, StereotypedElementMatcher.class, "StereotypedElementMatcher", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getStereotypedElementMatcher_StereotypeName(), theEcorePackage.getEString(), "stereotypeName", null, 0, 1, StereotypedElementMatcher.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getStereotypedElementMatcher_StereotypePackage(), theEcorePackage.getEString(), "stereotypePackage", null, 0, 1, StereotypedElementMatcher.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getStereotypedElementMatcher_BaseElementName(), theEcorePackage.getEString(), "baseElementName", null, 0, 1, StereotypedElementMatcher.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getStereotypedElementMatcher_BaseElementPackage(), theEcorePackage.getEString(), "baseElementPackage", null, 0, 1, StereotypedElementMatcher.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(stereotypedElementHelperEClass, StereotypedElementHelper.class, "StereotypedElementHelper", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getStereotypedElementHelper_StereotypeName(), theEcorePackage.getEString(), "stereotypeName", null, 0, 1, StereotypedElementHelper.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getStereotypedElementHelper_StereotypePackage(), theEcorePackage.getEString(), "stereotypePackage", null, 0, 1, StereotypedElementHelper.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getStereotypedElementHelper_BaseElementName(), theEcorePackage.getEString(), "baseElementName", null, 0, 1, StereotypedElementHelper.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getStereotypedElementHelper_BaseElementPackage(), theEcorePackage.getEString(), "baseElementPackage", null, 0, 1, StereotypedElementHelper.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(menuDeclarationEClass, MenuDeclaration.class, "MenuDeclaration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getMenuDeclaration_LocationURI(), theEcorePackage.getEString(), "locationURI", null, 0, 1, MenuDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getMenuDeclaration_Commands(), this.getCommand(), null, "commands", null, 0, -1, MenuDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(commandDeclarationEClass, CommandDeclaration.class, "CommandDeclaration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getCommandDeclaration_Commands(), this.getCommand(), null, "commands", null, 0, -1, CommandDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(commandEClass, Command.class, "Command", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getCommand_ElementType(), this.getElementType(), null, "elementType", null, 0, 1, Command.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getCommand_Icon(), theEcorePackage.getEString(), "icon", null, 0, 1, Command.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

 		// Initialize enums and add enum literals

 		initEEnum(inheritanceKindEEnum, InheritanceKind.class, "InheritanceKind");

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/ElementTypeBindingImpl.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/ElementTypeBindingImpl.java
new file mode 100644
index 00000000000..70a4968d110
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/ElementTypeBindingImpl.java
@@ -0,0 +1,169 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.domaincontextcodegen.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.domaincontextcodegen.DomaincontextcodegenPackage;

+import org.eclipse.papyrus.domaincontextcodegen.ElementType;

+import org.eclipse.papyrus.domaincontextcodegen.ElementTypeBinding;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Element Type Binding</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.ElementTypeBindingImpl#getRef <em>Ref</em>}</li>

+ * </ul>

+ * </p>

+ * 

+ * @generated

+ */

+public class ElementTypeBindingImpl extends BindingImpl implements ElementTypeBinding {

+

+	/**

+	 * The cached value of the '{@link #getRef() <em>Ref</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getRef()

+	 * @generated

+	 * @ordered

+	 */

+	protected ElementType ref;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected ElementTypeBindingImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return DomaincontextcodegenPackage.Literals.ELEMENT_TYPE_BINDING;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public ElementType getRef() {

+		if(ref != null && ref.eIsProxy()) {

+			InternalEObject oldRef = (InternalEObject)ref;

+			ref = (ElementType)eResolveProxy(oldRef);

+			if(ref != oldRef) {

+				if(eNotificationRequired())

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DomaincontextcodegenPackage.ELEMENT_TYPE_BINDING__REF, oldRef, ref));

+			}

+		}

+		return ref;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public ElementType basicGetRef() {

+		return ref;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public void setRef(ElementType newRef) {

+		ElementType oldRef = ref;

+		ref = newRef;

+		if(eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.ELEMENT_TYPE_BINDING__REF, oldRef, ref));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.ELEMENT_TYPE_BINDING__REF:

+			if(resolve)

+				return getRef();

+			return basicGetRef();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.ELEMENT_TYPE_BINDING__REF:

+			setRef((ElementType)newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.ELEMENT_TYPE_BINDING__REF:

+			setRef((ElementType)null);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.ELEMENT_TYPE_BINDING__REF:

+			return ref != null;

+		}

+		return super.eIsSet(featureID);

+	}

+

+} //ElementTypeBindingImpl

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/ElementTypeBindingsImpl.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/ElementTypeBindingsImpl.java
new file mode 100644
index 00000000000..bb01b62bebf
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/ElementTypeBindingsImpl.java
@@ -0,0 +1,253 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.domaincontextcodegen.impl;

+

+import java.util.Collection;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.EObjectImpl;

+import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+import org.eclipse.papyrus.domaincontextcodegen.Binding;

+import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage;

+import org.eclipse.papyrus.domaincontextcodegen.ElementTypeBindings;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Element Type Bindings</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.ElementTypeBindingsImpl#getClientContextID <em>Client Context ID</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.ElementTypeBindingsImpl#getBindings <em>Bindings</em>}</li>

+ * </ul>

+ * </p>

+ * 

+ * @generated

+ */

+public class ElementTypeBindingsImpl extends EObjectImpl implements ElementTypeBindings {

+

+	/**

+	 * The default value of the '{@link #getClientContextID() <em>Client Context ID</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getClientContextID()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String CLIENT_CONTEXT_ID_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getClientContextID() <em>Client Context ID</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getClientContextID()

+	 * @generated

+	 * @ordered

+	 */

+	protected String clientContextID = CLIENT_CONTEXT_ID_EDEFAULT;

+

+	/**

+	 * The cached value of the '{@link #getBindings() <em>Bindings</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getBindings()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<Binding> bindings;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected ElementTypeBindingsImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return DomaincontextcodegenPackage.Literals.ELEMENT_TYPE_BINDINGS;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public String getClientContextID() {

+		return clientContextID;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public void setClientContextID(String newClientContextID) {

+		String oldClientContextID = clientContextID;

+		clientContextID = newClientContextID;

+		if(eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.ELEMENT_TYPE_BINDINGS__CLIENT_CONTEXT_ID, oldClientContextID, clientContextID));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EList<Binding> getBindings() {

+		if(bindings == null) {

+			bindings = new EObjectContainmentWithInverseEList<Binding>(Binding.class, this, DomaincontextcodegenPackage.ELEMENT_TYPE_BINDINGS__BINDINGS, DomaincontextcodegenPackage.BINDING__OWNER);

+		}

+		return bindings;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.ELEMENT_TYPE_BINDINGS__BINDINGS:

+			return ((InternalEList<InternalEObject>)(InternalEList<?>)getBindings()).basicAdd(otherEnd, msgs);

+		}

+		return super.eInverseAdd(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.ELEMENT_TYPE_BINDINGS__BINDINGS:

+			return ((InternalEList<?>)getBindings()).basicRemove(otherEnd, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.ELEMENT_TYPE_BINDINGS__CLIENT_CONTEXT_ID:

+			return getClientContextID();

+		case DomaincontextcodegenPackage.ELEMENT_TYPE_BINDINGS__BINDINGS:

+			return getBindings();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.ELEMENT_TYPE_BINDINGS__CLIENT_CONTEXT_ID:

+			setClientContextID((String)newValue);

+			return;

+		case DomaincontextcodegenPackage.ELEMENT_TYPE_BINDINGS__BINDINGS:

+			getBindings().clear();

+			getBindings().addAll((Collection<? extends Binding>)newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.ELEMENT_TYPE_BINDINGS__CLIENT_CONTEXT_ID:

+			setClientContextID(CLIENT_CONTEXT_ID_EDEFAULT);

+			return;

+		case DomaincontextcodegenPackage.ELEMENT_TYPE_BINDINGS__BINDINGS:

+			getBindings().clear();

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.ELEMENT_TYPE_BINDINGS__CLIENT_CONTEXT_ID:

+			return CLIENT_CONTEXT_ID_EDEFAULT == null ? clientContextID != null : !CLIENT_CONTEXT_ID_EDEFAULT.equals(clientContextID);

+		case DomaincontextcodegenPackage.ELEMENT_TYPE_BINDINGS__BINDINGS:

+			return bindings != null && !bindings.isEmpty();

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		if(eIsProxy())

+			return super.toString();

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (clientContextID: ");

+		result.append(clientContextID);

+		result.append(')');

+		return result.toString();

+	}

+

+} //ElementTypeBindingsImpl

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/ElementTypeImpl.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/ElementTypeImpl.java
index 5d4d4b71181..ee57132fc1f 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/ElementTypeImpl.java
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/ElementTypeImpl.java
@@ -7,12 +7,15 @@
 package org.eclipse.papyrus.domaincontextcodegen.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.EObjectImpl;

+import org.eclipse.emf.ecore.util.EcoreUtil;

 import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage;

 import org.eclipse.papyrus.domaincontextcodegen.ElementType;

+import org.eclipse.papyrus.domaincontextcodegen.ElementTypes;

 

 /**

  * <!-- begin-user-doc -->

@@ -21,129 +24,82 @@ import org.eclipse.papyrus.domaincontextcodegen.ElementType;
  * <p>

  * The following features are implemented:

  * <ul>

- * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.ElementTypeImpl#getMetaClass <em>Meta Class</em>}</li>

- * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.ElementTypeImpl#getSpecificName <em>Specific Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.ElementTypeImpl#getEdithelper_EditHelperAdvicePath <em>Edithelper Edit Helper Advice Path

- * </em>}</li>

- * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.ElementTypeImpl#getKind <em>Kind</em>}</li>

- * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.ElementTypeImpl#getSpecializationof <em>Specializationof</em>}</li>

- * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.ElementTypeImpl#getSpecializationIDof <em>Specialization IDof</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.ElementTypeImpl#getName <em>Name</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.ElementTypeImpl#getHelper <em>Helper</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.ElementTypeImpl#getOwner <em>Owner</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.ElementTypeImpl#getIcon <em>Icon</em>}</li>

  * </ul>

  * </p>

  * 

  * @generated

  */

-public class ElementTypeImpl extends EObjectImpl implements ElementType {

+public abstract class ElementTypeImpl extends EObjectImpl implements ElementType {

 

 	/**

-	 * The cached value of the '{@link #getMetaClass() <em>Meta Class</em>}' reference.

+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

-	 * @see #getMetaClass()

+	 * @see #getName()

 	 * @generated

 	 * @ordered

 	 */

-	protected EClass metaClass;

+	protected static final String NAME_EDEFAULT = null;

 

 	/**

-	 * The default value of the '{@link #getSpecificName() <em>Specific Name</em>}' attribute.

+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

-	 * @see #getSpecificName()

+	 * @see #getName()

 	 * @generated

 	 * @ordered

 	 */

-	protected static final String SPECIFIC_NAME_EDEFAULT = null;

+	protected String name = NAME_EDEFAULT;

 

 	/**

-	 * The cached value of the '{@link #getSpecificName() <em>Specific Name</em>}' attribute.

+	 * The default value of the '{@link #getHelper() <em>Helper</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

-	 * @see #getSpecificName()

+	 * @see #getHelper()

 	 * @generated

 	 * @ordered

 	 */

-	protected String specificName = SPECIFIC_NAME_EDEFAULT;

+	protected static final String HELPER_EDEFAULT = null;

 

 	/**

-	 * The default value of the '{@link #getEdithelper_EditHelperAdvicePath() <em>Edithelper Edit Helper Advice Path</em>}' attribute.

+	 * The cached value of the '{@link #getHelper() <em>Helper</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

-	 * @see #getEdithelper_EditHelperAdvicePath()

+	 * @see #getHelper()

 	 * @generated

 	 * @ordered

 	 */

-	protected static final String EDITHELPER_EDIT_HELPER_ADVICE_PATH_EDEFAULT = null;

+	protected String helper = HELPER_EDEFAULT;

 

 	/**

-	 * The cached value of the '{@link #getEdithelper_EditHelperAdvicePath() <em>Edithelper Edit Helper Advice Path</em>}' attribute.

+	 * The default value of the '{@link #getIcon() <em>Icon</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

-	 * @see #getEdithelper_EditHelperAdvicePath()

+	 * @see #getIcon()

 	 * @generated

 	 * @ordered

 	 */

-	protected String edithelper_EditHelperAdvicePath = EDITHELPER_EDIT_HELPER_ADVICE_PATH_EDEFAULT;

+	protected static final String ICON_EDEFAULT = null;

 

 	/**

-	 * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.

+	 * The cached value of the '{@link #getIcon() <em>Icon</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

-	 * @see #getKind()

+	 * @see #getIcon()

 	 * @generated

 	 * @ordered

 	 */

-	protected static final String KIND_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getKind()

-	 * @generated

-	 * @ordered

-	 */

-	protected String kind = KIND_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getSpecializationof() <em>Specializationof</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getSpecializationof()

-	 * @generated

-	 * @ordered

-	 */

-	protected ElementType specializationof;

-

-	/**

-	 * The default value of the '{@link #getSpecializationIDof() <em>Specialization IDof</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getSpecializationIDof()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String SPECIALIZATION_IDOF_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getSpecializationIDof() <em>Specialization IDof</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getSpecializationIDof()

-	 * @generated

-	 * @ordered

-	 */

-	protected String specializationIDof = SPECIALIZATION_IDOF_EDEFAULT;

+	protected String icon = ICON_EDEFAULT;

 

 	/**

 	 * <!-- begin-user-doc -->

@@ -172,16 +128,8 @@ public class ElementTypeImpl extends EObjectImpl implements ElementType {
 	 * 

 	 * @generated

 	 */

-	public EClass getMetaClass() {

-		if(metaClass != null && metaClass.eIsProxy()) {

-			InternalEObject oldMetaClass = (InternalEObject)metaClass;

-			metaClass = (EClass)eResolveProxy(oldMetaClass);

-			if(metaClass != oldMetaClass) {

-				if(eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DomaincontextcodegenPackage.ELEMENT_TYPE__META_CLASS, oldMetaClass, metaClass));

-			}

-		}

-		return metaClass;

+	public String getName() {

+		return name;

 	}

 

 	/**

@@ -190,21 +138,11 @@ public class ElementTypeImpl extends EObjectImpl implements ElementType {
 	 * 

 	 * @generated

 	 */

-	public EClass basicGetMetaClass() {

-		return metaClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setMetaClass(EClass newMetaClass) {

-		EClass oldMetaClass = metaClass;

-		metaClass = newMetaClass;

+	public void setName(String newName) {

+		String oldName = name;

+		name = newName;

 		if(eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.ELEMENT_TYPE__META_CLASS, oldMetaClass, metaClass));

+			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.ELEMENT_TYPE__NAME, oldName, name));

 	}

 

 	/**

@@ -213,8 +151,8 @@ public class ElementTypeImpl extends EObjectImpl implements ElementType {
 	 * 

 	 * @generated

 	 */

-	public String getSpecificName() {

-		return specificName;

+	public String getHelper() {

+		return helper;

 	}

 

 	/**

@@ -223,11 +161,11 @@ public class ElementTypeImpl extends EObjectImpl implements ElementType {
 	 * 

 	 * @generated

 	 */

-	public void setSpecificName(String newSpecificName) {

-		String oldSpecificName = specificName;

-		specificName = newSpecificName;

+	public void setHelper(String newHelper) {

+		String oldHelper = helper;

+		helper = newHelper;

 		if(eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.ELEMENT_TYPE__SPECIFIC_NAME, oldSpecificName, specificName));

+			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.ELEMENT_TYPE__HELPER, oldHelper, helper));

 	}

 

 	/**

@@ -236,8 +174,10 @@ public class ElementTypeImpl extends EObjectImpl implements ElementType {
 	 * 

 	 * @generated

 	 */

-	public String getEdithelper_EditHelperAdvicePath() {

-		return edithelper_EditHelperAdvicePath;

+	public ElementTypes getOwner() {

+		if(eContainerFeatureID() != DomaincontextcodegenPackage.ELEMENT_TYPE__OWNER)

+			return null;

+		return (ElementTypes)eContainer();

 	}

 

 	/**

@@ -246,11 +186,9 @@ public class ElementTypeImpl extends EObjectImpl implements ElementType {
 	 * 

 	 * @generated

 	 */

-	public void setEdithelper_EditHelperAdvicePath(String newEdithelper_EditHelperAdvicePath) {

-		String oldEdithelper_EditHelperAdvicePath = edithelper_EditHelperAdvicePath;

-		edithelper_EditHelperAdvicePath = newEdithelper_EditHelperAdvicePath;

-		if(eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.ELEMENT_TYPE__EDITHELPER_EDIT_HELPER_ADVICE_PATH, oldEdithelper_EditHelperAdvicePath, edithelper_EditHelperAdvicePath));

+	public NotificationChain basicSetOwner(ElementTypes newOwner, NotificationChain msgs) {

+		msgs = eBasicSetContainer((InternalEObject)newOwner, DomaincontextcodegenPackage.ELEMENT_TYPE__OWNER, msgs);

+		return msgs;

 	}

 

 	/**

@@ -259,8 +197,20 @@ public class ElementTypeImpl extends EObjectImpl implements ElementType {
 	 * 

 	 * @generated

 	 */

-	public String getKind() {

-		return kind;

+	public void setOwner(ElementTypes newOwner) {

+		if(newOwner != eInternalContainer() || (eContainerFeatureID() != DomaincontextcodegenPackage.ELEMENT_TYPE__OWNER && newOwner != null)) {

+			if(EcoreUtil.isAncestor(this, newOwner))

+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());

+			NotificationChain msgs = null;

+			if(eInternalContainer() != null)

+				msgs = eBasicRemoveFromContainer(msgs);

+			if(newOwner != null)

+				msgs = ((InternalEObject)newOwner).eInverseAdd(this, DomaincontextcodegenPackage.ELEMENT_TYPES__TYPES, ElementTypes.class, msgs);

+			msgs = basicSetOwner(newOwner, msgs);

+			if(msgs != null)

+				msgs.dispatch();

+		} else if(eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.ELEMENT_TYPE__OWNER, newOwner, newOwner));

 	}

 

 	/**

@@ -269,11 +219,8 @@ public class ElementTypeImpl extends EObjectImpl implements ElementType {
 	 * 

 	 * @generated

 	 */

-	public void setKind(String newKind) {

-		String oldKind = kind;

-		kind = newKind;

-		if(eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.ELEMENT_TYPE__KIND, oldKind, kind));

+	public String getIcon() {

+		return icon;

 	}

 

 	/**

@@ -282,26 +229,11 @@ public class ElementTypeImpl extends EObjectImpl implements ElementType {
 	 * 

 	 * @generated

 	 */

-	public ElementType getSpecializationof() {

-		if(specializationof != null && specializationof.eIsProxy()) {

-			InternalEObject oldSpecializationof = (InternalEObject)specializationof;

-			specializationof = (ElementType)eResolveProxy(oldSpecializationof);

-			if(specializationof != oldSpecializationof) {

-				if(eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DomaincontextcodegenPackage.ELEMENT_TYPE__SPECIALIZATIONOF, oldSpecializationof, specializationof));

-			}

-		}

-		return specializationof;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public ElementType basicGetSpecializationof() {

-		return specializationof;

+	public void setIcon(String newIcon) {

+		String oldIcon = icon;

+		icon = newIcon;

+		if(eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.ELEMENT_TYPE__ICON, oldIcon, icon));

 	}

 

 	/**

@@ -310,11 +242,15 @@ public class ElementTypeImpl extends EObjectImpl implements ElementType {
 	 * 

 	 * @generated

 	 */

-	public void setSpecializationof(ElementType newSpecializationof) {

-		ElementType oldSpecializationof = specializationof;

-		specializationof = newSpecializationof;

-		if(eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.ELEMENT_TYPE__SPECIALIZATIONOF, oldSpecializationof, specializationof));

+	@Override

+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.ELEMENT_TYPE__OWNER:

+			if(eInternalContainer() != null)

+				msgs = eBasicRemoveFromContainer(msgs);

+			return basicSetOwner((ElementTypes)otherEnd, msgs);

+		}

+		return super.eInverseAdd(otherEnd, featureID, msgs);

 	}

 

 	/**

@@ -323,8 +259,13 @@ public class ElementTypeImpl extends EObjectImpl implements ElementType {
 	 * 

 	 * @generated

 	 */

-	public String getSpecializationIDof() {

-		return specializationIDof;

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.ELEMENT_TYPE__OWNER:

+			return basicSetOwner(null, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

 	}

 

 	/**

@@ -333,11 +274,13 @@ public class ElementTypeImpl extends EObjectImpl implements ElementType {
 	 * 

 	 * @generated

 	 */

-	public void setSpecializationIDof(String newSpecializationIDof) {

-		String oldSpecializationIDof = specializationIDof;

-		specializationIDof = newSpecializationIDof;

-		if(eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.ELEMENT_TYPE__SPECIALIZATION_IDOF, oldSpecializationIDof, specializationIDof));

+	@Override

+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {

+		switch(eContainerFeatureID()) {

+		case DomaincontextcodegenPackage.ELEMENT_TYPE__OWNER:

+			return eInternalContainer().eInverseRemove(this, DomaincontextcodegenPackage.ELEMENT_TYPES__TYPES, ElementTypes.class, msgs);

+		}

+		return super.eBasicRemoveFromContainerFeature(msgs);

 	}

 

 	/**

@@ -349,22 +292,14 @@ public class ElementTypeImpl extends EObjectImpl implements ElementType {
 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

 		switch(featureID) {

-		case DomaincontextcodegenPackage.ELEMENT_TYPE__META_CLASS:

-			if(resolve)

-				return getMetaClass();

-			return basicGetMetaClass();

-		case DomaincontextcodegenPackage.ELEMENT_TYPE__SPECIFIC_NAME:

-			return getSpecificName();

-		case DomaincontextcodegenPackage.ELEMENT_TYPE__EDITHELPER_EDIT_HELPER_ADVICE_PATH:

-			return getEdithelper_EditHelperAdvicePath();

-		case DomaincontextcodegenPackage.ELEMENT_TYPE__KIND:

-			return getKind();

-		case DomaincontextcodegenPackage.ELEMENT_TYPE__SPECIALIZATIONOF:

-			if(resolve)

-				return getSpecializationof();

-			return basicGetSpecializationof();

-		case DomaincontextcodegenPackage.ELEMENT_TYPE__SPECIALIZATION_IDOF:

-			return getSpecializationIDof();

+		case DomaincontextcodegenPackage.ELEMENT_TYPE__NAME:

+			return getName();

+		case DomaincontextcodegenPackage.ELEMENT_TYPE__HELPER:

+			return getHelper();

+		case DomaincontextcodegenPackage.ELEMENT_TYPE__OWNER:

+			return getOwner();

+		case DomaincontextcodegenPackage.ELEMENT_TYPE__ICON:

+			return getIcon();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -378,23 +313,17 @@ public class ElementTypeImpl extends EObjectImpl implements ElementType {
 	@Override

 	public void eSet(int featureID, Object newValue) {

 		switch(featureID) {

-		case DomaincontextcodegenPackage.ELEMENT_TYPE__META_CLASS:

-			setMetaClass((EClass)newValue);

+		case DomaincontextcodegenPackage.ELEMENT_TYPE__NAME:

+			setName((String)newValue);

 			return;

-		case DomaincontextcodegenPackage.ELEMENT_TYPE__SPECIFIC_NAME:

-			setSpecificName((String)newValue);

+		case DomaincontextcodegenPackage.ELEMENT_TYPE__HELPER:

+			setHelper((String)newValue);

 			return;

-		case DomaincontextcodegenPackage.ELEMENT_TYPE__EDITHELPER_EDIT_HELPER_ADVICE_PATH:

-			setEdithelper_EditHelperAdvicePath((String)newValue);

+		case DomaincontextcodegenPackage.ELEMENT_TYPE__OWNER:

+			setOwner((ElementTypes)newValue);

 			return;

-		case DomaincontextcodegenPackage.ELEMENT_TYPE__KIND:

-			setKind((String)newValue);

-			return;

-		case DomaincontextcodegenPackage.ELEMENT_TYPE__SPECIALIZATIONOF:

-			setSpecializationof((ElementType)newValue);

-			return;

-		case DomaincontextcodegenPackage.ELEMENT_TYPE__SPECIALIZATION_IDOF:

-			setSpecializationIDof((String)newValue);

+		case DomaincontextcodegenPackage.ELEMENT_TYPE__ICON:

+			setIcon((String)newValue);

 			return;

 		}

 		super.eSet(featureID, newValue);

@@ -409,23 +338,17 @@ public class ElementTypeImpl extends EObjectImpl implements ElementType {
 	@Override

 	public void eUnset(int featureID) {

 		switch(featureID) {

-		case DomaincontextcodegenPackage.ELEMENT_TYPE__META_CLASS:

-			setMetaClass((EClass)null);

-			return;

-		case DomaincontextcodegenPackage.ELEMENT_TYPE__SPECIFIC_NAME:

-			setSpecificName(SPECIFIC_NAME_EDEFAULT);

-			return;

-		case DomaincontextcodegenPackage.ELEMENT_TYPE__EDITHELPER_EDIT_HELPER_ADVICE_PATH:

-			setEdithelper_EditHelperAdvicePath(EDITHELPER_EDIT_HELPER_ADVICE_PATH_EDEFAULT);

+		case DomaincontextcodegenPackage.ELEMENT_TYPE__NAME:

+			setName(NAME_EDEFAULT);

 			return;

-		case DomaincontextcodegenPackage.ELEMENT_TYPE__KIND:

-			setKind(KIND_EDEFAULT);

+		case DomaincontextcodegenPackage.ELEMENT_TYPE__HELPER:

+			setHelper(HELPER_EDEFAULT);

 			return;

-		case DomaincontextcodegenPackage.ELEMENT_TYPE__SPECIALIZATIONOF:

-			setSpecializationof((ElementType)null);

+		case DomaincontextcodegenPackage.ELEMENT_TYPE__OWNER:

+			setOwner((ElementTypes)null);

 			return;

-		case DomaincontextcodegenPackage.ELEMENT_TYPE__SPECIALIZATION_IDOF:

-			setSpecializationIDof(SPECIALIZATION_IDOF_EDEFAULT);

+		case DomaincontextcodegenPackage.ELEMENT_TYPE__ICON:

+			setIcon(ICON_EDEFAULT);

 			return;

 		}

 		super.eUnset(featureID);

@@ -440,18 +363,14 @@ public class ElementTypeImpl extends EObjectImpl implements ElementType {
 	@Override

 	public boolean eIsSet(int featureID) {

 		switch(featureID) {

-		case DomaincontextcodegenPackage.ELEMENT_TYPE__META_CLASS:

-			return metaClass != null;

-		case DomaincontextcodegenPackage.ELEMENT_TYPE__SPECIFIC_NAME:

-			return SPECIFIC_NAME_EDEFAULT == null ? specificName != null : !SPECIFIC_NAME_EDEFAULT.equals(specificName);

-		case DomaincontextcodegenPackage.ELEMENT_TYPE__EDITHELPER_EDIT_HELPER_ADVICE_PATH:

-			return EDITHELPER_EDIT_HELPER_ADVICE_PATH_EDEFAULT == null ? edithelper_EditHelperAdvicePath != null : !EDITHELPER_EDIT_HELPER_ADVICE_PATH_EDEFAULT.equals(edithelper_EditHelperAdvicePath);

-		case DomaincontextcodegenPackage.ELEMENT_TYPE__KIND:

-			return KIND_EDEFAULT == null ? kind != null : !KIND_EDEFAULT.equals(kind);

-		case DomaincontextcodegenPackage.ELEMENT_TYPE__SPECIALIZATIONOF:

-			return specializationof != null;

-		case DomaincontextcodegenPackage.ELEMENT_TYPE__SPECIALIZATION_IDOF:

-			return SPECIALIZATION_IDOF_EDEFAULT == null ? specializationIDof != null : !SPECIALIZATION_IDOF_EDEFAULT.equals(specializationIDof);

+		case DomaincontextcodegenPackage.ELEMENT_TYPE__NAME:

+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

+		case DomaincontextcodegenPackage.ELEMENT_TYPE__HELPER:

+			return HELPER_EDEFAULT == null ? helper != null : !HELPER_EDEFAULT.equals(helper);

+		case DomaincontextcodegenPackage.ELEMENT_TYPE__OWNER:

+			return getOwner() != null;

+		case DomaincontextcodegenPackage.ELEMENT_TYPE__ICON:

+			return ICON_EDEFAULT == null ? icon != null : !ICON_EDEFAULT.equals(icon);

 		}

 		return super.eIsSet(featureID);

 	}

@@ -468,14 +387,12 @@ public class ElementTypeImpl extends EObjectImpl implements ElementType {
 			return super.toString();

 

 		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (specificName: ");

-		result.append(specificName);

-		result.append(", edithelper_EditHelperAdvicePath: ");

-		result.append(edithelper_EditHelperAdvicePath);

-		result.append(", kind: ");

-		result.append(kind);

-		result.append(", specializationIDof: ");

-		result.append(specializationIDof);

+		result.append(" (name: ");

+		result.append(name);

+		result.append(", helper: ");

+		result.append(helper);

+		result.append(", icon: ");

+		result.append(icon);

 		result.append(')');

 		return result.toString();

 	}

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/ElementTypesImpl.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/ElementTypesImpl.java
index bc4a3ce3772..264a752da86 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/ElementTypesImpl.java
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/ElementTypesImpl.java
@@ -8,13 +8,17 @@ package org.eclipse.papyrus.domaincontextcodegen.impl;
 

 import java.util.Collection;

 

+import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.common.notify.NotificationChain;

 import org.eclipse.emf.common.util.EList;

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.EObjectImpl;

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;

+import org.eclipse.emf.ecore.util.EcoreUtil;

 import org.eclipse.emf.ecore.util.InternalEList;

+import org.eclipse.papyrus.domaincontextcodegen.DomainContext;

 import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage;

 import org.eclipse.papyrus.domaincontextcodegen.ElementType;

 import org.eclipse.papyrus.domaincontextcodegen.ElementTypes;

@@ -27,6 +31,7 @@ import org.eclipse.papyrus.domaincontextcodegen.ElementTypes;
  * The following features are implemented:

  * <ul>

  * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.ElementTypesImpl#getTypes <em>Types</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.ElementTypesImpl#getDomain <em>Domain</em>}</li>

  * </ul>

  * </p>

  * 

@@ -74,7 +79,7 @@ public class ElementTypesImpl extends EObjectImpl implements ElementTypes {
 	 */

 	public EList<ElementType> getTypes() {

 		if(types == null) {

-			types = new EObjectContainmentEList<ElementType>(ElementType.class, this, DomaincontextcodegenPackage.ELEMENT_TYPES__TYPES);

+			types = new EObjectContainmentWithInverseEList<ElementType>(ElementType.class, this, DomaincontextcodegenPackage.ELEMENT_TYPES__TYPES, DomaincontextcodegenPackage.ELEMENT_TYPE__OWNER);

 		}

 		return types;

 	}

@@ -85,11 +90,78 @@ public class ElementTypesImpl extends EObjectImpl implements ElementTypes {
 	 * 

 	 * @generated

 	 */

+	public DomainContext getDomain() {

+		if(eContainerFeatureID() != DomaincontextcodegenPackage.ELEMENT_TYPES__DOMAIN)

+			return null;

+		return (DomainContext)eContainer();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public NotificationChain basicSetDomain(DomainContext newDomain, NotificationChain msgs) {

+		msgs = eBasicSetContainer((InternalEObject)newDomain, DomaincontextcodegenPackage.ELEMENT_TYPES__DOMAIN, msgs);

+		return msgs;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public void setDomain(DomainContext newDomain) {

+		if(newDomain != eInternalContainer() || (eContainerFeatureID() != DomaincontextcodegenPackage.ELEMENT_TYPES__DOMAIN && newDomain != null)) {

+			if(EcoreUtil.isAncestor(this, newDomain))

+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());

+			NotificationChain msgs = null;

+			if(eInternalContainer() != null)

+				msgs = eBasicRemoveFromContainer(msgs);

+			if(newDomain != null)

+				msgs = ((InternalEObject)newDomain).eInverseAdd(this, DomaincontextcodegenPackage.DOMAIN_CONTEXT__ELEMENT_TYPES, DomainContext.class, msgs);

+			msgs = basicSetDomain(newDomain, msgs);

+			if(msgs != null)

+				msgs.dispatch();

+		} else if(eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.ELEMENT_TYPES__DOMAIN, newDomain, newDomain));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.ELEMENT_TYPES__TYPES:

+			return ((InternalEList<InternalEObject>)(InternalEList<?>)getTypes()).basicAdd(otherEnd, msgs);

+		case DomaincontextcodegenPackage.ELEMENT_TYPES__DOMAIN:

+			if(eInternalContainer() != null)

+				msgs = eBasicRemoveFromContainer(msgs);

+			return basicSetDomain((DomainContext)otherEnd, msgs);

+		}

+		return super.eInverseAdd(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

 	@Override

 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

 		switch(featureID) {

 		case DomaincontextcodegenPackage.ELEMENT_TYPES__TYPES:

 			return ((InternalEList<?>)getTypes()).basicRemove(otherEnd, msgs);

+		case DomaincontextcodegenPackage.ELEMENT_TYPES__DOMAIN:

+			return basicSetDomain(null, msgs);

 		}

 		return super.eInverseRemove(otherEnd, featureID, msgs);

 	}

@@ -101,10 +173,27 @@ public class ElementTypesImpl extends EObjectImpl implements ElementTypes {
 	 * @generated

 	 */

 	@Override

+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {

+		switch(eContainerFeatureID()) {

+		case DomaincontextcodegenPackage.ELEMENT_TYPES__DOMAIN:

+			return eInternalContainer().eInverseRemove(this, DomaincontextcodegenPackage.DOMAIN_CONTEXT__ELEMENT_TYPES, DomainContext.class, msgs);

+		}

+		return super.eBasicRemoveFromContainerFeature(msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

 		switch(featureID) {

 		case DomaincontextcodegenPackage.ELEMENT_TYPES__TYPES:

 			return getTypes();

+		case DomaincontextcodegenPackage.ELEMENT_TYPES__DOMAIN:

+			return getDomain();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -123,6 +212,9 @@ public class ElementTypesImpl extends EObjectImpl implements ElementTypes {
 			getTypes().clear();

 			getTypes().addAll((Collection<? extends ElementType>)newValue);

 			return;

+		case DomaincontextcodegenPackage.ELEMENT_TYPES__DOMAIN:

+			setDomain((DomainContext)newValue);

+			return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -139,6 +231,9 @@ public class ElementTypesImpl extends EObjectImpl implements ElementTypes {
 		case DomaincontextcodegenPackage.ELEMENT_TYPES__TYPES:

 			getTypes().clear();

 			return;

+		case DomaincontextcodegenPackage.ELEMENT_TYPES__DOMAIN:

+			setDomain((DomainContext)null);

+			return;

 		}

 		super.eUnset(featureID);

 	}

@@ -154,6 +249,8 @@ public class ElementTypesImpl extends EObjectImpl implements ElementTypes {
 		switch(featureID) {

 		case DomaincontextcodegenPackage.ELEMENT_TYPES__TYPES:

 			return types != null && !types.isEmpty();

+		case DomaincontextcodegenPackage.ELEMENT_TYPES__DOMAIN:

+			return getDomain() != null;

 		}

 		return super.eIsSet(featureID);

 	}

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/GenHandlersImpl.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/GenHandlersImpl.java
index 8b0d6ed1be3..e47f7ee904c 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/GenHandlersImpl.java
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/GenHandlersImpl.java
@@ -6,11 +6,16 @@
  */

 package org.eclipse.papyrus.domaincontextcodegen.impl;

 

+import java.util.Collection;

+

 import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.util.EList;

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.EObjectImpl;

+import org.eclipse.emf.ecore.util.EObjectResolvingEList;

 import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage;

+import org.eclipse.papyrus.domaincontextcodegen.ElementType;

 import org.eclipse.papyrus.domaincontextcodegen.GenHandlers;

 

 /**

@@ -25,6 +30,9 @@ import org.eclipse.papyrus.domaincontextcodegen.GenHandlers;
  * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.GenHandlersImpl#getSuperClassPackage <em>Super Class Package</em>}</li>

  * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.GenHandlersImpl#getElementTypeEnumerator <em>Element Type Enumerator</em>}</li>

  * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.GenHandlersImpl#getElementTypeEnumeratorPackage <em>Element Type Enumerator Package</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.GenHandlersImpl#getVisibleCreateChildHandlers <em>Visible Create Child Handlers</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.GenHandlersImpl#getParentDomainCreateChild <em>Parent Domain Create Child</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.GenHandlersImpl#getCreateChildMenuLocationURI <em>Create Child Menu Location URI</em>}</li>

  * </ul>

  * </p>

  * 

@@ -143,6 +151,50 @@ public class GenHandlersImpl extends EObjectImpl implements GenHandlers {
 	protected String elementTypeEnumeratorPackage = ELEMENT_TYPE_ENUMERATOR_PACKAGE_EDEFAULT;

 

 	/**

+	 * The cached value of the '{@link #getVisibleCreateChildHandlers() <em>Visible Create Child Handlers</em>}' reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getVisibleCreateChildHandlers()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<ElementType> visibleCreateChildHandlers;

+

+	/**

+	 * The cached value of the '{@link #getParentDomainCreateChild() <em>Parent Domain Create Child</em>}' reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getParentDomainCreateChild()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<ElementType> parentDomainCreateChild;

+

+	/**

+	 * The default value of the '{@link #getCreateChildMenuLocationURI() <em>Create Child Menu Location URI</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getCreateChildMenuLocationURI()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String CREATE_CHILD_MENU_LOCATION_URI_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getCreateChildMenuLocationURI() <em>Create Child Menu Location URI</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getCreateChildMenuLocationURI()

+	 * @generated

+	 * @ordered

+	 */

+	protected String createChildMenuLocationURI = CREATE_CHILD_MENU_LOCATION_URI_EDEFAULT;

+

+	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * 

@@ -284,6 +336,55 @@ public class GenHandlersImpl extends EObjectImpl implements GenHandlers {
 	 * 

 	 * @generated

 	 */

+	public EList<ElementType> getVisibleCreateChildHandlers() {

+		if(visibleCreateChildHandlers == null) {

+			visibleCreateChildHandlers = new EObjectResolvingEList<ElementType>(ElementType.class, this, DomaincontextcodegenPackage.GEN_HANDLERS__VISIBLE_CREATE_CHILD_HANDLERS);

+		}

+		return visibleCreateChildHandlers;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EList<ElementType> getParentDomainCreateChild() {

+		if(parentDomainCreateChild == null) {

+			parentDomainCreateChild = new EObjectResolvingEList<ElementType>(ElementType.class, this, DomaincontextcodegenPackage.GEN_HANDLERS__PARENT_DOMAIN_CREATE_CHILD);

+		}

+		return parentDomainCreateChild;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public String getCreateChildMenuLocationURI() {

+		return createChildMenuLocationURI;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public void setCreateChildMenuLocationURI(String newCreateChildMenuLocationURI) {

+		String oldCreateChildMenuLocationURI = createChildMenuLocationURI;

+		createChildMenuLocationURI = newCreateChildMenuLocationURI;

+		if(eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.GEN_HANDLERS__CREATE_CHILD_MENU_LOCATION_URI, oldCreateChildMenuLocationURI, createChildMenuLocationURI));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

 		switch(featureID) {

@@ -297,6 +398,12 @@ public class GenHandlersImpl extends EObjectImpl implements GenHandlers {
 			return getElementTypeEnumerator();

 		case DomaincontextcodegenPackage.GEN_HANDLERS__ELEMENT_TYPE_ENUMERATOR_PACKAGE:

 			return getElementTypeEnumeratorPackage();

+		case DomaincontextcodegenPackage.GEN_HANDLERS__VISIBLE_CREATE_CHILD_HANDLERS:

+			return getVisibleCreateChildHandlers();

+		case DomaincontextcodegenPackage.GEN_HANDLERS__PARENT_DOMAIN_CREATE_CHILD:

+			return getParentDomainCreateChild();

+		case DomaincontextcodegenPackage.GEN_HANDLERS__CREATE_CHILD_MENU_LOCATION_URI:

+			return getCreateChildMenuLocationURI();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -307,6 +414,7 @@ public class GenHandlersImpl extends EObjectImpl implements GenHandlers {
 	 * 

 	 * @generated

 	 */

+	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

 		switch(featureID) {

@@ -325,6 +433,17 @@ public class GenHandlersImpl extends EObjectImpl implements GenHandlers {
 		case DomaincontextcodegenPackage.GEN_HANDLERS__ELEMENT_TYPE_ENUMERATOR_PACKAGE:

 			setElementTypeEnumeratorPackage((String)newValue);

 			return;

+		case DomaincontextcodegenPackage.GEN_HANDLERS__VISIBLE_CREATE_CHILD_HANDLERS:

+			getVisibleCreateChildHandlers().clear();

+			getVisibleCreateChildHandlers().addAll((Collection<? extends ElementType>)newValue);

+			return;

+		case DomaincontextcodegenPackage.GEN_HANDLERS__PARENT_DOMAIN_CREATE_CHILD:

+			getParentDomainCreateChild().clear();

+			getParentDomainCreateChild().addAll((Collection<? extends ElementType>)newValue);

+			return;

+		case DomaincontextcodegenPackage.GEN_HANDLERS__CREATE_CHILD_MENU_LOCATION_URI:

+			setCreateChildMenuLocationURI((String)newValue);

+			return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -353,6 +472,15 @@ public class GenHandlersImpl extends EObjectImpl implements GenHandlers {
 		case DomaincontextcodegenPackage.GEN_HANDLERS__ELEMENT_TYPE_ENUMERATOR_PACKAGE:

 			setElementTypeEnumeratorPackage(ELEMENT_TYPE_ENUMERATOR_PACKAGE_EDEFAULT);

 			return;

+		case DomaincontextcodegenPackage.GEN_HANDLERS__VISIBLE_CREATE_CHILD_HANDLERS:

+			getVisibleCreateChildHandlers().clear();

+			return;

+		case DomaincontextcodegenPackage.GEN_HANDLERS__PARENT_DOMAIN_CREATE_CHILD:

+			getParentDomainCreateChild().clear();

+			return;

+		case DomaincontextcodegenPackage.GEN_HANDLERS__CREATE_CHILD_MENU_LOCATION_URI:

+			setCreateChildMenuLocationURI(CREATE_CHILD_MENU_LOCATION_URI_EDEFAULT);

+			return;

 		}

 		super.eUnset(featureID);

 	}

@@ -376,6 +504,12 @@ public class GenHandlersImpl extends EObjectImpl implements GenHandlers {
 			return ELEMENT_TYPE_ENUMERATOR_EDEFAULT == null ? elementTypeEnumerator != null : !ELEMENT_TYPE_ENUMERATOR_EDEFAULT.equals(elementTypeEnumerator);

 		case DomaincontextcodegenPackage.GEN_HANDLERS__ELEMENT_TYPE_ENUMERATOR_PACKAGE:

 			return ELEMENT_TYPE_ENUMERATOR_PACKAGE_EDEFAULT == null ? elementTypeEnumeratorPackage != null : !ELEMENT_TYPE_ENUMERATOR_PACKAGE_EDEFAULT.equals(elementTypeEnumeratorPackage);

+		case DomaincontextcodegenPackage.GEN_HANDLERS__VISIBLE_CREATE_CHILD_HANDLERS:

+			return visibleCreateChildHandlers != null && !visibleCreateChildHandlers.isEmpty();

+		case DomaincontextcodegenPackage.GEN_HANDLERS__PARENT_DOMAIN_CREATE_CHILD:

+			return parentDomainCreateChild != null && !parentDomainCreateChild.isEmpty();

+		case DomaincontextcodegenPackage.GEN_HANDLERS__CREATE_CHILD_MENU_LOCATION_URI:

+			return CREATE_CHILD_MENU_LOCATION_URI_EDEFAULT == null ? createChildMenuLocationURI != null : !CREATE_CHILD_MENU_LOCATION_URI_EDEFAULT.equals(createChildMenuLocationURI);

 		}

 		return super.eIsSet(featureID);

 	}

@@ -402,6 +536,8 @@ public class GenHandlersImpl extends EObjectImpl implements GenHandlers {
 		result.append(elementTypeEnumerator);

 		result.append(", elementTypeEnumeratorPackage: ");

 		result.append(elementTypeEnumeratorPackage);

+		result.append(", createChildMenuLocationURI: ");

+		result.append(createChildMenuLocationURI);

 		result.append(')');

 		return result.toString();

 	}

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/GenHelperImpl.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/GenHelperImpl.java
new file mode 100644
index 00000000000..555987f9ff9
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/GenHelperImpl.java
@@ -0,0 +1,177 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.domaincontextcodegen.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.EObjectImpl;

+import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage;

+import org.eclipse.papyrus.domaincontextcodegen.GenHelper;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Gen Helper</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.GenHelperImpl#getName <em>Name</em>}</li>

+ * </ul>

+ * </p>

+ * 

+ * @generated

+ */

+public abstract class GenHelperImpl extends EObjectImpl implements GenHelper {

+

+	/**

+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String NAME_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected String name = NAME_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected GenHelperImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return DomaincontextcodegenPackage.Literals.GEN_HELPER;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public String getName() {

+		return name;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public void setName(String newName) {

+		String oldName = name;

+		name = newName;

+		if(eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.GEN_HELPER__NAME, oldName, name));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.GEN_HELPER__NAME:

+			return getName();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.GEN_HELPER__NAME:

+			setName((String)newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.GEN_HELPER__NAME:

+			setName(NAME_EDEFAULT);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.GEN_HELPER__NAME:

+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		if(eIsProxy())

+			return super.toString();

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (name: ");

+		result.append(name);

+		result.append(')');

+		return result.toString();

+	}

+

+} //GenHelperImpl

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/GenMatcherImpl.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/GenMatcherImpl.java
new file mode 100644
index 00000000000..f44fb7f5861
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/GenMatcherImpl.java
@@ -0,0 +1,177 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.domaincontextcodegen.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.EObjectImpl;

+import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage;

+import org.eclipse.papyrus.domaincontextcodegen.GenMatcher;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Gen Matcher</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.GenMatcherImpl#getName <em>Name</em>}</li>

+ * </ul>

+ * </p>

+ * 

+ * @generated

+ */

+public abstract class GenMatcherImpl extends EObjectImpl implements GenMatcher {

+

+	/**

+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String NAME_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected String name = NAME_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected GenMatcherImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return DomaincontextcodegenPackage.Literals.GEN_MATCHER;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public String getName() {

+		return name;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public void setName(String newName) {

+		String oldName = name;

+		name = newName;

+		if(eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.GEN_MATCHER__NAME, oldName, name));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.GEN_MATCHER__NAME:

+			return getName();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.GEN_MATCHER__NAME:

+			setName((String)newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.GEN_MATCHER__NAME:

+			setName(NAME_EDEFAULT);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.GEN_MATCHER__NAME:

+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		if(eIsProxy())

+			return super.toString();

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (name: ");

+		result.append(name);

+		result.append(')');

+		return result.toString();

+	}

+

+} //GenMatcherImpl

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/MenuDeclarationImpl.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/MenuDeclarationImpl.java
new file mode 100644
index 00000000000..4f1c456b767
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/MenuDeclarationImpl.java
@@ -0,0 +1,219 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.domaincontextcodegen.impl;

+

+import java.util.Collection;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.EObjectImpl;

+import org.eclipse.emf.ecore.util.EObjectResolvingEList;

+import org.eclipse.papyrus.domaincontextcodegen.Command;

+import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage;

+import org.eclipse.papyrus.domaincontextcodegen.MenuDeclaration;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Menu Declaration</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.MenuDeclarationImpl#getLocationURI <em>Location URI</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.MenuDeclarationImpl#getCommands <em>Commands</em>}</li>

+ * </ul>

+ * </p>

+ * 

+ * @generated

+ */

+public class MenuDeclarationImpl extends EObjectImpl implements MenuDeclaration {

+

+	/**

+	 * The default value of the '{@link #getLocationURI() <em>Location URI</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getLocationURI()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String LOCATION_URI_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getLocationURI() <em>Location URI</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getLocationURI()

+	 * @generated

+	 * @ordered

+	 */

+	protected String locationURI = LOCATION_URI_EDEFAULT;

+

+	/**

+	 * The cached value of the '{@link #getCommands() <em>Commands</em>}' reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getCommands()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<Command> commands;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected MenuDeclarationImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return DomaincontextcodegenPackage.Literals.MENU_DECLARATION;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public String getLocationURI() {

+		return locationURI;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public void setLocationURI(String newLocationURI) {

+		String oldLocationURI = locationURI;

+		locationURI = newLocationURI;

+		if(eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.MENU_DECLARATION__LOCATION_URI, oldLocationURI, locationURI));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EList<Command> getCommands() {

+		if(commands == null) {

+			commands = new EObjectResolvingEList<Command>(Command.class, this, DomaincontextcodegenPackage.MENU_DECLARATION__COMMANDS);

+		}

+		return commands;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.MENU_DECLARATION__LOCATION_URI:

+			return getLocationURI();

+		case DomaincontextcodegenPackage.MENU_DECLARATION__COMMANDS:

+			return getCommands();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.MENU_DECLARATION__LOCATION_URI:

+			setLocationURI((String)newValue);

+			return;

+		case DomaincontextcodegenPackage.MENU_DECLARATION__COMMANDS:

+			getCommands().clear();

+			getCommands().addAll((Collection<? extends Command>)newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.MENU_DECLARATION__LOCATION_URI:

+			setLocationURI(LOCATION_URI_EDEFAULT);

+			return;

+		case DomaincontextcodegenPackage.MENU_DECLARATION__COMMANDS:

+			getCommands().clear();

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.MENU_DECLARATION__LOCATION_URI:

+			return LOCATION_URI_EDEFAULT == null ? locationURI != null : !LOCATION_URI_EDEFAULT.equals(locationURI);

+		case DomaincontextcodegenPackage.MENU_DECLARATION__COMMANDS:

+			return commands != null && !commands.isEmpty();

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		if(eIsProxy())

+			return super.toString();

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (locationURI: ");

+		result.append(locationURI);

+		result.append(')');

+		return result.toString();

+	}

+

+} //MenuDeclarationImpl

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/MetaClassTypeImpl.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/MetaClassTypeImpl.java
new file mode 100644
index 00000000000..d103975e4ff
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/MetaClassTypeImpl.java
@@ -0,0 +1,168 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.domaincontextcodegen.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.domaincontextcodegen.DomaincontextcodegenPackage;

+import org.eclipse.papyrus.domaincontextcodegen.MetaClassType;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Meta Class Type</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.MetaClassTypeImpl#getMetaClass <em>Meta Class</em>}</li>

+ * </ul>

+ * </p>

+ * 

+ * @generated

+ */

+public class MetaClassTypeImpl extends ElementTypeImpl implements MetaClassType {

+

+	/**

+	 * The cached value of the '{@link #getMetaClass() <em>Meta Class</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getMetaClass()

+	 * @generated

+	 * @ordered

+	 */

+	protected EClass metaClass;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected MetaClassTypeImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return DomaincontextcodegenPackage.Literals.META_CLASS_TYPE;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EClass getMetaClass() {

+		if(metaClass != null && metaClass.eIsProxy()) {

+			InternalEObject oldMetaClass = (InternalEObject)metaClass;

+			metaClass = (EClass)eResolveProxy(oldMetaClass);

+			if(metaClass != oldMetaClass) {

+				if(eNotificationRequired())

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DomaincontextcodegenPackage.META_CLASS_TYPE__META_CLASS, oldMetaClass, metaClass));

+			}

+		}

+		return metaClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EClass basicGetMetaClass() {

+		return metaClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public void setMetaClass(EClass newMetaClass) {

+		EClass oldMetaClass = metaClass;

+		metaClass = newMetaClass;

+		if(eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.META_CLASS_TYPE__META_CLASS, oldMetaClass, metaClass));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.META_CLASS_TYPE__META_CLASS:

+			if(resolve)

+				return getMetaClass();

+			return basicGetMetaClass();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.META_CLASS_TYPE__META_CLASS:

+			setMetaClass((EClass)newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.META_CLASS_TYPE__META_CLASS:

+			setMetaClass((EClass)null);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.META_CLASS_TYPE__META_CLASS:

+			return metaClass != null;

+		}

+		return super.eIsSet(featureID);

+	}

+

+} //MetaClassTypeImpl

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/SpecializationTypeImpl.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/SpecializationTypeImpl.java
new file mode 100644
index 00000000000..933dedcc145
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/SpecializationTypeImpl.java
@@ -0,0 +1,405 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.domaincontextcodegen.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.papyrus.domaincontextcodegen.DomaincontextcodegenPackage;

+import org.eclipse.papyrus.domaincontextcodegen.ElementType;

+import org.eclipse.papyrus.domaincontextcodegen.GenHelper;

+import org.eclipse.papyrus.domaincontextcodegen.GenMatcher;

+import org.eclipse.papyrus.domaincontextcodegen.SpecializationType;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Specialization Type</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.SpecializationTypeImpl#getRef <em>Ref</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.SpecializationTypeImpl#getMatcher <em>Matcher</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.SpecializationTypeImpl#getGenMatcher <em>Gen Matcher</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.SpecializationTypeImpl#getGenHelper <em>Gen Helper</em>}</li>

+ * </ul>

+ * </p>

+ * 

+ * @generated

+ */

+public class SpecializationTypeImpl extends ElementTypeImpl implements SpecializationType {

+

+	/**

+	 * The cached value of the '{@link #getRef() <em>Ref</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getRef()

+	 * @generated

+	 * @ordered

+	 */

+	protected ElementType ref;

+

+	/**

+	 * The default value of the '{@link #getMatcher() <em>Matcher</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getMatcher()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String MATCHER_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getMatcher() <em>Matcher</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getMatcher()

+	 * @generated

+	 * @ordered

+	 */

+	protected String matcher = MATCHER_EDEFAULT;

+

+	/**

+	 * The cached value of the '{@link #getGenMatcher() <em>Gen Matcher</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getGenMatcher()

+	 * @generated

+	 * @ordered

+	 */

+	protected GenMatcher genMatcher;

+

+	/**

+	 * The cached value of the '{@link #getGenHelper() <em>Gen Helper</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getGenHelper()

+	 * @generated

+	 * @ordered

+	 */

+	protected GenHelper genHelper;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected SpecializationTypeImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return DomaincontextcodegenPackage.Literals.SPECIALIZATION_TYPE;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public ElementType getRef() {

+		if(ref != null && ref.eIsProxy()) {

+			InternalEObject oldRef = (InternalEObject)ref;

+			ref = (ElementType)eResolveProxy(oldRef);

+			if(ref != oldRef) {

+				if(eNotificationRequired())

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DomaincontextcodegenPackage.SPECIALIZATION_TYPE__REF, oldRef, ref));

+			}

+		}

+		return ref;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public ElementType basicGetRef() {

+		return ref;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public void setRef(ElementType newRef) {

+		ElementType oldRef = ref;

+		ref = newRef;

+		if(eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.SPECIALIZATION_TYPE__REF, oldRef, ref));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public String getMatcher() {

+		return matcher;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public void setMatcher(String newMatcher) {

+		String oldMatcher = matcher;

+		matcher = newMatcher;

+		if(eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.SPECIALIZATION_TYPE__MATCHER, oldMatcher, matcher));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public GenMatcher getGenMatcher() {

+		return genMatcher;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public NotificationChain basicSetGenMatcher(GenMatcher newGenMatcher, NotificationChain msgs) {

+		GenMatcher oldGenMatcher = genMatcher;

+		genMatcher = newGenMatcher;

+		if(eNotificationRequired()) {

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.SPECIALIZATION_TYPE__GEN_MATCHER, oldGenMatcher, newGenMatcher);

+			if(msgs == null)

+				msgs = notification;

+			else

+				msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public void setGenMatcher(GenMatcher newGenMatcher) {

+		if(newGenMatcher != genMatcher) {

+			NotificationChain msgs = null;

+			if(genMatcher != null)

+				msgs = ((InternalEObject)genMatcher).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DomaincontextcodegenPackage.SPECIALIZATION_TYPE__GEN_MATCHER, null, msgs);

+			if(newGenMatcher != null)

+				msgs = ((InternalEObject)newGenMatcher).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DomaincontextcodegenPackage.SPECIALIZATION_TYPE__GEN_MATCHER, null, msgs);

+			msgs = basicSetGenMatcher(newGenMatcher, msgs);

+			if(msgs != null)

+				msgs.dispatch();

+		} else if(eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.SPECIALIZATION_TYPE__GEN_MATCHER, newGenMatcher, newGenMatcher));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public GenHelper getGenHelper() {

+		return genHelper;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public NotificationChain basicSetGenHelper(GenHelper newGenHelper, NotificationChain msgs) {

+		GenHelper oldGenHelper = genHelper;

+		genHelper = newGenHelper;

+		if(eNotificationRequired()) {

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.SPECIALIZATION_TYPE__GEN_HELPER, oldGenHelper, newGenHelper);

+			if(msgs == null)

+				msgs = notification;

+			else

+				msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public void setGenHelper(GenHelper newGenHelper) {

+		if(newGenHelper != genHelper) {

+			NotificationChain msgs = null;

+			if(genHelper != null)

+				msgs = ((InternalEObject)genHelper).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DomaincontextcodegenPackage.SPECIALIZATION_TYPE__GEN_HELPER, null, msgs);

+			if(newGenHelper != null)

+				msgs = ((InternalEObject)newGenHelper).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DomaincontextcodegenPackage.SPECIALIZATION_TYPE__GEN_HELPER, null, msgs);

+			msgs = basicSetGenHelper(newGenHelper, msgs);

+			if(msgs != null)

+				msgs.dispatch();

+		} else if(eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.SPECIALIZATION_TYPE__GEN_HELPER, newGenHelper, newGenHelper));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.SPECIALIZATION_TYPE__GEN_MATCHER:

+			return basicSetGenMatcher(null, msgs);

+		case DomaincontextcodegenPackage.SPECIALIZATION_TYPE__GEN_HELPER:

+			return basicSetGenHelper(null, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.SPECIALIZATION_TYPE__REF:

+			if(resolve)

+				return getRef();

+			return basicGetRef();

+		case DomaincontextcodegenPackage.SPECIALIZATION_TYPE__MATCHER:

+			return getMatcher();

+		case DomaincontextcodegenPackage.SPECIALIZATION_TYPE__GEN_MATCHER:

+			return getGenMatcher();

+		case DomaincontextcodegenPackage.SPECIALIZATION_TYPE__GEN_HELPER:

+			return getGenHelper();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.SPECIALIZATION_TYPE__REF:

+			setRef((ElementType)newValue);

+			return;

+		case DomaincontextcodegenPackage.SPECIALIZATION_TYPE__MATCHER:

+			setMatcher((String)newValue);

+			return;

+		case DomaincontextcodegenPackage.SPECIALIZATION_TYPE__GEN_MATCHER:

+			setGenMatcher((GenMatcher)newValue);

+			return;

+		case DomaincontextcodegenPackage.SPECIALIZATION_TYPE__GEN_HELPER:

+			setGenHelper((GenHelper)newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.SPECIALIZATION_TYPE__REF:

+			setRef((ElementType)null);

+			return;

+		case DomaincontextcodegenPackage.SPECIALIZATION_TYPE__MATCHER:

+			setMatcher(MATCHER_EDEFAULT);

+			return;

+		case DomaincontextcodegenPackage.SPECIALIZATION_TYPE__GEN_MATCHER:

+			setGenMatcher((GenMatcher)null);

+			return;

+		case DomaincontextcodegenPackage.SPECIALIZATION_TYPE__GEN_HELPER:

+			setGenHelper((GenHelper)null);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.SPECIALIZATION_TYPE__REF:

+			return ref != null;

+		case DomaincontextcodegenPackage.SPECIALIZATION_TYPE__MATCHER:

+			return MATCHER_EDEFAULT == null ? matcher != null : !MATCHER_EDEFAULT.equals(matcher);

+		case DomaincontextcodegenPackage.SPECIALIZATION_TYPE__GEN_MATCHER:

+			return genMatcher != null;

+		case DomaincontextcodegenPackage.SPECIALIZATION_TYPE__GEN_HELPER:

+			return genHelper != null;

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		if(eIsProxy())

+			return super.toString();

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (matcher: ");

+		result.append(matcher);

+		result.append(')');

+		return result.toString();

+	}

+

+} //SpecializationTypeImpl

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/StereotypedElementHelperImpl.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/StereotypedElementHelperImpl.java
new file mode 100644
index 00000000000..f19783d7a4c
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/StereotypedElementHelperImpl.java
@@ -0,0 +1,350 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.domaincontextcodegen.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage;

+import org.eclipse.papyrus.domaincontextcodegen.StereotypedElementHelper;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Stereotyped Element Helper</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.StereotypedElementHelperImpl#getStereotypeName <em>Stereotype Name</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.StereotypedElementHelperImpl#getStereotypePackage <em>Stereotype Package</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.StereotypedElementHelperImpl#getBaseElementName <em>Base Element Name</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.StereotypedElementHelperImpl#getBaseElementPackage <em>Base Element Package</em>}</li>

+ * </ul>

+ * </p>

+ * 

+ * @generated

+ */

+public class StereotypedElementHelperImpl extends GenHelperImpl implements StereotypedElementHelper {

+

+	/**

+	 * The default value of the '{@link #getStereotypeName() <em>Stereotype Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getStereotypeName()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String STEREOTYPE_NAME_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getStereotypeName() <em>Stereotype Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getStereotypeName()

+	 * @generated

+	 * @ordered

+	 */

+	protected String stereotypeName = STEREOTYPE_NAME_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getStereotypePackage() <em>Stereotype Package</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getStereotypePackage()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String STEREOTYPE_PACKAGE_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getStereotypePackage() <em>Stereotype Package</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getStereotypePackage()

+	 * @generated

+	 * @ordered

+	 */

+	protected String stereotypePackage = STEREOTYPE_PACKAGE_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getBaseElementName() <em>Base Element Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getBaseElementName()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String BASE_ELEMENT_NAME_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getBaseElementName() <em>Base Element Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getBaseElementName()

+	 * @generated

+	 * @ordered

+	 */

+	protected String baseElementName = BASE_ELEMENT_NAME_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getBaseElementPackage() <em>Base Element Package</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getBaseElementPackage()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String BASE_ELEMENT_PACKAGE_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getBaseElementPackage() <em>Base Element Package</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getBaseElementPackage()

+	 * @generated

+	 * @ordered

+	 */

+	protected String baseElementPackage = BASE_ELEMENT_PACKAGE_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected StereotypedElementHelperImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return DomaincontextcodegenPackage.Literals.STEREOTYPED_ELEMENT_HELPER;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public String getStereotypeName() {

+		return stereotypeName;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public void setStereotypeName(String newStereotypeName) {

+		String oldStereotypeName = stereotypeName;

+		stereotypeName = newStereotypeName;

+		if(eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_HELPER__STEREOTYPE_NAME, oldStereotypeName, stereotypeName));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public String getStereotypePackage() {

+		return stereotypePackage;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public void setStereotypePackage(String newStereotypePackage) {

+		String oldStereotypePackage = stereotypePackage;

+		stereotypePackage = newStereotypePackage;

+		if(eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_HELPER__STEREOTYPE_PACKAGE, oldStereotypePackage, stereotypePackage));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public String getBaseElementName() {

+		return baseElementName;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public void setBaseElementName(String newBaseElementName) {

+		String oldBaseElementName = baseElementName;

+		baseElementName = newBaseElementName;

+		if(eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_HELPER__BASE_ELEMENT_NAME, oldBaseElementName, baseElementName));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public String getBaseElementPackage() {

+		return baseElementPackage;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public void setBaseElementPackage(String newBaseElementPackage) {

+		String oldBaseElementPackage = baseElementPackage;

+		baseElementPackage = newBaseElementPackage;

+		if(eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_HELPER__BASE_ELEMENT_PACKAGE, oldBaseElementPackage, baseElementPackage));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_HELPER__STEREOTYPE_NAME:

+			return getStereotypeName();

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_HELPER__STEREOTYPE_PACKAGE:

+			return getStereotypePackage();

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_HELPER__BASE_ELEMENT_NAME:

+			return getBaseElementName();

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_HELPER__BASE_ELEMENT_PACKAGE:

+			return getBaseElementPackage();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_HELPER__STEREOTYPE_NAME:

+			setStereotypeName((String)newValue);

+			return;

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_HELPER__STEREOTYPE_PACKAGE:

+			setStereotypePackage((String)newValue);

+			return;

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_HELPER__BASE_ELEMENT_NAME:

+			setBaseElementName((String)newValue);

+			return;

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_HELPER__BASE_ELEMENT_PACKAGE:

+			setBaseElementPackage((String)newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_HELPER__STEREOTYPE_NAME:

+			setStereotypeName(STEREOTYPE_NAME_EDEFAULT);

+			return;

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_HELPER__STEREOTYPE_PACKAGE:

+			setStereotypePackage(STEREOTYPE_PACKAGE_EDEFAULT);

+			return;

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_HELPER__BASE_ELEMENT_NAME:

+			setBaseElementName(BASE_ELEMENT_NAME_EDEFAULT);

+			return;

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_HELPER__BASE_ELEMENT_PACKAGE:

+			setBaseElementPackage(BASE_ELEMENT_PACKAGE_EDEFAULT);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_HELPER__STEREOTYPE_NAME:

+			return STEREOTYPE_NAME_EDEFAULT == null ? stereotypeName != null : !STEREOTYPE_NAME_EDEFAULT.equals(stereotypeName);

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_HELPER__STEREOTYPE_PACKAGE:

+			return STEREOTYPE_PACKAGE_EDEFAULT == null ? stereotypePackage != null : !STEREOTYPE_PACKAGE_EDEFAULT.equals(stereotypePackage);

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_HELPER__BASE_ELEMENT_NAME:

+			return BASE_ELEMENT_NAME_EDEFAULT == null ? baseElementName != null : !BASE_ELEMENT_NAME_EDEFAULT.equals(baseElementName);

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_HELPER__BASE_ELEMENT_PACKAGE:

+			return BASE_ELEMENT_PACKAGE_EDEFAULT == null ? baseElementPackage != null : !BASE_ELEMENT_PACKAGE_EDEFAULT.equals(baseElementPackage);

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		if(eIsProxy())

+			return super.toString();

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (stereotypeName: ");

+		result.append(stereotypeName);

+		result.append(", stereotypePackage: ");

+		result.append(stereotypePackage);

+		result.append(", baseElementName: ");

+		result.append(baseElementName);

+		result.append(", baseElementPackage: ");

+		result.append(baseElementPackage);

+		result.append(')');

+		return result.toString();

+	}

+

+} //StereotypedElementHelperImpl

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/StereotypedElementMatcherImpl.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/StereotypedElementMatcherImpl.java
new file mode 100644
index 00000000000..5456f04c403
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/impl/StereotypedElementMatcherImpl.java
@@ -0,0 +1,350 @@
+/**

+ * <copyright>

+ * </copyright>

+ *

+ * $Id$

+ */

+package org.eclipse.papyrus.domaincontextcodegen.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage;

+import org.eclipse.papyrus.domaincontextcodegen.StereotypedElementMatcher;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Stereotyped Element Matcher</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.StereotypedElementMatcherImpl#getStereotypeName <em>Stereotype Name</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.StereotypedElementMatcherImpl#getStereotypePackage <em>Stereotype Package</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.StereotypedElementMatcherImpl#getBaseElementName <em>Base Element Name</em>}</li>

+ * <li>{@link org.eclipse.papyrus.domaincontextcodegen.impl.StereotypedElementMatcherImpl#getBaseElementPackage <em>Base Element Package</em>}</li>

+ * </ul>

+ * </p>

+ * 

+ * @generated

+ */

+public class StereotypedElementMatcherImpl extends GenMatcherImpl implements StereotypedElementMatcher {

+

+	/**

+	 * The default value of the '{@link #getStereotypeName() <em>Stereotype Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getStereotypeName()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String STEREOTYPE_NAME_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getStereotypeName() <em>Stereotype Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getStereotypeName()

+	 * @generated

+	 * @ordered

+	 */

+	protected String stereotypeName = STEREOTYPE_NAME_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getStereotypePackage() <em>Stereotype Package</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getStereotypePackage()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String STEREOTYPE_PACKAGE_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getStereotypePackage() <em>Stereotype Package</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getStereotypePackage()

+	 * @generated

+	 * @ordered

+	 */

+	protected String stereotypePackage = STEREOTYPE_PACKAGE_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getBaseElementName() <em>Base Element Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getBaseElementName()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String BASE_ELEMENT_NAME_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getBaseElementName() <em>Base Element Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getBaseElementName()

+	 * @generated

+	 * @ordered

+	 */

+	protected String baseElementName = BASE_ELEMENT_NAME_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getBaseElementPackage() <em>Base Element Package</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getBaseElementPackage()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String BASE_ELEMENT_PACKAGE_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getBaseElementPackage() <em>Base Element Package</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @see #getBaseElementPackage()

+	 * @generated

+	 * @ordered

+	 */

+	protected String baseElementPackage = BASE_ELEMENT_PACKAGE_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected StereotypedElementMatcherImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return DomaincontextcodegenPackage.Literals.STEREOTYPED_ELEMENT_MATCHER;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public String getStereotypeName() {

+		return stereotypeName;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public void setStereotypeName(String newStereotypeName) {

+		String oldStereotypeName = stereotypeName;

+		stereotypeName = newStereotypeName;

+		if(eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_MATCHER__STEREOTYPE_NAME, oldStereotypeName, stereotypeName));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public String getStereotypePackage() {

+		return stereotypePackage;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public void setStereotypePackage(String newStereotypePackage) {

+		String oldStereotypePackage = stereotypePackage;

+		stereotypePackage = newStereotypePackage;

+		if(eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_MATCHER__STEREOTYPE_PACKAGE, oldStereotypePackage, stereotypePackage));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public String getBaseElementName() {

+		return baseElementName;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public void setBaseElementName(String newBaseElementName) {

+		String oldBaseElementName = baseElementName;

+		baseElementName = newBaseElementName;

+		if(eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_MATCHER__BASE_ELEMENT_NAME, oldBaseElementName, baseElementName));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public String getBaseElementPackage() {

+		return baseElementPackage;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public void setBaseElementPackage(String newBaseElementPackage) {

+		String oldBaseElementPackage = baseElementPackage;

+		baseElementPackage = newBaseElementPackage;

+		if(eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_MATCHER__BASE_ELEMENT_PACKAGE, oldBaseElementPackage, baseElementPackage));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_MATCHER__STEREOTYPE_NAME:

+			return getStereotypeName();

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_MATCHER__STEREOTYPE_PACKAGE:

+			return getStereotypePackage();

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_MATCHER__BASE_ELEMENT_NAME:

+			return getBaseElementName();

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_MATCHER__BASE_ELEMENT_PACKAGE:

+			return getBaseElementPackage();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_MATCHER__STEREOTYPE_NAME:

+			setStereotypeName((String)newValue);

+			return;

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_MATCHER__STEREOTYPE_PACKAGE:

+			setStereotypePackage((String)newValue);

+			return;

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_MATCHER__BASE_ELEMENT_NAME:

+			setBaseElementName((String)newValue);

+			return;

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_MATCHER__BASE_ELEMENT_PACKAGE:

+			setBaseElementPackage((String)newValue);

+			return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_MATCHER__STEREOTYPE_NAME:

+			setStereotypeName(STEREOTYPE_NAME_EDEFAULT);

+			return;

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_MATCHER__STEREOTYPE_PACKAGE:

+			setStereotypePackage(STEREOTYPE_PACKAGE_EDEFAULT);

+			return;

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_MATCHER__BASE_ELEMENT_NAME:

+			setBaseElementName(BASE_ELEMENT_NAME_EDEFAULT);

+			return;

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_MATCHER__BASE_ELEMENT_PACKAGE:

+			setBaseElementPackage(BASE_ELEMENT_PACKAGE_EDEFAULT);

+			return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch(featureID) {

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_MATCHER__STEREOTYPE_NAME:

+			return STEREOTYPE_NAME_EDEFAULT == null ? stereotypeName != null : !STEREOTYPE_NAME_EDEFAULT.equals(stereotypeName);

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_MATCHER__STEREOTYPE_PACKAGE:

+			return STEREOTYPE_PACKAGE_EDEFAULT == null ? stereotypePackage != null : !STEREOTYPE_PACKAGE_EDEFAULT.equals(stereotypePackage);

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_MATCHER__BASE_ELEMENT_NAME:

+			return BASE_ELEMENT_NAME_EDEFAULT == null ? baseElementName != null : !BASE_ELEMENT_NAME_EDEFAULT.equals(baseElementName);

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_MATCHER__BASE_ELEMENT_PACKAGE:

+			return BASE_ELEMENT_PACKAGE_EDEFAULT == null ? baseElementPackage != null : !BASE_ELEMENT_PACKAGE_EDEFAULT.equals(baseElementPackage);

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		if(eIsProxy())

+			return super.toString();

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (stereotypeName: ");

+		result.append(stereotypeName);

+		result.append(", stereotypePackage: ");

+		result.append(stereotypePackage);

+		result.append(", baseElementName: ");

+		result.append(baseElementName);

+		result.append(", baseElementPackage: ");

+		result.append(baseElementPackage);

+		result.append(')');

+		return result.toString();

+	}

+

+} //StereotypedElementMatcherImpl

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/util/DomaincontextcodegenAdapterFactory.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/util/DomaincontextcodegenAdapterFactory.java
index 5a28d76365a..c4717c77403 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/util/DomaincontextcodegenAdapterFactory.java
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/util/DomaincontextcodegenAdapterFactory.java
@@ -10,13 +10,25 @@ 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.domaincontextcodegen.Advice;

 import org.eclipse.papyrus.domaincontextcodegen.AdviceBinding;

 import org.eclipse.papyrus.domaincontextcodegen.Binding;

+import org.eclipse.papyrus.domaincontextcodegen.Command;

+import org.eclipse.papyrus.domaincontextcodegen.CommandDeclaration;

 import org.eclipse.papyrus.domaincontextcodegen.DomainContext;

 import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage;

 import org.eclipse.papyrus.domaincontextcodegen.ElementType;

+import org.eclipse.papyrus.domaincontextcodegen.ElementTypeBinding;

+import org.eclipse.papyrus.domaincontextcodegen.ElementTypeBindings;

 import org.eclipse.papyrus.domaincontextcodegen.ElementTypes;

 import org.eclipse.papyrus.domaincontextcodegen.GenHandlers;

+import org.eclipse.papyrus.domaincontextcodegen.GenHelper;

+import org.eclipse.papyrus.domaincontextcodegen.GenMatcher;

+import org.eclipse.papyrus.domaincontextcodegen.MenuDeclaration;

+import org.eclipse.papyrus.domaincontextcodegen.MetaClassType;

+import org.eclipse.papyrus.domaincontextcodegen.SpecializationType;

+import org.eclipse.papyrus.domaincontextcodegen.StereotypedElementHelper;

+import org.eclipse.papyrus.domaincontextcodegen.StereotypedElementMatcher;

 

 /**

  * <!-- begin-user-doc -->

@@ -96,8 +108,23 @@ public class DomaincontextcodegenAdapterFactory extends AdapterFactoryImpl {
 		}

 

 		@Override

-		public Adapter caseAdviceBinding(AdviceBinding object) {

-			return createAdviceBindingAdapter();

+		public Adapter caseMetaClassType(MetaClassType object) {

+			return createMetaClassTypeAdapter();

+		}

+

+		@Override

+		public Adapter caseSpecializationType(SpecializationType object) {

+			return createSpecializationTypeAdapter();

+		}

+

+		@Override

+		public Adapter caseAdvice(Advice object) {

+			return createAdviceAdapter();

+		}

+

+		@Override

+		public Adapter caseElementTypeBindings(ElementTypeBindings object) {

+			return createElementTypeBindingsAdapter();

 		}

 

 		@Override

@@ -106,11 +133,56 @@ public class DomaincontextcodegenAdapterFactory extends AdapterFactoryImpl {
 		}

 

 		@Override

+		public Adapter caseElementTypeBinding(ElementTypeBinding object) {

+			return createElementTypeBindingAdapter();

+		}

+

+		@Override

+		public Adapter caseAdviceBinding(AdviceBinding object) {

+			return createAdviceBindingAdapter();

+		}

+

+		@Override

 		public Adapter caseGenHandlers(GenHandlers object) {

 			return createGenHandlersAdapter();

 		}

 

 		@Override

+		public Adapter caseGenMatcher(GenMatcher object) {

+			return createGenMatcherAdapter();

+		}

+

+		@Override

+		public Adapter caseGenHelper(GenHelper object) {

+			return createGenHelperAdapter();

+		}

+

+		@Override

+		public Adapter caseStereotypedElementMatcher(StereotypedElementMatcher object) {

+			return createStereotypedElementMatcherAdapter();

+		}

+

+		@Override

+		public Adapter caseStereotypedElementHelper(StereotypedElementHelper object) {

+			return createStereotypedElementHelperAdapter();

+		}

+

+		@Override

+		public Adapter caseMenuDeclaration(MenuDeclaration object) {

+			return createMenuDeclarationAdapter();

+		}

+

+		@Override

+		public Adapter caseCommandDeclaration(CommandDeclaration object) {

+			return createCommandDeclarationAdapter();

+		}

+

+		@Override

+		public Adapter caseCommand(Command object) {

+			return createCommandAdapter();

+		}

+

+		@Override

 		public Adapter defaultCase(EObject object) {

 			return createEObjectAdapter();

 		}

@@ -131,7 +203,6 @@ public class DomaincontextcodegenAdapterFactory extends AdapterFactoryImpl {
 		return modelSwitch.doSwitch((EObject)target);

 	}

 

-

 	/**

 	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.domaincontextcodegen.DomainContext <em>Domain Context</em>}'.

 	 * <!-- begin-user-doc -->

@@ -178,6 +249,68 @@ public class DomaincontextcodegenAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.domaincontextcodegen.MetaClassType <em>Meta Class Type</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.MetaClassType

+	 * @generated

+	 */

+	public Adapter createMetaClassTypeAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.domaincontextcodegen.SpecializationType <em>Specialization Type</em>}

+	 * '.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.SpecializationType

+	 * @generated

+	 */

+	public Adapter createSpecializationTypeAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.domaincontextcodegen.Advice <em>Advice</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.Advice

+	 * @generated

+	 */

+	public Adapter createAdviceAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.domaincontextcodegen.ElementTypeBindings

+	 * <em>Element Type Bindings</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.ElementTypeBindings

+	 * @generated

+	 */

+	public Adapter createElementTypeBindingsAdapter() {

+		return null;

+	}

+

+	/**

 	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.domaincontextcodegen.AdviceBinding <em>Advice Binding</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

@@ -208,6 +341,22 @@ public class DomaincontextcodegenAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.domaincontextcodegen.ElementTypeBinding <em>Element Type Binding</em>}

+	 * '.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.ElementTypeBinding

+	 * @generated

+	 */

+	public Adapter createElementTypeBindingAdapter() {

+		return null;

+	}

+

+	/**

 	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.domaincontextcodegen.GenHandlers <em>Gen Handlers</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

@@ -223,6 +372,114 @@ public class DomaincontextcodegenAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.domaincontextcodegen.GenMatcher <em>Gen Matcher</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.GenMatcher

+	 * @generated

+	 */

+	public Adapter createGenMatcherAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.domaincontextcodegen.GenHelper <em>Gen Helper</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.GenHelper

+	 * @generated

+	 */

+	public Adapter createGenHelperAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.domaincontextcodegen.StereotypedElementMatcher

+	 * <em>Stereotyped Element Matcher</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.StereotypedElementMatcher

+	 * @generated

+	 */

+	public Adapter createStereotypedElementMatcherAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.domaincontextcodegen.StereotypedElementHelper

+	 * <em>Stereotyped Element Helper</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.StereotypedElementHelper

+	 * @generated

+	 */

+	public Adapter createStereotypedElementHelperAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.domaincontextcodegen.MenuDeclaration <em>Menu Declaration</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.MenuDeclaration

+	 * @generated

+	 */

+	public Adapter createMenuDeclarationAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.domaincontextcodegen.CommandDeclaration <em>Command Declaration</em>}

+	 * '.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.CommandDeclaration

+	 * @generated

+	 */

+	public Adapter createCommandDeclarationAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.domaincontextcodegen.Command <em>Command</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.domaincontextcodegen.Command

+	 * @generated

+	 */

+	public Adapter createCommandAdapter() {

+		return null;

+	}

+

+	/**

 	 * Creates a new adapter for the default case.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null.

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/util/DomaincontextcodegenSwitch.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/util/DomaincontextcodegenSwitch.java
index 7343b9ed0ac..2e0803f0ceb 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/util/DomaincontextcodegenSwitch.java
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/src/org/eclipse/papyrus/domaincontextcodegen/util/DomaincontextcodegenSwitch.java
@@ -10,13 +10,25 @@ import java.util.List;
 

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

+import org.eclipse.papyrus.domaincontextcodegen.Advice;

 import org.eclipse.papyrus.domaincontextcodegen.AdviceBinding;

 import org.eclipse.papyrus.domaincontextcodegen.Binding;

+import org.eclipse.papyrus.domaincontextcodegen.Command;

+import org.eclipse.papyrus.domaincontextcodegen.CommandDeclaration;

 import org.eclipse.papyrus.domaincontextcodegen.DomainContext;

 import org.eclipse.papyrus.domaincontextcodegen.DomaincontextcodegenPackage;

 import org.eclipse.papyrus.domaincontextcodegen.ElementType;

+import org.eclipse.papyrus.domaincontextcodegen.ElementTypeBinding;

+import org.eclipse.papyrus.domaincontextcodegen.ElementTypeBindings;

 import org.eclipse.papyrus.domaincontextcodegen.ElementTypes;

 import org.eclipse.papyrus.domaincontextcodegen.GenHandlers;

+import org.eclipse.papyrus.domaincontextcodegen.GenHelper;

+import org.eclipse.papyrus.domaincontextcodegen.GenMatcher;

+import org.eclipse.papyrus.domaincontextcodegen.MenuDeclaration;

+import org.eclipse.papyrus.domaincontextcodegen.MetaClassType;

+import org.eclipse.papyrus.domaincontextcodegen.SpecializationType;

+import org.eclipse.papyrus.domaincontextcodegen.StereotypedElementHelper;

+import org.eclipse.papyrus.domaincontextcodegen.StereotypedElementMatcher;

 

 /**

  * <!-- begin-user-doc -->

@@ -118,10 +130,38 @@ public class DomaincontextcodegenSwitch<T> {
 				result = defaultCase(theEObject);

 			return result;

 		}

-		case DomaincontextcodegenPackage.ADVICE_BINDING:

+		case DomaincontextcodegenPackage.META_CLASS_TYPE:

 		{

-			AdviceBinding adviceBinding = (AdviceBinding)theEObject;

-			T result = caseAdviceBinding(adviceBinding);

+			MetaClassType metaClassType = (MetaClassType)theEObject;

+			T result = caseMetaClassType(metaClassType);

+			if(result == null)

+				result = caseElementType(metaClassType);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case DomaincontextcodegenPackage.SPECIALIZATION_TYPE:

+		{

+			SpecializationType specializationType = (SpecializationType)theEObject;

+			T result = caseSpecializationType(specializationType);

+			if(result == null)

+				result = caseElementType(specializationType);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case DomaincontextcodegenPackage.ADVICE:

+		{

+			Advice advice = (Advice)theEObject;

+			T result = caseAdvice(advice);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case DomaincontextcodegenPackage.ELEMENT_TYPE_BINDINGS:

+		{

+			ElementTypeBindings elementTypeBindings = (ElementTypeBindings)theEObject;

+			T result = caseElementTypeBindings(elementTypeBindings);

 			if(result == null)

 				result = defaultCase(theEObject);

 			return result;

@@ -134,6 +174,26 @@ public class DomaincontextcodegenSwitch<T> {
 				result = defaultCase(theEObject);

 			return result;

 		}

+		case DomaincontextcodegenPackage.ELEMENT_TYPE_BINDING:

+		{

+			ElementTypeBinding elementTypeBinding = (ElementTypeBinding)theEObject;

+			T result = caseElementTypeBinding(elementTypeBinding);

+			if(result == null)

+				result = caseBinding(elementTypeBinding);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case DomaincontextcodegenPackage.ADVICE_BINDING:

+		{

+			AdviceBinding adviceBinding = (AdviceBinding)theEObject;

+			T result = caseAdviceBinding(adviceBinding);

+			if(result == null)

+				result = caseBinding(adviceBinding);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

 		case DomaincontextcodegenPackage.GEN_HANDLERS:

 		{

 			GenHandlers genHandlers = (GenHandlers)theEObject;

@@ -142,6 +202,66 @@ public class DomaincontextcodegenSwitch<T> {
 				result = defaultCase(theEObject);

 			return result;

 		}

+		case DomaincontextcodegenPackage.GEN_MATCHER:

+		{

+			GenMatcher genMatcher = (GenMatcher)theEObject;

+			T result = caseGenMatcher(genMatcher);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case DomaincontextcodegenPackage.GEN_HELPER:

+		{

+			GenHelper genHelper = (GenHelper)theEObject;

+			T result = caseGenHelper(genHelper);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_MATCHER:

+		{

+			StereotypedElementMatcher stereotypedElementMatcher = (StereotypedElementMatcher)theEObject;

+			T result = caseStereotypedElementMatcher(stereotypedElementMatcher);

+			if(result == null)

+				result = caseGenMatcher(stereotypedElementMatcher);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case DomaincontextcodegenPackage.STEREOTYPED_ELEMENT_HELPER:

+		{

+			StereotypedElementHelper stereotypedElementHelper = (StereotypedElementHelper)theEObject;

+			T result = caseStereotypedElementHelper(stereotypedElementHelper);

+			if(result == null)

+				result = caseGenHelper(stereotypedElementHelper);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case DomaincontextcodegenPackage.MENU_DECLARATION:

+		{

+			MenuDeclaration menuDeclaration = (MenuDeclaration)theEObject;

+			T result = caseMenuDeclaration(menuDeclaration);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case DomaincontextcodegenPackage.COMMAND_DECLARATION:

+		{

+			CommandDeclaration commandDeclaration = (CommandDeclaration)theEObject;

+			T result = caseCommandDeclaration(commandDeclaration);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

+		case DomaincontextcodegenPackage.COMMAND:

+		{

+			Command command = (Command)theEObject;

+			T result = caseCommand(command);

+			if(result == null)

+				result = defaultCase(theEObject);

+			return result;

+		}

 		default:

 			return defaultCase(theEObject);

 		}

@@ -199,6 +319,74 @@ public class DomaincontextcodegenSwitch<T> {
 	}

 

 	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Meta Class Type</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param object

+	 *        the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Meta Class Type</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseMetaClassType(MetaClassType object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Specialization Type</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param object

+	 *        the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Specialization Type</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseSpecializationType(SpecializationType object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Advice</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param object

+	 *        the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Advice</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseAdvice(Advice object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Element Type Bindings</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param object

+	 *        the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Element Type Bindings</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseElementTypeBindings(ElementTypeBindings object) {

+		return null;

+	}

+

+	/**

 	 * Returns the result of interpreting the object as an instance of '<em>Advice Binding</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

@@ -233,6 +421,23 @@ public class DomaincontextcodegenSwitch<T> {
 	}

 

 	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Element Type Binding</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param object

+	 *        the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Element Type Binding</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseElementTypeBinding(ElementTypeBinding object) {

+		return null;

+	}

+

+	/**

 	 * Returns the result of interpreting the object as an instance of '<em>Gen Handlers</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

@@ -250,6 +455,125 @@ public class DomaincontextcodegenSwitch<T> {
 	}

 

 	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Gen Matcher</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param object

+	 *        the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Gen Matcher</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseGenMatcher(GenMatcher object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Gen Helper</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param object

+	 *        the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Gen Helper</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseGenHelper(GenHelper object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Stereotyped Element Matcher</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param object

+	 *        the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Stereotyped Element Matcher</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseStereotypedElementMatcher(StereotypedElementMatcher object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Stereotyped Element Helper</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param object

+	 *        the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Stereotyped Element Helper</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseStereotypedElementHelper(StereotypedElementHelper object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Menu Declaration</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param object

+	 *        the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Menu Declaration</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseMenuDeclaration(MenuDeclaration object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Command Declaration</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param object

+	 *        the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Command Declaration</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseCommandDeclaration(CommandDeclaration object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Command</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param object

+	 *        the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Command</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseCommand(Command object) {

+		return null;

+	}

+

+	/**

 	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/transforsrc/org/eclipse/papyrus/domaincontextcodegen/ModelUtils.mtl b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/transforsrc/org/eclipse/papyrus/domaincontextcodegen/ModelUtils.mtl
new file mode 100644
index 00000000000..f9de3698e01
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/transforsrc/org/eclipse/papyrus/domaincontextcodegen/ModelUtils.mtl
@@ -0,0 +1,13 @@
+[comment encoding = UTF-8 /]
+[module ModelUtils('http://www.eclipse.org/papyrus/2010/domaincontextcodegen', 'http://www.eclipse.org/emf/2002/GenModel', 'http://www.eclipse.org/emf/2002/Ecore')/]
+
+[query public getSemanticHint(type : ElementType) : String = type.owner.domain.elementTypeNamePrefix + '::' + type.name/]
+[query public getElementTypeID(type : ElementType) : String = type.owner.domain.elementTypeIDPrefix + '.' + type.name/]
+[query public getCommandID(type : ElementType) : String = type.owner.domain.handlerProjectName + '.' + type.name + 'CreateCommand'/]
+[query public getCommandHandler(type : ElementType) : String = type.owner.domain.handlerProjectName + '.handler.' + type.name + 'Handler'/]
+
+[query public formatUpperWithSep(str : String) : String = invoke('org.eclipse.papyrus.domaincontextcodegen.utils.StringUtils', 'formatUpperWithSep(java.lang.String)', Sequence{str})/]
+
+[query public isAbstract(type : ElementType) : Boolean = invoke('org.eclipse.papyrus.domaincontextcodegen.utils.ModelUtils', 'isAbstract(org.eclipse.papyrus.domaincontextcodegen.ElementType)', Sequence{type})/]
+
+ 
\ No newline at end of file
diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/transforsrc/org/eclipse/papyrus/domaincontextcodegen/generateElementHandler.mtl b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/transforsrc/org/eclipse/papyrus/domaincontextcodegen/generateElementHandler.mtl
index f3488bb82cb..eef9d694b66 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/transforsrc/org/eclipse/papyrus/domaincontextcodegen/generateElementHandler.mtl
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/transforsrc/org/eclipse/papyrus/domaincontextcodegen/generateElementHandler.mtl
@@ -1,12 +1,14 @@
 [comment encoding = UTF-8 /]
 [module generateElementHandler('http://www.eclipse.org/papyrus/2010/domaincontextcodegen','http://www.eclipse.org/emf/2002/Ecore')/]
 
+[import org::eclipse::papyrus::domaincontextcodegen::ModelUtils /]
+
 [template public generateElementHandler(domain : DomainContext)]
 	
 [comment this template is used to generate an enumeration of all handlers + an abstract handler/]
 
-[for (type:ElementType |domain.elementTypes.types)]
-[file (domain.handlerProjectName+'/'+domain.generatedSourceFolder+'/'+domain.handlerProjectName.substituteAll('.', '/').concat('/handler/'+type.metaClass.name.concat('Handler.java')), false, 'UTF-8')]
+[for (type : ElementType | domain.elementTypes.types)]
+[file (domain.handlerProjectName+'/'+domain.generatedSourceFolder+'/'+type.getCommandHandler().substituteAll('.', '/').concat('.java'), false, 'UTF-8')]
 package [domain.genHandlers.handlerPackage/];
 
 import org.eclipse.core.commands.IHandler;
@@ -16,16 +18,16 @@ import [domain.genHandlers.superClassPackage/].[domain.genHandlers.superClass/];
 
 /**
  * <pre>
- * Command handler for [type.metaClass.name/] creation
+ * Command handler for [type.name/] creation
  *
  * </pre>
  * @generated
  */
-public class [type.metaClass.name/]Handler extends [domain.genHandlers.superClass/] implements IHandler {
+public class [type.name/]Handler extends [domain.genHandlers.superClass/] implements IHandler {
 
 	/**
 	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
+	 * @see [domain.genHandlers.superClassPackage/].[domain.genHandlers.superClass/]#getElementTypeToCreate()
 	 *
 	 * @return the IElementType this handler is supposed to create
 	 *
@@ -33,7 +35,7 @@ public class [type.metaClass.name/]Handler extends [domain.genHandlers.superClas
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
-		return [domain.genHandlers.elementTypeEnumerator/].[type.specificName/];
+		return [domain.genHandlers.elementTypeEnumerator/].[type.name.formatUpperWithSep()/];
 	}
 }
 
@@ -41,3 +43,42 @@ public class [type.metaClass.name/]Handler extends [domain.genHandlers.superClas
 [/for]
 	
 [/template]
+
+
+[template public generateCommandFilter(domain : DomainContext)]
+[file (domain.handlerProjectName+'/'+domain.generatedSourceFolder+'/'+domain.handlerProjectName.substituteAll('.', '/').concat('/filter/CommandFilter.java'), false, 'UTF-8')]
+package [domain.handlerProjectName/].filter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import [domain.genHandlers.elementTypeEnumeratorPackage/].[domain.genHandlers.elementTypeEnumerator/];
+[if (not domain.specializationOf.oclIsUndefined())]
+import [domain.specializationOf.genHandlers.elementTypeEnumeratorPackage/].[domain.specializationOf.genHandlers.elementTypeEnumerator/];	
+[/if]
+
+public class CommandFilter {
+
+	private static List<IElementType> visibleCommands;
+
+	public static List<IElementType> getVisibleCommands() {
+		if(visibleCommands == null) {
+			visibleCommands = new ArrayList<IElementType>();
+
+[for (domainElt : ElementType | domain.elementTypes.types->select(not isAbstract()))]
+	[if (domain.genHandlers.visibleCreateChildHandlers->includes(domainElt))]
+			visibleCommands.add([domain.genHandlers.elementTypeEnumerator/].[domainElt.name.formatUpperWithSep()/]);
+	[/if]
+	[if (not domain.genHandlers.visibleCreateChildHandlers->includes(domainElt))]
+			// visibleCommands.add([domain.genHandlers.elementTypeEnumerator/].[domainElt.name.formatUpperWithSep()/]);
+	[/if]		
+[/for]			
+		}
+
+		return visibleCommands;
+	}
+}
+[/file]
+
+[/template]
\ No newline at end of file
diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/transforsrc/org/eclipse/papyrus/domaincontextcodegen/generateElementTypeClass.mtl b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/transforsrc/org/eclipse/papyrus/domaincontextcodegen/generateElementTypeClass.mtl
index 50ec33bc053..2188ae8337c 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/transforsrc/org/eclipse/papyrus/domaincontextcodegen/generateElementTypeClass.mtl
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/transforsrc/org/eclipse/papyrus/domaincontextcodegen/generateElementTypeClass.mtl
@@ -1,26 +1,150 @@
 [comment encoding = UTF-8 /]
 [module generateElementTypeClass('http://www.eclipse.org/papyrus/2010/domaincontextcodegen','http://www.eclipse.org/emf/2002/Ecore')/]
 
+[import org::eclipse::papyrus::domaincontextcodegen::ModelUtils /]
+
 [template public generateElementTypeClass(domain : DomainContext)]
 
 	[comment @main /]
 	[comment this template is used to generate an enumeration of all elementtypes/]
 	
 [file (domain.typeProjectName+'/'+domain.generatedSourceFolder+'/'+domain.typeProjectName.substituteAll('.', '/').concat('/element/'+domain.elementTypeNamePrefix.concat('ElementTypes.java')), false, 'UTF-8')]
-
 package [ domain.typeProjectName.concat('.element')/];
+
 import org.eclipse.gmf.runtime.emf.type.core.AbstractElementTypeEnumerator;
 import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
 
 /** Convenient utility class listing IElementType declared in plugin.xml */
 public class [domain.elementTypeNamePrefix/]ElementTypes extends AbstractElementTypeEnumerator {
 
-[for (type:ElementType|domain.elementTypes.types)]
-	/** IElementType for [domain.elementTypeNamePrefix /] [ type.metaClass.name/] */
-	public static final IHintedType [type.specificName/] = (IHintedType)getElementType("[domain.elementTypeIDPrefix.concat('.'+type.metaClass.name)/]");
+[for (type : MetaClassType | domain.elementTypes.types->select(oclIsTypeOf(MetaClassType)))]
+	/** IElementType for [domain.elementTypeNamePrefix/] [type.name/] */
+	public static final IHintedType [type.name.formatUpperWithSep()/] = (IHintedType)getElementType("[type.getElementTypeID()/]"); //$NON-NLS-1$
+	
+[/for ]
+[for (type : SpecializationType | domain.elementTypes.types->select(oclIsTypeOf(SpecializationType)))]
+	/** IElementType for [domain.elementTypeNamePrefix/] [type.name/] */
+	public static final IHintedType [type.name.formatUpperWithSep()/] = (IHintedType)getElementType("[type.getElementTypeID()/]"); //$NON-NLS-1$
 	
 [/for ]
 }
 [/file]
-	
+
+
+[comment generate Matcher and Helper if possible /]
+[for (type : SpecializationType | domain.elementTypes.types->select(oclIsTypeOf(SpecializationType)))]
+
+[comment generate Matcher /]
+[if (not type.genMatcher.oclIsUndefined())]
+[file (domain.typeProjectName+'/'+domain.generatedSourceFolder+'/'+domain.typeProjectName.substituteAll('.', '/').concat('/matcher/'+type.genMatcher.name.concat('.java')), false, 'UTF-8')]
+[comment type.generateMatcher()/]
+[/file]
+[/if]
+
+[comment generate Helper /]
+[if (not type.genHelper.oclIsUndefined())]
+[file (domain.typeProjectName+'/'+domain.generatedSourceFolder+'/'+domain.typeProjectName.substituteAll('.', '/').concat('/helper/'+type.genHelper.name.concat('.java')), false, 'UTF-8')]
+[comment type.generateHelper()/]
+[/file]
+[/if]
+
+[/for ]
+[/template]
+
+[template public generateMatcher(type : SpecializationType)]
+/*****************************************************************************
+ * Copyright (c) 2010 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
+ *
+ *****************************************************************************/
+package [type.owner.domain.typeProjectName/].matcher;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
+import [type.genMatcher.oclAsType(StereotypedElementMatcher).baseElementPackage/].[type.genMatcher.oclAsType(StereotypedElementMatcher).baseElementName/];
+import [type.genMatcher.oclAsType(StereotypedElementMatcher).stereotypePackage/].[type.genMatcher.oclAsType(StereotypedElementMatcher).stereotypeName/];
+import org.eclipse.papyrus.sysml.service.types.utils.ElementUtil;
+
+/**
+ * Test if current [type.genMatcher.oclAsType(StereotypedElementMatcher).baseElementName/] is a [type.name/]
+ */
+public class [type.genMatcher.name/] implements IElementMatcher {
+
+	public boolean matches(EObject eObject) {
+
+		boolean isMatch = false;
+		if(eObject instanceof [type.genMatcher.oclAsType(StereotypedElementMatcher).baseElementName/]) {
+
+			[type.genMatcher.oclAsType(StereotypedElementMatcher).baseElementName/] element = ([type.genMatcher.oclAsType(StereotypedElementMatcher).baseElementName/])eObject;
+			if(ElementUtil.getStereotypeApplication(element, [type.genMatcher.oclAsType(StereotypedElementMatcher).stereotypeName/].class) != null) {
+				isMatch = true;
+			}
+		}
+		return isMatch;
+	}
+
+}
+[/template]
+
+[template public generateHelper(type : SpecializationType)]
+/*****************************************************************************
+ * Copyright (c) 2010 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
+ *
+ *****************************************************************************/
+package [type.owner.domain.typeProjectName/].helper;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;
+import org.eclipse.papyrus.sysml.service.types.utils.NamedElementHelper;
+import org.eclipse.papyrus.sysml.util.SysmlResource;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.Stereotype;
+
+/** [type.owner.domain.elementTypeNamePrefix/] [type.name/] edit helper advice */
+public class [type.genHelper.name/] extends AbstractStereotypedElementEditHelperAdvice {
+
+	/** Default constructor */
+	public [type.genHelper.name/]() {
+		requiredProfileIDs.add(SysmlResource.REQUIREMENTS_ID);
+	}
+
+	/** Complete creation process by applying the expected stereotype */
+	@Override
+	protected ICommand getAfterConfigureCommand(final ConfigureRequest request) {
+
+		return new ConfigureElementCommand(request) {
+
+			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+				NamedElement element = (NamedElement)request.getElementToConfigure();
+				if(element != null) {
+					Stereotype stereotypeToApply = element.getApplicableStereotype(SysmlResource.DERIVE_REQT_ID);
+					if(stereotypeToApply != null) {
+						element.applyStereotype(stereotypeToApply);
+					}
+
+					// Set default name
+					// Initialize the element name based on the created IElementType
+					String initializedName = NamedElementHelper.EINSTANCE.getNewUMLElementName(element.getOwner(), RequirementsPackage.eINSTANCE.getDeriveReqt());
+					element.setName(initializedName);
+				}
+				return CommandResult.newOKCommandResult();
+			}
+		};
+	}
+}
 [/template]
diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/transforsrc/org/eclipse/papyrus/domaincontextcodegen/generateHandlers.mtl b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/transforsrc/org/eclipse/papyrus/domaincontextcodegen/generateHandlers.mtl
index 855029ac017..3e953110eac 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/transforsrc/org/eclipse/papyrus/domaincontextcodegen/generateHandlers.mtl
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/transforsrc/org/eclipse/papyrus/domaincontextcodegen/generateHandlers.mtl
@@ -7,6 +7,7 @@
 [template public generateHandlers(domain : DomainContext)]
 	
 	[domain.generateElementHandler()/]
+	[domain.generateCommandFilter()/]
 	[domain.generateXMLElementHandler()/]
 	
 [/template]
diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/transforsrc/org/eclipse/papyrus/domaincontextcodegen/generateXMLElementHandler.mtl b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/transforsrc/org/eclipse/papyrus/domaincontextcodegen/generateXMLElementHandler.mtl
index 75653522d3f..0d2fb68b8b8 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/transforsrc/org/eclipse/papyrus/domaincontextcodegen/generateXMLElementHandler.mtl
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/transforsrc/org/eclipse/papyrus/domaincontextcodegen/generateXMLElementHandler.mtl
@@ -1,6 +1,8 @@
 [comment encoding = UTF-8 /]
 [module generateXMLElementHandler('http://www.eclipse.org/papyrus/2010/domaincontextcodegen','http://www.eclipse.org/emf/2002/Ecore')/]
 
+[import org::eclipse::papyrus::domaincontextcodegen::ModelUtils /]
+
 [template public generateXMLElementHandler(domain : DomainContext)]
 	[comment @main /]
 	[comment this template is used to generate the plugin.xml /]
@@ -13,16 +15,14 @@
 [comment generation of all command attached to an handler /]
 <!-- Creation command declarations -->
 <extension point="org.eclipse.ui.commands">
-[for (type:ElementType|domain.elementTypes.types)]
-	[if (type.metaClass.abstract=false)]
-	<!-- Creation command for [type.metaClass.name/] -->
+[for (type : ElementType | domain.elementTypes.types->select(not isAbstract()))]
+	<!-- Creation command for [type.name/] -->
 	<command categoryId="org.eclipse.papyrus.editor.category"
-		id="[domain.handlerProjectName+'.'+type.metaClass.name+'CreateCommand'/]"
-		name="Create a new [type.metaClass.name/]" description="Create a new [type.metaClass.name/]"
-		defaultHandler="[domain.handlerProjectName.concat('.handler.')+type.metaClass.name/]Handler">
+		id="[type.getCommandID()/]"
+		name="Create a new [type.name/]" description="Create a new [type.name/]"
+		defaultHandler="[type.getCommandHandler()/]">
 	</command>
 	
-	[/if]
 [/for ]
 </extension>
 
@@ -31,20 +31,26 @@
 <!-- UI Menu declaration for creation commands -->
 <extension point="org.eclipse.ui.menus">
 
-	<menuContribution locationURI="popup:org.eclipse.papyrus.modelexplorer.popupmenu.createchild"
-		allPopups="false">
-	
-	[for (type:ElementType|domain.elementTypes.types)]
-	[if (type.metaClass.abstract=false)]
-		<!-- Creation menu action for [type.metaClass.name/] -->
-		<command commandId="[domain.handlerProjectName+'.'+type.metaClass.name+'CreateCommand'/]"
-			label="Create a new [type.metaClass.name/]" tooltip="Create a new [type.metaClass.name/]" style="push"		
-			icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/[type.metaClass.name/].gif" >
+	<menuContribution locationURI="[domain.genHandlers.createChildMenuLocationURI/]" allPopups="false">
+
+[for (type : ElementType | domain.elementTypes.types->select(not isAbstract()))]
+		<!-- Creation menu action for [type.name/] -->
+		<command commandId="[type.getCommandID()/]"
+			label="Create a new [type.name/]" tooltip="Create a new [type.name/]" style="push"		
+			icon="[type.icon/]" >
 			<visibleWhen checkEnabled="true"/>
 		</command>
 		
-	[/if]
-	[/for ]
+[/for ]	
+[for (type : ElementType | domain.genHandlers.parentDomainCreateChild->select(not isAbstract()))]
+		<!-- Creation menu action for [type.name/] -->
+		<command commandId="[type.getCommandID()/]"
+			label="Create a new [type.name/]" tooltip="Create a new [type.name/]" style="push"		
+			icon="[type.icon/]" >
+			<visibleWhen checkEnabled="true"/>
+		</command>
+		
+[/for ]
 	</menuContribution>
 	
 </extension>
diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/transforsrc/org/eclipse/papyrus/domaincontextcodegen/generateXMLElementType.mtl b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/transforsrc/org/eclipse/papyrus/domaincontextcodegen/generateXMLElementType.mtl
index a5726f7448e..df837118e71 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/transforsrc/org/eclipse/papyrus/domaincontextcodegen/generateXMLElementType.mtl
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/transforsrc/org/eclipse/papyrus/domaincontextcodegen/generateXMLElementType.mtl
@@ -1,6 +1,9 @@
 [comment encoding = UTF-8 /]
 [module generateXMLElementType('http://www.eclipse.org/papyrus/2010/domaincontextcodegen','http://www.eclipse.org/emf/2002/Ecore')/]
 
+[import org::eclipse::papyrus::domaincontextcodegen::ModelUtils
+ /]
+
 [template public generateXMLElementType(domain : DomainContext)]
 	[comment @main /]
 	[comment this template is used to generate the plugin.xml /]
@@ -9,38 +12,74 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <plugin>
-	
+
 [comment generation of all elementType/]
+<!-- [domain.elementTypeNamePrefix/] ElementTypes declarations -->
 <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
 
 	<metamodel nsURI="[domain.metamodel.nsURI/]">
 	
 	<!-- Declaration of IElementTypes -->
 	
-[for (type:ElementType|domain.elementTypes.types)]
-	<!-- IElementTypes for [type.metaClass.name/] -->
-	<metamodelType eclass="[type.metaClass.name/]" id="[domain.elementTypeIDPrefix+'.'+type.metaClass.name/]"
-		edithelper="[type.edithelper_EditHelperAdvicePath/]"
-		kind="[type.kind/]" name="[domain.elementTypeNamePrefix+'::'+type.metaClass.name/]">
-		<param name="semanticHint" value="[domain.elementTypeNamePrefix+'::'+type.metaClass.name/]"/>
+[for (type : MetaClassType | domain.elementTypes.types->select(oclIsTypeOf(MetaClassType)))]
+	<!-- IMetamodelType for [type.name/] -->
+	<metamodelType id="[type.getElementTypeID()/]" name="[type.getSemanticHint()/]"
+		eclass="[type.metaClass.name/]" 
+		edithelper="[type.helper/]"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="[type.getSemanticHint()/]"/>
 	</metamodelType>
 	
 [/for]
+[for (type : SpecializationType | domain.elementTypes.types->select(oclIsTypeOf(SpecializationType)))]
+	<!-- ISpecializationType [type.name/] of [type.ref.getSemanticHint() /] -->
+	<specializationType id="[type.getElementTypeID()/]" name="[type.getSemanticHint()/]"
+		edithelperadvice="[type.helper/]"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="[type.getSemanticHint()/]"/>
+		<specializes id="[type.ref.getElementTypeID()/]" />
+		<matcher class ="[type.matcher/]" />
+	</specializationType>
+	
+[/for]
+	</metamodel>
+</extension>
 
 [comment generation of all advicebindings/]
-	<!-- Declaration of AdviceBindings -->
+[if (not domain.advices->isEmpty())]
+<!-- Helper advice declarations -->
+<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
+
+	<metamodel nsURI="[domain.metamodel.nsURI/]">
 	
-[for (advice: AdviceBinding|domain.advicebindings)]
-	<!-- AdviceBinding for [advice.adviceID/] -->		
+[for (advice : Advice | domain.advices)]	
+	<!-- Helper advice for [advice.ref.name/] -->
 	<adviceBinding id="[advice.adviceID/]"
-		class="[advice.advicePath/]" inheritance="[advice.inheritance/]"
-		typeId="[domain.elementTypeIDPrefix+'.'+advice.elementTypeRef.metaClass.name/]">
+		class="[advice.advicePath/]"
+		inheritance="[advice.inheritance/]" typeId="[advice.ref.getElementTypeID()/]">
 	</adviceBinding>
-		
-[/for]
-   
+	
+[/for]  
 	</metamodel>
+</extension>
+[/if]
+
+[comment generation of all bindings/]
+<!-- [domain.elementTypeNamePrefix/] ElementType bindings to Papyrus shared IClientContext -->
+<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">
+
+	<!-- Bindings declaration -->
+	<binding context="[domain.bindings.clientContextID/]">
+	
+[for (binding : ElementTypeBinding | domain.bindings.bindings->select(oclIsTypeOf(ElementTypeBinding)))]
+		[binding.GenBinding()/]
+[/for]
+[for (binding : AdviceBinding | domain.bindings.bindings->select(oclIsTypeOf(AdviceBinding)))]
+		[binding.GenBinding()/]
+[/for]
 
+	</binding>
+	
 </extension>
 
 </plugin>
@@ -48,3 +87,13 @@
 [/file]
 	
 [/template]
+
+[template private GenBinding(binding : ElementTypeBinding)]
+[if (not binding.ref.oclIsUndefined())]<elementType ref="[binding.ref.getElementTypeID()/]" />[/if]
+[if (not binding.pattern.oclIsUndefined())]<elementType pattern="[binding.pattern/]" />[/if]
+[/template]
+
+[template private GenBinding(binding : AdviceBinding)]
+[if (not binding.ref.oclIsUndefined())]<advice ref="[binding.ref.adviceID/]" />[/if]
+[if (not binding.pattern.oclIsUndefined())]<advice pattern="[binding.pattern/]" />[/if]
+[/template]
diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/transforsrc/org/eclipse/papyrus/domaincontextcodegen/utils/ModelUtils.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/transforsrc/org/eclipse/papyrus/domaincontextcodegen/utils/ModelUtils.java
new file mode 100644
index 00000000000..8aa46e1a6dd
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/transforsrc/org/eclipse/papyrus/domaincontextcodegen/utils/ModelUtils.java
@@ -0,0 +1,51 @@
+/*******************************************************************************

+ * Copyright (c) 2010 CEA LIST.

+ * All rights reserved. This program and the accompanying materials

+ * are property of the CEA, their use is subject to specific agreement 

+ * with the CEA.

+ * 

+ * Contributors:

+ *    CEA LIST - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.papyrus.domaincontextcodegen.utils;

+

+import org.eclipse.papyrus.domaincontextcodegen.ElementType;

+import org.eclipse.papyrus.domaincontextcodegen.MetaClassType;

+import org.eclipse.papyrus.domaincontextcodegen.SpecializationType;

+

+public class ModelUtils {

+

+	public boolean isAbstract(ElementType type) {

+

+		boolean isAbstract = false;

+

+		MetaClassType mt = null;

+		if(type instanceof MetaClassType) {

+			mt = (MetaClassType)type;

+			isAbstract = mt.getMetaClass().isAbstract();

+

+		} else if(type instanceof SpecializationType) {

+			SpecializationType st = (SpecializationType)type;

+			mt = getMetaClassType(st);

+		}

+

+		if(mt != null) {

+			isAbstract = mt.getMetaClass().isAbstract();

+		}

+

+		return isAbstract;

+	}

+

+	private MetaClassType getMetaClassType(SpecializationType st) {

+

+		if(st.getRef() instanceof MetaClassType) {

+			return (MetaClassType)st.getRef();

+

+		} else if(st.getRef() instanceof SpecializationType) {

+			return getMetaClassType((SpecializationType)st.getRef());

+

+		}

+

+		return null;

+	}

+}

diff --git a/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/transforsrc/org/eclipse/papyrus/domaincontextcodegen/utils/StringUtils.java b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/transforsrc/org/eclipse/papyrus/domaincontextcodegen/utils/StringUtils.java
new file mode 100644
index 00000000000..e9da049b2e3
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.domaincontextcodegen/transforsrc/org/eclipse/papyrus/domaincontextcodegen/utils/StringUtils.java
@@ -0,0 +1,19 @@
+/*******************************************************************************

+ * Copyright (c) 2010 CEA LIST.

+ * All rights reserved. This program and the accompanying materials

+ * are property of the CEA, their use is subject to specific agreement 

+ * with the CEA.

+ * 

+ * Contributors:

+ *    CEA LIST - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.papyrus.domaincontextcodegen.utils;

+

+import org.eclipse.emf.codegen.util.CodeGenUtil;

+

+public class StringUtils {

+

+	public String formatUpperWithSep(String str) {

+		return CodeGenUtil.format(str, '_', "", false, false).toUpperCase();

+	}

+}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/.classpath b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/.classpath
index 45f024e850e..e5fbd3dd27a 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/.classpath
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

 	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="output" path="bin"/>

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/META-INF/MANIFEST.MF b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/META-INF/MANIFEST.MF
index aae560c838b..eb85eca7aad 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/META-INF/MANIFEST.MF
@@ -8,6 +8,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.diagram.common,

  org.eclipse.papyrus.service.edit;bundle-version="0.8.0",

  org.eclipse.papyrus.sysml.service.types;bundle-version="0.8.0"

+ org.eclipse.papyrus.uml.service.types;bundle-version="0.8.0"

 Bundle-Localization: plugin

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/build.properties b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/build.properties
index fae5e5566df..fb7c5db6fba 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/build.properties
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/build.properties
@@ -5,4 +5,5 @@ bin.includes = META-INF/,\
                resources/,\

                about.html,\

                plugin.properties

-source.. = src/

+source.. = src/,\

+           src-gen/

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/plugin.xml b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/plugin.xml
index 9a3321cd7b7..6d9a0d99dd8 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/plugin.xml
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/plugin.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>

 <?eclipse version="3.4"?>

-

-<!-- SysML ModelExplorer customization -->

 <plugin>

 

+<!-- SysML ModelExplorer customization -->

 <extension point="org.eclipse.gmt.modisco.infra.browser.custom.core.registration">

 	<browserCustomization file="resources/SysMLDefaultExplorerCustomization.uiCustom"/>

 </extension>

@@ -22,59 +21,192 @@
 

 <!-- Creation command declarations -->

 <extension point="org.eclipse.ui.commands">

-

-	<!-- Creation command : Block -->

+	<!-- Creation command for Allocate -->

 	<command categoryId="org.eclipse.papyrus.editor.category"

+		id="org.eclipse.papyrus.sysml.modelexplorer.AllocateCreateCommand"

+		name="Create a new Allocate" description="Create a new Allocate"

+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.AllocateHandler">

+	</command>

+	

+	<!-- Creation command for Block -->

+	<command categoryId="org.eclipse.papyrus.editor.category"

+		id="org.eclipse.papyrus.sysml.modelexplorer.BlockCreateCommand"

 		name="Create a new Block" description="Create a new Block"

-		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.BlockHandler"

-		id="org.eclipse.papyrus.sysml.modelexplorer.BlockCreateCommand">

+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.BlockHandler">

 	</command>

 	

-	<!-- Creation command : InOut FlowPort -->

+	<!-- Creation command for Conform -->

 	<command categoryId="org.eclipse.papyrus.editor.category"

-		name="Create a new InOut FlowPort" description="Create a new InOut FlowPort"

-		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.InOutFlowPortHandler"

-		id="org.eclipse.papyrus.sysml.modelexplorer.InOutFlowPortCreateCommand">

+		id="org.eclipse.papyrus.sysml.modelexplorer.ConformCreateCommand"

+		name="Create a new Conform" description="Create a new Conform"

+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.ConformHandler">

 	</command>

-

-	<!-- Creation command : In FlowPort -->

+	

+	<!-- Creation command for ConstraintBlock -->

 	<command categoryId="org.eclipse.papyrus.editor.category"

-		name="Create a new InFlowPort" description="Create a new In FlowPort"

-		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.InFlowPortHandler"

-		id="org.eclipse.papyrus.sysml.modelexplorer.InFlowPortCreateCommand">

+		id="org.eclipse.papyrus.sysml.modelexplorer.ConstraintBlockCreateCommand"

+		name="Create a new ConstraintBlock" description="Create a new ConstraintBlock"

+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.ConstraintBlockHandler">

 	</command>

-

-	<!-- Creation command : Out FlowPort -->

+	

+	<!-- Creation command for ConstraintProperty -->

 	<command categoryId="org.eclipse.papyrus.editor.category"

-		name="Create a new out FlowPort" description="Create a new Out FlowPort"

-		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.OutFlowPortHandler"

-		id="org.eclipse.papyrus.sysml.modelexplorer.OutFlowPortCreateCommand">

+		id="org.eclipse.papyrus.sysml.modelexplorer.ConstraintPropertyCreateCommand"

+		name="Create a new ConstraintProperty" description="Create a new ConstraintProperty"

+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.ConstraintPropertyHandler">

 	</command>

-

-	<!-- Creation command : FlowProperty -->

+	

+	<!-- Creation command for Copy -->

 	<command categoryId="org.eclipse.papyrus.editor.category"

+		id="org.eclipse.papyrus.sysml.modelexplorer.CopyCreateCommand"

+		name="Create a new Copy" description="Create a new Copy"

+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.CopyHandler">

+	</command>

+	

+	<!-- Creation command for DeriveReqt -->

+	<command categoryId="org.eclipse.papyrus.editor.category"

+		id="org.eclipse.papyrus.sysml.modelexplorer.DeriveReqtCreateCommand"

+		name="Create a new DeriveReqt" description="Create a new DeriveReqt"

+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.DeriveReqtHandler">

+	</command>

+	

+	<!-- Creation command for Dimension -->

+	<command categoryId="org.eclipse.papyrus.editor.category"

+		id="org.eclipse.papyrus.sysml.modelexplorer.DimensionCreateCommand"

+		name="Create a new Dimension" description="Create a new Dimension"

+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.DimensionHandler">

+	</command>

+	

+	<!-- Creation command for FlowPort -->

+	<command categoryId="org.eclipse.papyrus.editor.category"

+		id="org.eclipse.papyrus.sysml.modelexplorer.FlowPortCreateCommand"

+		name="Create a new FlowPort" description="Create a new FlowPort"

+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.FlowPortHandler">

+	</command>

+	

+	<!-- Creation command for FlowPort_InOut -->

+	<command categoryId="org.eclipse.papyrus.editor.category"

+		id="org.eclipse.papyrus.sysml.modelexplorer.FlowPort_InOutCreateCommand"

+		name="Create a new FlowPort_InOut" description="Create a new FlowPort_InOut"

+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.FlowPort_InOutHandler">

+	</command>

+	

+	<!-- Creation command for FlowPort_In -->

+	<command categoryId="org.eclipse.papyrus.editor.category"

+		id="org.eclipse.papyrus.sysml.modelexplorer.FlowPort_InCreateCommand"

+		name="Create a new FlowPort_In" description="Create a new FlowPort_In"

+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.FlowPort_InHandler">

+	</command>

+	

+	<!-- Creation command for FlowPort_Out -->

+	<command categoryId="org.eclipse.papyrus.editor.category"

+		id="org.eclipse.papyrus.sysml.modelexplorer.FlowPort_OutCreateCommand"

+		name="Create a new FlowPort_Out" description="Create a new FlowPort_Out"

+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.FlowPort_OutHandler">

+	</command>

+	

+	<!-- Creation command for FlowProperty -->

+	<command categoryId="org.eclipse.papyrus.editor.category"

+		id="org.eclipse.papyrus.sysml.modelexplorer.FlowPropertyCreateCommand"

 		name="Create a new FlowProperty" description="Create a new FlowProperty"

-		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.FlowPropertyHandler"

-		id="org.eclipse.papyrus.sysml.modelexplorer.FlowPropertyCreateCommand">

+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.FlowPropertyHandler">

 	</command>

 	

-	<!-- Creation command : FlowSpecification -->

+	<!-- Creation command for FlowSpecification -->

 	<command categoryId="org.eclipse.papyrus.editor.category"

+		id="org.eclipse.papyrus.sysml.modelexplorer.FlowSpecificationCreateCommand"

 		name="Create a new FlowSpecification" description="Create a new FlowSpecification"

-		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.FlowSpecificationHandler"

-		id="org.eclipse.papyrus.sysml.modelexplorer.FlowSpecificationCreateCommand">

+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.FlowSpecificationHandler">

 	</command>

-		

-	<!-- Creation command : Requirement -->

+	

+	<!-- Creation command for ItemFlow -->

 	<command categoryId="org.eclipse.papyrus.editor.category"

+		id="org.eclipse.papyrus.sysml.modelexplorer.ItemFlowCreateCommand"

+		name="Create a new ItemFlow" description="Create a new ItemFlow"

+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.ItemFlowHandler">

+	</command>

+	

+	<!-- Creation command for Problem -->

+	<command categoryId="org.eclipse.papyrus.editor.category"

+		id="org.eclipse.papyrus.sysml.modelexplorer.ProblemCreateCommand"

+		name="Create a new Problem" description="Create a new Problem"

+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.ProblemHandler">

+	</command>

+	

+	<!-- Creation command for Rationale -->

+	<command categoryId="org.eclipse.papyrus.editor.category"

+		id="org.eclipse.papyrus.sysml.modelexplorer.RationaleCreateCommand"

+		name="Create a new Rationale" description="Create a new Rationale"

+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.RationaleHandler">

+	</command>

+	

+	<!-- Creation command for Requirement -->

+	<command categoryId="org.eclipse.papyrus.editor.category"

+		id="org.eclipse.papyrus.sysml.modelexplorer.RequirementCreateCommand"

 		name="Create a new Requirement" description="Create a new Requirement"

-		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.RequirementHandler"

-		id="org.eclipse.papyrus.sysml.modelexplorer.RequirementCreateCommand">

+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.RequirementHandler">

 	</command>

-

+	

+	<!-- Creation command for Unit -->

+	<command categoryId="org.eclipse.papyrus.editor.category"

+		id="org.eclipse.papyrus.sysml.modelexplorer.UnitCreateCommand"

+		name="Create a new Unit" description="Create a new Unit"

+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.UnitHandler">

+	</command>

+	

+	<!-- Creation command for ValueType -->

+	<command categoryId="org.eclipse.papyrus.editor.category"

+		id="org.eclipse.papyrus.sysml.modelexplorer.ValueTypeCreateCommand"

+		name="Create a new ValueType" description="Create a new ValueType"

+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.ValueTypeHandler">

+	</command>

+	

+	<!-- Creation command for ValueType_Enumeration -->

+	<command categoryId="org.eclipse.papyrus.editor.category"

+		id="org.eclipse.papyrus.sysml.modelexplorer.ValueType_EnumerationCreateCommand"

+		name="Create a new ValueType_Enumeration" description="Create a new ValueType_Enumeration"

+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.ValueType_EnumerationHandler">

+	</command>

+	

+	<!-- Creation command for ValueType_PrimitiveType -->

+	<command categoryId="org.eclipse.papyrus.editor.category"

+		id="org.eclipse.papyrus.sysml.modelexplorer.ValueType_PrimitiveTypeCreateCommand"

+		name="Create a new ValueType_PrimitiveType" description="Create a new ValueType_PrimitiveType"

+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.ValueType_PrimitiveTypeHandler">

+	</command>

+	

+	<!-- Creation command for Verify -->

+	<command categoryId="org.eclipse.papyrus.editor.category"

+		id="org.eclipse.papyrus.sysml.modelexplorer.VerifyCreateCommand"

+		name="Create a new Verify" description="Create a new Verify"

+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.VerifyHandler">

+	</command>

+	

+	<!-- Creation command for View -->

+	<command categoryId="org.eclipse.papyrus.editor.category"

+		id="org.eclipse.papyrus.sysml.modelexplorer.ViewCreateCommand"

+		name="Create a new View" description="Create a new View"

+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.ViewHandler">

+	</command>

+	

+	<!-- Creation command for ViewPoint -->

+	<command categoryId="org.eclipse.papyrus.editor.category"

+		id="org.eclipse.papyrus.sysml.modelexplorer.ViewPointCreateCommand"

+		name="Create a new ViewPoint" description="Create a new ViewPoint"

+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.ViewPointHandler">

+	</command>

+	

+	<!-- Creation command for Satisfy -->

+	<command categoryId="org.eclipse.papyrus.editor.category"

+		id="org.eclipse.papyrus.sysml.modelexplorer.SatisfyCreateCommand"

+		name="Create a new Satisfy" description="Create a new Satisfy"

+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.SatisfyHandler">

+	</command>

+	

 </extension>

 

-<!-- Creation command menu -->

+	
+<!-- UI Menu declaration for creation commands -->
 <extension point="org.eclipse.ui.menus">

 

 	<!-- Sub-menu declaration -->	 

@@ -86,67 +218,207 @@
 	

 	<!-- Create SysML element menu content -->

 	<menuContribution locationURI="popup:org.eclipse.papyrus.modelexplorer.popupmenu.createsysmlchild" allPopups="false">

-    

+

+		<!-- Creation menu action for Allocate -->

+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.AllocateCreateCommand"

+			label="Create a new Allocate" tooltip="Create a new Allocate" style="push"		

+			icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif" >

+			<visibleWhen checkEnabled="true"/>

+		</command>

+		

+		<!-- Creation menu action for Block -->

 		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.BlockCreateCommand"

-			icon="platform:/plugin/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Block.gif"

-			label="Create a new Block" tooltip="Create a new Block" style="push">

+			label="Create a new Block" tooltip="Create a new Block" style="push"		

+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Block.gif" >

 			<visibleWhen checkEnabled="true"/>

 		</command>

-

-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.InOutFlowPortCreateCommand"

-			icon="platform:/plugin/org.eclipse.papyrus.sysml.edit/icons/full/obj16/FlowPort.gif"

-			label="Create a new InOut FlowPort" tooltip="Create a new InOut FlowPort" style="push">

+		

+		<!-- Creation menu action for Conform -->

+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.ConformCreateCommand"

+			label="Create a new Conform" tooltip="Create a new Conform" style="push"		

+			icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif" >

 			<visibleWhen checkEnabled="true"/>

 		</command>

 		

-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.InFlowPortCreateCommand"

-			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_IN_A.gif"

-			label="Create a new In FlowPort" tooltip="Create a new In FlowPort" style="push">

+		<!-- Creation menu action for ConstraintBlock -->

+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.ConstraintBlockCreateCommand"

+			label="Create a new ConstraintBlock" tooltip="Create a new ConstraintBlock" style="push"		

+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/constraints/ConstraintBlock.gif" >

 			<visibleWhen checkEnabled="true"/>

 		</command>

 		

-		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.OutFlowPortCreateCommand"

-			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_OUT_A.gif"

-			label="Create a new Out FlowPort" tooltip="Create a new Out FlowPort" style="push">

+		<!-- Creation menu action for ConstraintProperty -->

+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.ConstraintPropertyCreateCommand"

+			label="Create a new ConstraintProperty" tooltip="Create a new ConstraintProperty" style="push"		

+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/constraints/ConstraintProperty.gif" >

 			<visibleWhen checkEnabled="true"/>

-		</command>		

-

+		</command>

+		

+		<!-- Creation menu action for Copy -->

+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.CopyCreateCommand"

+			label="Create a new Copy" tooltip="Create a new Copy" style="push"		

+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Copy.gif" >

+			<visibleWhen checkEnabled="true"/>

+		</command>

+		

+		<!-- Creation menu action for DeriveReqt -->

+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.DeriveReqtCreateCommand"

+			label="Create a new DeriveReqt" tooltip="Create a new DeriveReqt" style="push"		

+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/DeriveReqt.gif" >

+			<visibleWhen checkEnabled="true"/>

+		</command>

+		

+		<!-- Creation menu action for Dimension -->

+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.DimensionCreateCommand"

+			label="Create a new Dimension" tooltip="Create a new Dimension" style="push"		

+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Dimension.gif" >

+			<visibleWhen checkEnabled="true"/>

+		</command>

+		

+		<!-- Creation menu action for FlowPort -->

+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.FlowPortCreateCommand"

+			label="Create a new FlowPort" tooltip="Create a new FlowPort" style="push"		

+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_INOUT_A.gif" >

+			<visibleWhen checkEnabled="true"/>

+		</command>

+		

+		<!-- Creation menu action for FlowPort_InOut -->

+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.FlowPort_InOutCreateCommand"

+			label="Create a new FlowPort_InOut" tooltip="Create a new FlowPort_InOut" style="push"		

+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_INOUT_A.gif" >

+			<visibleWhen checkEnabled="true"/>

+		</command>

+		

+		<!-- Creation menu action for FlowPort_In -->

+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.FlowPort_InCreateCommand"

+			label="Create a new FlowPort_In" tooltip="Create a new FlowPort_In" style="push"		

+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_IN_A.gif" >

+			<visibleWhen checkEnabled="true"/>

+		</command>

+		

+		<!-- Creation menu action for FlowPort_Out -->

+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.FlowPort_OutCreateCommand"

+			label="Create a new FlowPort_Out" tooltip="Create a new FlowPort_Out" style="push"		

+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_OUT_A.gif" >

+			<visibleWhen checkEnabled="true"/>

+		</command>

+		

+		<!-- Creation menu action for FlowProperty -->

 		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.FlowPropertyCreateCommand"

-			icon="platform:/plugin/org.eclipse.papyrus.sysml.edit/icons/full/obj16/FlowProperty.gif"

-			label="Create a new FlowProperty" tooltip="Create a new FlowProperty" style="push">

+			label="Create a new FlowProperty" tooltip="Create a new FlowProperty" style="push"		

+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowProperty_INOUT.gif" >

 			<visibleWhen checkEnabled="true"/>

 		</command>

 		

+		<!-- Creation menu action for FlowSpecification -->

 		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.FlowSpecificationCreateCommand"

-			icon="platform:/plugin/org.eclipse.papyrus.sysml.edit/icons/full/obj16/FlowSpecification.gif"

-			label="Create a new FlowSpecification" tooltip="Create a new FlowSpecification" style="push">

+			label="Create a new FlowSpecification" tooltip="Create a new FlowSpecification" style="push"		

+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowSpecification.gif" >

+			<visibleWhen checkEnabled="true"/>

+		</command>

+		

+		<!-- Creation menu action for ItemFlow -->

+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.ItemFlowCreateCommand"

+			label="Create a new ItemFlow" tooltip="Create a new ItemFlow" style="push"		

+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/ItemFlow.gif" >

 			<visibleWhen checkEnabled="true"/>

 		</command>

-			

+		

+		<!-- Creation menu action for Problem -->

+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.ProblemCreateCommand"

+			label="Create a new Problem" tooltip="Create a new Problem" style="push"		

+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/modelelements/Problem.gif" >

+			<visibleWhen checkEnabled="true"/>

+		</command>

+		

+		<!-- Creation menu action for Rationale -->

+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.RationaleCreateCommand"

+			label="Create a new Rationale" tooltip="Create a new Rationale" style="push"		

+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/modelelements/Rationale.gif" >

+			<visibleWhen checkEnabled="true"/>

+		</command>

+		

+		<!-- Creation menu action for Requirement -->

 		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.RequirementCreateCommand"

-			icon="platform:/plugin/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Requirement.gif"

-			label="Create a new Requirement" tooltip="Create a new Requirement" style="push">

+			label="Create a new Requirement" tooltip="Create a new Requirement" style="push"		

+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Requirement.gif" >

+			<visibleWhen checkEnabled="true"/>

+		</command>

+		

+		<!-- Creation menu action for Unit -->

+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.UnitCreateCommand"

+			label="Create a new Unit" tooltip="Create a new Unit" style="push"		

+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Unit.gif" >

+			<visibleWhen checkEnabled="true"/>

+		</command>

+		

+		<!-- Creation menu action for ValueType -->

+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.ValueTypeCreateCommand"

+			label="Create a new ValueType" tooltip="Create a new ValueType" style="push"		

+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/ValueType.gif" >

+			<visibleWhen checkEnabled="true"/>

+		</command>

+		

+		<!-- Creation menu action for ValueType_Enumeration -->

+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.ValueType_EnumerationCreateCommand"

+			label="Create a new ValueType_Enumeration" tooltip="Create a new ValueType_Enumeration" style="push"		

+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/ValueType.gif" >

+			<visibleWhen checkEnabled="true"/>

+		</command>

+		

+		<!-- Creation menu action for ValueType_PrimitiveType -->

+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.ValueType_PrimitiveTypeCreateCommand"

+			label="Create a new ValueType_PrimitiveType" tooltip="Create a new ValueType_PrimitiveType" style="push"		

+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/ValueType.gif" >

+			<visibleWhen checkEnabled="true"/>

+		</command>

+		

+		<!-- Creation menu action for Verify -->

+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.VerifyCreateCommand"

+			label="Create a new Verify" tooltip="Create a new Verify" style="push"		

+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Verify.gif" >

 			<visibleWhen checkEnabled="true"/>

 		</command>

-			

+		

+		<!-- Creation menu action for View -->

+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.ViewCreateCommand"

+			label="Create a new View" tooltip="Create a new View" style="push"		

+			icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif" >

+			<visibleWhen checkEnabled="true"/>

+		</command>

+		

+		<!-- Creation menu action for ViewPoint -->

+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.ViewPointCreateCommand"

+			label="Create a new ViewPoint" tooltip="Create a new ViewPoint" style="push"		

+			icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" >

+			<visibleWhen checkEnabled="true"/>

+		</command>

+		

+		<!-- Creation menu action for Satisfy -->

+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.SatisfyCreateCommand"

+			label="Create a new Satisfy" tooltip="Create a new Satisfy" style="push"		

+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Satisfy.gif" >

+			<visibleWhen checkEnabled="true"/>

+		</command>

+		

 	</menuContribution>

+	

 </extension>

 

 <!-- Key bindings associated to creation commands -->

 <extension point="org.eclipse.ui.bindings">

 

 	<!-- "CTRL+I" : Create In FlowPort -->

-	<key commandId="org.eclipse.papyrus.sysml.modelexplorer.InFlowPortCreateCommand"

+	<key commandId="org.eclipse.papyrus.sysml.modelexplorer.FlowPort_InCreateCommand"

 		schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"

 		sequence="CTRL+I">

 	</key>

 

 	<!-- "CTRL+O" : Create Out FlowPort -->	

-	<key commandId="org.eclipse.papyrus.sysml.modelexplorer.OutFlowPortCreateCommand"

+	<key commandId="org.eclipse.papyrus.sysml.modelexplorer.FlowPort_OutCreateCommand"

 		schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"

 		sequence="CTRL+O">

    </key>

    

 </extension>

-

-</plugin>
\ No newline at end of file
+</plugin>

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/filter/CommandFilter.java b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/filter/CommandFilter.java
new file mode 100644
index 00000000000..6aa244a2c88
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/filter/CommandFilter.java
@@ -0,0 +1,47 @@
+package org.eclipse.papyrus.sysml.modelexplorer.filter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+
+public class CommandFilter {
+
+	private static List<IElementType> visibleCommands;
+
+	public static List<IElementType> getVisibleCommands() {
+		if(visibleCommands == null) {
+			visibleCommands = new ArrayList<IElementType>();
+
+			// visibleCommands.add(SysMLElementTypes.ALLOCATE);
+			visibleCommands.add(SysMLElementTypes.BLOCK);
+			// visibleCommands.add(SysMLElementTypes.CONFORM);
+			visibleCommands.add(SysMLElementTypes.CONSTRAINT_BLOCK);
+			visibleCommands.add(SysMLElementTypes.CONSTRAINT_PROPERTY);
+			// visibleCommands.add(SysMLElementTypes.COPY);
+			// visibleCommands.add(SysMLElementTypes.DERIVE_REQT);
+			visibleCommands.add(SysMLElementTypes.DIMENSION);
+			visibleCommands.add(SysMLElementTypes.FLOW_PORT);
+			visibleCommands.add(SysMLElementTypes.FLOW_PORT_IN_OUT);
+			visibleCommands.add(SysMLElementTypes.FLOW_PORT_IN);
+			visibleCommands.add(SysMLElementTypes.FLOW_PORT_OUT);
+			visibleCommands.add(SysMLElementTypes.FLOW_PROPERTY);
+			visibleCommands.add(SysMLElementTypes.FLOW_SPECIFICATION);
+			// visibleCommands.add(SysMLElementTypes.ITEM_FLOW);
+			visibleCommands.add(SysMLElementTypes.PROBLEM);
+			visibleCommands.add(SysMLElementTypes.RATIONALE);
+			visibleCommands.add(SysMLElementTypes.REQUIREMENT);
+			visibleCommands.add(SysMLElementTypes.UNIT);
+			visibleCommands.add(SysMLElementTypes.VALUE_TYPE);
+			// visibleCommands.add(SysMLElementTypes.VALUE_TYPE_ENUMERATION);
+			// visibleCommands.add(SysMLElementTypes.VALUE_TYPE_PRIMITIVE_TYPE);
+			// visibleCommands.add(SysMLElementTypes.VERIFY);
+			visibleCommands.add(SysMLElementTypes.VIEW);
+			visibleCommands.add(SysMLElementTypes.VIEW_POINT);
+			// visibleCommands.add(SysMLElementTypes.SATISFY);
+		}
+
+		return visibleCommands;
+	}
+}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AllocateHandler.java b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AllocateHandler.java
new file mode 100644
index 00000000000..a77e9baf4bf
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/AllocateHandler.java
@@ -0,0 +1,30 @@
+package org.eclipse.papyrus.sysml.modelexplorer.handler;
+
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler;
+
+/**
+ * <pre>
+ * Command handler for Allocate creation
+ *
+ * </pre>
+ * @generated
+ */
+public class AllocateHandler extends CreateCommandHandler implements IHandler {
+
+	/**
+	 * <pre>
+	 * @see org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler#getElementTypeToCreate()
+	 *
+	 * @return the IElementType this handler is supposed to create
+	 *
+	 * </pre>
+	 * @generated
+	 */
+	protected IElementType getElementTypeToCreate() {
+    return SysMLElementTypes.ALLOCATE;
+  }
+}
+
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/handler/BlockHandler.java b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/BlockHandler.java
index 7d623c8113f..bd31e79c625 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/handler/BlockHandler.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/BlockHandler.java
@@ -1,28 +1,15 @@
-/*****************************************************************************
- * Copyright (c) 2010 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:
- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
 package org.eclipse.papyrus.sysml.modelexplorer.handler;
 
 import org.eclipse.core.commands.IHandler;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler;
 
 /**
  * <pre>
  * Command handler for Block creation
- * 
+ *
  * </pre>
- * 
  * @generated
  */
 public class BlockHandler extends CreateCommandHandler implements IHandler {
@@ -30,14 +17,14 @@ public class BlockHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
+	 *
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.BLOCK;
-	}
+    return SysMLElementTypes.BLOCK;
+  }
 }
+
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ConformHandler.java b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ConformHandler.java
new file mode 100644
index 00000000000..97a96a07c41
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ConformHandler.java
@@ -0,0 +1,30 @@
+package org.eclipse.papyrus.sysml.modelexplorer.handler;
+
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler;
+
+/**
+ * <pre>
+ * Command handler for Conform creation
+ *
+ * </pre>
+ * @generated
+ */
+public class ConformHandler extends CreateCommandHandler implements IHandler {
+
+	/**
+	 * <pre>
+	 * @see org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler#getElementTypeToCreate()
+	 *
+	 * @return the IElementType this handler is supposed to create
+	 *
+	 * </pre>
+	 * @generated
+	 */
+	protected IElementType getElementTypeToCreate() {
+    return SysMLElementTypes.CONFORM;
+  }
+}
+
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ConstraintBlockHandler.java b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ConstraintBlockHandler.java
new file mode 100644
index 00000000000..cac40fb36a2
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ConstraintBlockHandler.java
@@ -0,0 +1,30 @@
+package org.eclipse.papyrus.sysml.modelexplorer.handler;
+
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler;
+
+/**
+ * <pre>
+ * Command handler for ConstraintBlock creation
+ *
+ * </pre>
+ * @generated
+ */
+public class ConstraintBlockHandler extends CreateCommandHandler implements IHandler {
+
+	/**
+	 * <pre>
+	 * @see org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler#getElementTypeToCreate()
+	 *
+	 * @return the IElementType this handler is supposed to create
+	 *
+	 * </pre>
+	 * @generated
+	 */
+	protected IElementType getElementTypeToCreate() {
+    return SysMLElementTypes.CONSTRAINT_BLOCK;
+  }
+}
+
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ConstraintPropertyHandler.java b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ConstraintPropertyHandler.java
new file mode 100644
index 00000000000..bd6567148bd
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ConstraintPropertyHandler.java
@@ -0,0 +1,30 @@
+package org.eclipse.papyrus.sysml.modelexplorer.handler;
+
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler;
+
+/**
+ * <pre>
+ * Command handler for ConstraintProperty creation
+ *
+ * </pre>
+ * @generated
+ */
+public class ConstraintPropertyHandler extends CreateCommandHandler implements IHandler {
+
+	/**
+	 * <pre>
+	 * @see org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler#getElementTypeToCreate()
+	 *
+	 * @return the IElementType this handler is supposed to create
+	 *
+	 * </pre>
+	 * @generated
+	 */
+	protected IElementType getElementTypeToCreate() {
+    return SysMLElementTypes.CONSTRAINT_PROPERTY;
+  }
+}
+
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/CopyHandler.java b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/CopyHandler.java
new file mode 100644
index 00000000000..87efc7f4be6
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/CopyHandler.java
@@ -0,0 +1,30 @@
+package org.eclipse.papyrus.sysml.modelexplorer.handler;
+
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler;
+
+/**
+ * <pre>
+ * Command handler for Copy creation
+ *
+ * </pre>
+ * @generated
+ */
+public class CopyHandler extends CreateCommandHandler implements IHandler {
+
+	/**
+	 * <pre>
+	 * @see org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler#getElementTypeToCreate()
+	 *
+	 * @return the IElementType this handler is supposed to create
+	 *
+	 * </pre>
+	 * @generated
+	 */
+	protected IElementType getElementTypeToCreate() {
+    return SysMLElementTypes.COPY;
+  }
+}
+
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/DeriveReqtHandler.java b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/DeriveReqtHandler.java
new file mode 100644
index 00000000000..a0dc9cefb93
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/DeriveReqtHandler.java
@@ -0,0 +1,30 @@
+package org.eclipse.papyrus.sysml.modelexplorer.handler;
+
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler;
+
+/**
+ * <pre>
+ * Command handler for DeriveReqt creation
+ *
+ * </pre>
+ * @generated
+ */
+public class DeriveReqtHandler extends CreateCommandHandler implements IHandler {
+
+	/**
+	 * <pre>
+	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
+	 *
+	 * @return the IElementType this handler is supposed to create
+	 *
+	 * </pre>
+	 * @generated
+	 */
+	protected IElementType getElementTypeToCreate() {
+    return SysMLElementTypes.DERIVE_REQT;
+  }
+}
+
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/DimensionHandler.java b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/DimensionHandler.java
new file mode 100644
index 00000000000..59ddd032547
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/DimensionHandler.java
@@ -0,0 +1,30 @@
+package org.eclipse.papyrus.sysml.modelexplorer.handler;
+
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler;
+
+/**
+ * <pre>
+ * Command handler for Dimension creation
+ *
+ * </pre>
+ * @generated
+ */
+public class DimensionHandler extends CreateCommandHandler implements IHandler {
+
+	/**
+	 * <pre>
+	 * @see org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler#getElementTypeToCreate()
+	 *
+	 * @return the IElementType this handler is supposed to create
+	 *
+	 * </pre>
+	 * @generated
+	 */
+	protected IElementType getElementTypeToCreate() {
+    return SysMLElementTypes.DIMENSION;
+  }
+}
+
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPortHandler.java b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPortHandler.java
new file mode 100644
index 00000000000..158f0e0c94d
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPortHandler.java
@@ -0,0 +1,30 @@
+package org.eclipse.papyrus.sysml.modelexplorer.handler;
+
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler;
+
+/**
+ * <pre>
+ * Command handler for FlowPort creation
+ *
+ * </pre>
+ * @generated
+ */
+public class FlowPortHandler extends CreateCommandHandler implements IHandler {
+
+	/**
+	 * <pre>
+	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
+	 *
+	 * @return the IElementType this handler is supposed to create
+	 *
+	 * </pre>
+	 * @generated
+	 */
+	protected IElementType getElementTypeToCreate() {
+    return SysMLElementTypes.FLOW_PORT;
+  }
+}
+
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPort_InHandler.java b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPort_InHandler.java
new file mode 100644
index 00000000000..893ba70d0c9
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPort_InHandler.java
@@ -0,0 +1,30 @@
+package org.eclipse.papyrus.sysml.modelexplorer.handler;
+
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler;
+
+/**
+ * <pre>
+ * Command handler for FlowPort_In creation
+ *
+ * </pre>
+ * @generated
+ */
+public class FlowPort_InHandler extends CreateCommandHandler implements IHandler {
+
+	/**
+	 * <pre>
+	 * @see org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler#getElementTypeToCreate()
+	 *
+	 * @return the IElementType this handler is supposed to create
+	 *
+	 * </pre>
+	 * @generated
+	 */
+	protected IElementType getElementTypeToCreate() {
+    return SysMLElementTypes.FLOW_PORT_IN;
+  }
+}
+
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPort_InOutHandler.java b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPort_InOutHandler.java
new file mode 100644
index 00000000000..93cc7a8037e
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPort_InOutHandler.java
@@ -0,0 +1,30 @@
+package org.eclipse.papyrus.sysml.modelexplorer.handler;
+
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler;
+
+/**
+ * <pre>
+ * Command handler for FlowPort_InOut creation
+ *
+ * </pre>
+ * @generated
+ */
+public class FlowPort_InOutHandler extends CreateCommandHandler implements IHandler {
+
+	/**
+	 * <pre>
+	 * @see org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler#getElementTypeToCreate()
+	 *
+	 * @return the IElementType this handler is supposed to create
+	 *
+	 * </pre>
+	 * @generated
+	 */
+	protected IElementType getElementTypeToCreate() {
+    return SysMLElementTypes.FLOW_PORT_IN_OUT;
+  }
+}
+
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPort_OutHandler.java b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPort_OutHandler.java
new file mode 100644
index 00000000000..084429930e3
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPort_OutHandler.java
@@ -0,0 +1,30 @@
+package org.eclipse.papyrus.sysml.modelexplorer.handler;
+
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler;
+
+/**
+ * <pre>
+ * Command handler for FlowPort_Out creation
+ *
+ * </pre>
+ * @generated
+ */
+public class FlowPort_OutHandler extends CreateCommandHandler implements IHandler {
+
+	/**
+	 * <pre>
+	 * @see org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler#getElementTypeToCreate()
+	 *
+	 * @return the IElementType this handler is supposed to create
+	 *
+	 * </pre>
+	 * @generated
+	 */
+	protected IElementType getElementTypeToCreate() {
+    return SysMLElementTypes.FLOW_PORT_OUT;
+  }
+}
+
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPropertyHandler.java b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPropertyHandler.java
index b78e784cf46..67f59310f3b 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPropertyHandler.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowPropertyHandler.java
@@ -1,28 +1,15 @@
-/*****************************************************************************
- * Copyright (c) 2010 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:
- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
 package org.eclipse.papyrus.sysml.modelexplorer.handler;
 
 import org.eclipse.core.commands.IHandler;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler;
 
 /**
  * <pre>
  * Command handler for FlowProperty creation
- * 
+ *
  * </pre>
- * 
  * @generated
  */
 public class FlowPropertyHandler extends CreateCommandHandler implements IHandler {
@@ -30,14 +17,14 @@ public class FlowPropertyHandler extends CreateCommandHandler implements IHandle
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
+	 *
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.FLOW_PROPERTY;
-	}
+    return SysMLElementTypes.FLOW_PROPERTY;
+  }
 }
+
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowSpecificationHandler.java b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowSpecificationHandler.java
index b3b5c9a7729..9603825cd7d 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowSpecificationHandler.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/FlowSpecificationHandler.java
@@ -1,28 +1,15 @@
-/*****************************************************************************
- * Copyright (c) 2010 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:
- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
 package org.eclipse.papyrus.sysml.modelexplorer.handler;
 
 import org.eclipse.core.commands.IHandler;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler;
 
 /**
  * <pre>
  * Command handler for FlowSpecification creation
- * 
+ *
  * </pre>
- * 
  * @generated
  */
 public class FlowSpecificationHandler extends CreateCommandHandler implements IHandler {
@@ -30,14 +17,14 @@ public class FlowSpecificationHandler extends CreateCommandHandler implements IH
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
+	 *
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.FLOW_SPECIFICATION;
-	}
+    return SysMLElementTypes.FLOW_SPECIFICATION;
+  }
 }
+
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ItemFlowHandler.java b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ItemFlowHandler.java
new file mode 100644
index 00000000000..25a0b6503ec
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ItemFlowHandler.java
@@ -0,0 +1,30 @@
+package org.eclipse.papyrus.sysml.modelexplorer.handler;
+
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler;
+
+/**
+ * <pre>
+ * Command handler for ItemFlow creation
+ *
+ * </pre>
+ * @generated
+ */
+public class ItemFlowHandler extends CreateCommandHandler implements IHandler {
+
+	/**
+	 * <pre>
+	 * @see org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler#getElementTypeToCreate()
+	 *
+	 * @return the IElementType this handler is supposed to create
+	 *
+	 * </pre>
+	 * @generated
+	 */
+	protected IElementType getElementTypeToCreate() {
+    return SysMLElementTypes.ITEM_FLOW;
+  }
+}
+
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ProblemHandler.java b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ProblemHandler.java
new file mode 100644
index 00000000000..3d3374eea56
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ProblemHandler.java
@@ -0,0 +1,30 @@
+package org.eclipse.papyrus.sysml.modelexplorer.handler;
+
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler;
+
+/**
+ * <pre>
+ * Command handler for Problem creation
+ *
+ * </pre>
+ * @generated
+ */
+public class ProblemHandler extends CreateCommandHandler implements IHandler {
+
+	/**
+	 * <pre>
+	 * @see org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler#getElementTypeToCreate()
+	 *
+	 * @return the IElementType this handler is supposed to create
+	 *
+	 * </pre>
+	 * @generated
+	 */
+	protected IElementType getElementTypeToCreate() {
+    return SysMLElementTypes.PROBLEM;
+  }
+}
+
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/RationaleHandler.java b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/RationaleHandler.java
new file mode 100644
index 00000000000..527fddabb64
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/RationaleHandler.java
@@ -0,0 +1,30 @@
+package org.eclipse.papyrus.sysml.modelexplorer.handler;
+
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler;
+
+/**
+ * <pre>
+ * Command handler for Rationale creation
+ *
+ * </pre>
+ * @generated
+ */
+public class RationaleHandler extends CreateCommandHandler implements IHandler {
+
+	/**
+	 * <pre>
+	 * @see org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler#getElementTypeToCreate()
+	 *
+	 * @return the IElementType this handler is supposed to create
+	 *
+	 * </pre>
+	 * @generated
+	 */
+	protected IElementType getElementTypeToCreate() {
+    return SysMLElementTypes.RATIONALE;
+  }
+}
+
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/handler/RequirementHandler.java b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/RequirementHandler.java
index 2204a327fc6..d493bcae5a4 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/handler/RequirementHandler.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/RequirementHandler.java
@@ -1,28 +1,15 @@
-/*****************************************************************************
- * Copyright (c) 2010 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:
- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
 package org.eclipse.papyrus.sysml.modelexplorer.handler;
 
 import org.eclipse.core.commands.IHandler;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler;
 
 /**
  * <pre>
  * Command handler for Requirement creation
- * 
+ *
  * </pre>
- * 
  * @generated
  */
 public class RequirementHandler extends CreateCommandHandler implements IHandler {
@@ -30,14 +17,14 @@ public class RequirementHandler extends CreateCommandHandler implements IHandler
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
+	 *
 	 * @return the IElementType this handler is supposed to create
-	 * 
+	 *
 	 * </pre>
-	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.REQUIREMENT;
-	}
+    return SysMLElementTypes.REQUIREMENT;
+  }
 }
+
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/SatisfyHandler.java b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/SatisfyHandler.java
new file mode 100644
index 00000000000..d925dd3615a
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/SatisfyHandler.java
@@ -0,0 +1,30 @@
+package org.eclipse.papyrus.sysml.modelexplorer.handler;
+
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler;
+
+/**
+ * <pre>
+ * Command handler for Satisfy creation
+ *
+ * </pre>
+ * @generated
+ */
+public class SatisfyHandler extends CreateCommandHandler implements IHandler {
+
+	/**
+	 * <pre>
+	 * @see org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler#getElementTypeToCreate()
+	 *
+	 * @return the IElementType this handler is supposed to create
+	 *
+	 * </pre>
+	 * @generated
+	 */
+	protected IElementType getElementTypeToCreate() {
+    return SysMLElementTypes.SATISFY;
+  }
+}
+
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/UnitHandler.java b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/UnitHandler.java
new file mode 100644
index 00000000000..e5a3bfcc205
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/UnitHandler.java
@@ -0,0 +1,30 @@
+package org.eclipse.papyrus.sysml.modelexplorer.handler;
+
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler;
+
+/**
+ * <pre>
+ * Command handler for Unit creation
+ *
+ * </pre>
+ * @generated
+ */
+public class UnitHandler extends CreateCommandHandler implements IHandler {
+
+	/**
+	 * <pre>
+	 * @see org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler#getElementTypeToCreate()
+	 *
+	 * @return the IElementType this handler is supposed to create
+	 *
+	 * </pre>
+	 * @generated
+	 */
+	protected IElementType getElementTypeToCreate() {
+    return SysMLElementTypes.UNIT;
+  }
+}
+
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ValueTypeHandler.java b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ValueTypeHandler.java
new file mode 100644
index 00000000000..3ab37e13b44
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ValueTypeHandler.java
@@ -0,0 +1,30 @@
+package org.eclipse.papyrus.sysml.modelexplorer.handler;
+
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler;
+
+/**
+ * <pre>
+ * Command handler for ValueType creation
+ *
+ * </pre>
+ * @generated
+ */
+public class ValueTypeHandler extends CreateCommandHandler implements IHandler {
+
+	/**
+	 * <pre>
+	 * @see org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler#getElementTypeToCreate()
+	 *
+	 * @return the IElementType this handler is supposed to create
+	 *
+	 * </pre>
+	 * @generated
+	 */
+	protected IElementType getElementTypeToCreate() {
+    return SysMLElementTypes.VALUE_TYPE;
+  }
+}
+
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ValueType_EnumerationHandler.java b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ValueType_EnumerationHandler.java
new file mode 100644
index 00000000000..8d858a2e900
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ValueType_EnumerationHandler.java
@@ -0,0 +1,30 @@
+package org.eclipse.papyrus.sysml.modelexplorer.handler;
+
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler;
+
+/**
+ * <pre>
+ * Command handler for ValueType_Enumeration creation
+ *
+ * </pre>
+ * @generated
+ */
+public class ValueType_EnumerationHandler extends CreateCommandHandler implements IHandler {
+
+	/**
+	 * <pre>
+	 * @see org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler#getElementTypeToCreate()
+	 *
+	 * @return the IElementType this handler is supposed to create
+	 *
+	 * </pre>
+	 * @generated
+	 */
+	protected IElementType getElementTypeToCreate() {
+    return SysMLElementTypes.VALUE_TYPE_ENUMERATION;
+  }
+}
+
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ValueType_PrimitiveTypeHandler.java b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ValueType_PrimitiveTypeHandler.java
new file mode 100644
index 00000000000..4fcda3bb923
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ValueType_PrimitiveTypeHandler.java
@@ -0,0 +1,30 @@
+package org.eclipse.papyrus.sysml.modelexplorer.handler;
+
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler;
+
+/**
+ * <pre>
+ * Command handler for ValueType_PrimitiveType creation
+ *
+ * </pre>
+ * @generated
+ */
+public class ValueType_PrimitiveTypeHandler extends CreateCommandHandler implements IHandler {
+
+	/**
+	 * <pre>
+	 * @see org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler#getElementTypeToCreate()
+	 *
+	 * @return the IElementType this handler is supposed to create
+	 *
+	 * </pre>
+	 * @generated
+	 */
+	protected IElementType getElementTypeToCreate() {
+    return SysMLElementTypes.VALUE_TYPE_PRIMITIVE_TYPE;
+  }
+}
+
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/VerifyHandler.java b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/VerifyHandler.java
new file mode 100644
index 00000000000..0714aee808b
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/VerifyHandler.java
@@ -0,0 +1,30 @@
+package org.eclipse.papyrus.sysml.modelexplorer.handler;
+
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler;
+
+/**
+ * <pre>
+ * Command handler for Verify creation
+ *
+ * </pre>
+ * @generated
+ */
+public class VerifyHandler extends CreateCommandHandler implements IHandler {
+
+	/**
+	 * <pre>
+	 * @see org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler#getElementTypeToCreate()
+	 *
+	 * @return the IElementType this handler is supposed to create
+	 *
+	 * </pre>
+	 * @generated
+	 */
+	protected IElementType getElementTypeToCreate() {
+    return SysMLElementTypes.VERIFY;
+  }
+}
+
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ViewHandler.java b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ViewHandler.java
new file mode 100644
index 00000000000..0513107dd5f
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ViewHandler.java
@@ -0,0 +1,30 @@
+package org.eclipse.papyrus.sysml.modelexplorer.handler;
+
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler;
+
+/**
+ * <pre>
+ * Command handler for View creation
+ *
+ * </pre>
+ * @generated
+ */
+public class ViewHandler extends CreateCommandHandler implements IHandler {
+
+	/**
+	 * <pre>
+	 * @see org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler#getElementTypeToCreate()
+	 *
+	 * @return the IElementType this handler is supposed to create
+	 *
+	 * </pre>
+	 * @generated
+	 */
+	protected IElementType getElementTypeToCreate() {
+    return SysMLElementTypes.VIEW;
+  }
+}
+
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ViewPointHandler.java b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ViewPointHandler.java
new file mode 100644
index 00000000000..e43deb77f5c
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src-gen/org/eclipse/papyrus/sysml/modelexplorer/handler/ViewPointHandler.java
@@ -0,0 +1,30 @@
+package org.eclipse.papyrus.sysml.modelexplorer.handler;
+
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler;
+
+/**
+ * <pre>
+ * Command handler for ViewPoint creation
+ *
+ * </pre>
+ * @generated
+ */
+public class ViewPointHandler extends CreateCommandHandler implements IHandler {
+
+	/**
+	 * <pre>
+	 * @see org.eclipse.papyrus.sysml.modelexplorer.handler.CreateCommandHandler#getElementTypeToCreate()
+	 *
+	 * @return the IElementType this handler is supposed to create
+	 *
+	 * </pre>
+	 * @generated
+	 */
+	protected IElementType getElementTypeToCreate() {
+    return SysMLElementTypes.VIEW_POINT;
+  }
+}
+
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/handler/CreateCommandHandler.java b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/handler/CreateCommandHandler.java
index 65976349743..7107106f4b3 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/handler/CreateCommandHandler.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/handler/CreateCommandHandler.java
@@ -22,6 +22,7 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.sysml.modelexplorer.filter.CommandFilter;

 

 /**

  * Default handler for Create command used in the ModelExplorer contextual ("Create new child") menu.

@@ -84,6 +85,24 @@ public abstract class CreateCommandHandler extends AbstractCommandHandler {
 

 	/**

 	 * 

+	 * @see org.eclipse.papyrus.uml.modelexplorer.handler.AbstractCommandHandler#isVisible()

+	 * 

+	 * @return

+	 */

+	@Override

+	public boolean isVisible() {

+

+		// Temporary (customizable implementation to be provided) filter to avoid all

+		// creation command to be visible (avoid to large set of possible children).

+		if(!CommandFilter.getVisibleCommands().contains(getElementTypeToCreate())) {

+			return false;

+		}

+

+		return super.isVisible();

+	}

+

+	/**

+	 * 

 	 * @see org.eclipse.papyrus.uml.modelexplorer.handler.AbstractCommandHandler#isEnabled()

 	 * 

 	 * @return

@@ -97,6 +116,12 @@ public abstract class CreateCommandHandler extends AbstractCommandHandler {
 		// opens. 

 		createCommand = buildCommand();

 

+		// Temporary (customizable implementation to be provided) filter to avoid all

+		// creation command to be visible (avoid to large set of possible children).

+		if(!CommandFilter.getVisibleCommands().contains(getElementTypeToCreate())) {

+			return false;

+		}

+

 		return super.isEnabled();

 	}

 

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/handler/InFlowPortHandler.java b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/handler/InFlowPortHandler.java
deleted file mode 100644
index d2d716a1742..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/handler/InFlowPortHandler.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 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:
- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for In FlowPort creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class InFlowPortHandler extends CreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.IN_FLOWPORT;
-	}
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/handler/InOutFlowPortHandler.java b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/handler/InOutFlowPortHandler.java
deleted file mode 100644
index 7f397770e3b..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/handler/InOutFlowPortHandler.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 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:
- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for InOut FlowPort creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class InOutFlowPortHandler extends CreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.INOUT_FLOWPORT;
-	}
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/handler/OutFlowPortHandler.java b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/handler/OutFlowPortHandler.java
deleted file mode 100644
index 00b27b3ee8a..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/handler/OutFlowPortHandler.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 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:
- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelexplorer.handler;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-
-/**
- * <pre>
- * Command handler for Out FlowPort creation
- * 
- * </pre>
- * 
- * @generated
- */
-public class OutFlowPortHandler extends CreateCommandHandler implements IHandler {
-
-	/**
-	 * <pre>
-	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 * 
-	 * @return the IElementType this handler is supposed to create
-	 * 
-	 * </pre>
-	 * 
-	 * @generated
-	 */
-	protected IElementType getElementTypeToCreate() {
-		return SysMLElementTypes.OUT_FLOWPORT;
-	}
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/xmlElementHandlers.xml b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/xmlElementHandlers.xml
new file mode 100644
index 00000000000..b926edf1c9c
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer/xmlElementHandlers.xml
@@ -0,0 +1,382 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+
+<!-- Creation command declarations -->
+<extension point="org.eclipse.ui.commands">
+	<!-- Creation command for Allocate -->
+	<command categoryId="org.eclipse.papyrus.editor.category"
+		id="org.eclipse.papyrus.sysml.modelexplorer.AllocateCreateCommand"
+		name="Create a new Allocate" description="Create a new Allocate"
+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.AllocateHandler">
+	</command>
+	
+	<!-- Creation command for Block -->
+	<command categoryId="org.eclipse.papyrus.editor.category"
+		id="org.eclipse.papyrus.sysml.modelexplorer.BlockCreateCommand"
+		name="Create a new Block" description="Create a new Block"
+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.BlockHandler">
+	</command>
+	
+	<!-- Creation command for Conform -->
+	<command categoryId="org.eclipse.papyrus.editor.category"
+		id="org.eclipse.papyrus.sysml.modelexplorer.ConformCreateCommand"
+		name="Create a new Conform" description="Create a new Conform"
+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.ConformHandler">
+	</command>
+	
+	<!-- Creation command for ConstraintBlock -->
+	<command categoryId="org.eclipse.papyrus.editor.category"
+		id="org.eclipse.papyrus.sysml.modelexplorer.ConstraintBlockCreateCommand"
+		name="Create a new ConstraintBlock" description="Create a new ConstraintBlock"
+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.ConstraintBlockHandler">
+	</command>
+	
+	<!-- Creation command for ConstraintProperty -->
+	<command categoryId="org.eclipse.papyrus.editor.category"
+		id="org.eclipse.papyrus.sysml.modelexplorer.ConstraintPropertyCreateCommand"
+		name="Create a new ConstraintProperty" description="Create a new ConstraintProperty"
+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.ConstraintPropertyHandler">
+	</command>
+	
+	<!-- Creation command for Copy -->
+	<command categoryId="org.eclipse.papyrus.editor.category"
+		id="org.eclipse.papyrus.sysml.modelexplorer.CopyCreateCommand"
+		name="Create a new Copy" description="Create a new Copy"
+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.CopyHandler">
+	</command>
+	
+	<!-- Creation command for DeriveReqt -->
+	<command categoryId="org.eclipse.papyrus.editor.category"
+		id="org.eclipse.papyrus.sysml.modelexplorer.DeriveReqtCreateCommand"
+		name="Create a new DeriveReqt" description="Create a new DeriveReqt"
+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.DeriveReqtHandler">
+	</command>
+	
+	<!-- Creation command for Dimension -->
+	<command categoryId="org.eclipse.papyrus.editor.category"
+		id="org.eclipse.papyrus.sysml.modelexplorer.DimensionCreateCommand"
+		name="Create a new Dimension" description="Create a new Dimension"
+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.DimensionHandler">
+	</command>
+	
+	<!-- Creation command for FlowPort -->
+	<command categoryId="org.eclipse.papyrus.editor.category"
+		id="org.eclipse.papyrus.sysml.modelexplorer.FlowPortCreateCommand"
+		name="Create a new FlowPort" description="Create a new FlowPort"
+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.FlowPortHandler">
+	</command>
+	
+	<!-- Creation command for FlowPort_InOut -->
+	<command categoryId="org.eclipse.papyrus.editor.category"
+		id="org.eclipse.papyrus.sysml.modelexplorer.FlowPort_InOutCreateCommand"
+		name="Create a new FlowPort_InOut" description="Create a new FlowPort_InOut"
+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.FlowPort_InOutHandler">
+	</command>
+	
+	<!-- Creation command for FlowPort_In -->
+	<command categoryId="org.eclipse.papyrus.editor.category"
+		id="org.eclipse.papyrus.sysml.modelexplorer.FlowPort_InCreateCommand"
+		name="Create a new FlowPort_In" description="Create a new FlowPort_In"
+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.FlowPort_InHandler">
+	</command>
+	
+	<!-- Creation command for FlowPort_Out -->
+	<command categoryId="org.eclipse.papyrus.editor.category"
+		id="org.eclipse.papyrus.sysml.modelexplorer.FlowPort_OutCreateCommand"
+		name="Create a new FlowPort_Out" description="Create a new FlowPort_Out"
+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.FlowPort_OutHandler">
+	</command>
+	
+	<!-- Creation command for FlowProperty -->
+	<command categoryId="org.eclipse.papyrus.editor.category"
+		id="org.eclipse.papyrus.sysml.modelexplorer.FlowPropertyCreateCommand"
+		name="Create a new FlowProperty" description="Create a new FlowProperty"
+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.FlowPropertyHandler">
+	</command>
+	
+	<!-- Creation command for FlowSpecification -->
+	<command categoryId="org.eclipse.papyrus.editor.category"
+		id="org.eclipse.papyrus.sysml.modelexplorer.FlowSpecificationCreateCommand"
+		name="Create a new FlowSpecification" description="Create a new FlowSpecification"
+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.FlowSpecificationHandler">
+	</command>
+	
+	<!-- Creation command for ItemFlow -->
+	<command categoryId="org.eclipse.papyrus.editor.category"
+		id="org.eclipse.papyrus.sysml.modelexplorer.ItemFlowCreateCommand"
+		name="Create a new ItemFlow" description="Create a new ItemFlow"
+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.ItemFlowHandler">
+	</command>
+	
+	<!-- Creation command for Problem -->
+	<command categoryId="org.eclipse.papyrus.editor.category"
+		id="org.eclipse.papyrus.sysml.modelexplorer.ProblemCreateCommand"
+		name="Create a new Problem" description="Create a new Problem"
+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.ProblemHandler">
+	</command>
+	
+	<!-- Creation command for Rationale -->
+	<command categoryId="org.eclipse.papyrus.editor.category"
+		id="org.eclipse.papyrus.sysml.modelexplorer.RationaleCreateCommand"
+		name="Create a new Rationale" description="Create a new Rationale"
+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.RationaleHandler">
+	</command>
+	
+	<!-- Creation command for Requirement -->
+	<command categoryId="org.eclipse.papyrus.editor.category"
+		id="org.eclipse.papyrus.sysml.modelexplorer.RequirementCreateCommand"
+		name="Create a new Requirement" description="Create a new Requirement"
+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.RequirementHandler">
+	</command>
+	
+	<!-- Creation command for Unit -->
+	<command categoryId="org.eclipse.papyrus.editor.category"
+		id="org.eclipse.papyrus.sysml.modelexplorer.UnitCreateCommand"
+		name="Create a new Unit" description="Create a new Unit"
+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.UnitHandler">
+	</command>
+	
+	<!-- Creation command for ValueType -->
+	<command categoryId="org.eclipse.papyrus.editor.category"
+		id="org.eclipse.papyrus.sysml.modelexplorer.ValueTypeCreateCommand"
+		name="Create a new ValueType" description="Create a new ValueType"
+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.ValueTypeHandler">
+	</command>
+	
+	<!-- Creation command for ValueType_Enumeration -->
+	<command categoryId="org.eclipse.papyrus.editor.category"
+		id="org.eclipse.papyrus.sysml.modelexplorer.ValueType_EnumerationCreateCommand"
+		name="Create a new ValueType_Enumeration" description="Create a new ValueType_Enumeration"
+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.ValueType_EnumerationHandler">
+	</command>
+	
+	<!-- Creation command for ValueType_PrimitiveType -->
+	<command categoryId="org.eclipse.papyrus.editor.category"
+		id="org.eclipse.papyrus.sysml.modelexplorer.ValueType_PrimitiveTypeCreateCommand"
+		name="Create a new ValueType_PrimitiveType" description="Create a new ValueType_PrimitiveType"
+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.ValueType_PrimitiveTypeHandler">
+	</command>
+	
+	<!-- Creation command for Verify -->
+	<command categoryId="org.eclipse.papyrus.editor.category"
+		id="org.eclipse.papyrus.sysml.modelexplorer.VerifyCreateCommand"
+		name="Create a new Verify" description="Create a new Verify"
+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.VerifyHandler">
+	</command>
+	
+	<!-- Creation command for View -->
+	<command categoryId="org.eclipse.papyrus.editor.category"
+		id="org.eclipse.papyrus.sysml.modelexplorer.ViewCreateCommand"
+		name="Create a new View" description="Create a new View"
+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.ViewHandler">
+	</command>
+	
+	<!-- Creation command for ViewPoint -->
+	<command categoryId="org.eclipse.papyrus.editor.category"
+		id="org.eclipse.papyrus.sysml.modelexplorer.ViewPointCreateCommand"
+		name="Create a new ViewPoint" description="Create a new ViewPoint"
+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.ViewPointHandler">
+	</command>
+	
+	<!-- Creation command for Satisfy -->
+	<command categoryId="org.eclipse.papyrus.editor.category"
+		id="org.eclipse.papyrus.sysml.modelexplorer.SatisfyCreateCommand"
+		name="Create a new Satisfy" description="Create a new Satisfy"
+		defaultHandler="org.eclipse.papyrus.sysml.modelexplorer.handler.SatisfyHandler">
+	</command>
+	
+</extension>
+
+	
+<!-- UI Menu declaration for creation commands -->
+<extension point="org.eclipse.ui.menus">
+
+	<menuContribution locationURI="popup:org.eclipse.papyrus.modelexplorer.popupmenu.createsysmlchild" allPopups="false">
+
+		<!-- Creation menu action for Allocate -->
+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.AllocateCreateCommand"
+			label="Create a new Allocate" tooltip="Create a new Allocate" style="push"		
+			icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif" >
+			<visibleWhen checkEnabled="true"/>
+		</command>
+		
+		<!-- Creation menu action for Block -->
+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.BlockCreateCommand"
+			label="Create a new Block" tooltip="Create a new Block" style="push"		
+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Block.gif" >
+			<visibleWhen checkEnabled="true"/>
+		</command>
+		
+		<!-- Creation menu action for Conform -->
+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.ConformCreateCommand"
+			label="Create a new Conform" tooltip="Create a new Conform" style="push"		
+			icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif" >
+			<visibleWhen checkEnabled="true"/>
+		</command>
+		
+		<!-- Creation menu action for ConstraintBlock -->
+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.ConstraintBlockCreateCommand"
+			label="Create a new ConstraintBlock" tooltip="Create a new ConstraintBlock" style="push"		
+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/constraints/ConstraintBlock.gif" >
+			<visibleWhen checkEnabled="true"/>
+		</command>
+		
+		<!-- Creation menu action for ConstraintProperty -->
+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.ConstraintPropertyCreateCommand"
+			label="Create a new ConstraintProperty" tooltip="Create a new ConstraintProperty" style="push"		
+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/constraints/ConstraintProperty.gif" >
+			<visibleWhen checkEnabled="true"/>
+		</command>
+		
+		<!-- Creation menu action for Copy -->
+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.CopyCreateCommand"
+			label="Create a new Copy" tooltip="Create a new Copy" style="push"		
+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Copy.gif" >
+			<visibleWhen checkEnabled="true"/>
+		</command>
+		
+		<!-- Creation menu action for DeriveReqt -->
+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.DeriveReqtCreateCommand"
+			label="Create a new DeriveReqt" tooltip="Create a new DeriveReqt" style="push"		
+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/DeriveReqt.gif" >
+			<visibleWhen checkEnabled="true"/>
+		</command>
+		
+		<!-- Creation menu action for Dimension -->
+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.DimensionCreateCommand"
+			label="Create a new Dimension" tooltip="Create a new Dimension" style="push"		
+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Dimension.gif" >
+			<visibleWhen checkEnabled="true"/>
+		</command>
+		
+		<!-- Creation menu action for FlowPort -->
+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.FlowPortCreateCommand"
+			label="Create a new FlowPort" tooltip="Create a new FlowPort" style="push"		
+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_INOUT_A.gif" >
+			<visibleWhen checkEnabled="true"/>
+		</command>
+		
+		<!-- Creation menu action for FlowPort_InOut -->
+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.FlowPort_InOutCreateCommand"
+			label="Create a new FlowPort_InOut" tooltip="Create a new FlowPort_InOut" style="push"		
+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_INOUT_A.gif" >
+			<visibleWhen checkEnabled="true"/>
+		</command>
+		
+		<!-- Creation menu action for FlowPort_In -->
+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.FlowPort_InCreateCommand"
+			label="Create a new FlowPort_In" tooltip="Create a new FlowPort_In" style="push"		
+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_IN_A.gif" >
+			<visibleWhen checkEnabled="true"/>
+		</command>
+		
+		<!-- Creation menu action for FlowPort_Out -->
+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.FlowPort_OutCreateCommand"
+			label="Create a new FlowPort_Out" tooltip="Create a new FlowPort_Out" style="push"		
+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_OUT_A.gif" >
+			<visibleWhen checkEnabled="true"/>
+		</command>
+		
+		<!-- Creation menu action for FlowProperty -->
+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.FlowPropertyCreateCommand"
+			label="Create a new FlowProperty" tooltip="Create a new FlowProperty" style="push"		
+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowProperty_INOUT.gif" >
+			<visibleWhen checkEnabled="true"/>
+		</command>
+		
+		<!-- Creation menu action for FlowSpecification -->
+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.FlowSpecificationCreateCommand"
+			label="Create a new FlowSpecification" tooltip="Create a new FlowSpecification" style="push"		
+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowSpecification.gif" >
+			<visibleWhen checkEnabled="true"/>
+		</command>
+		
+		<!-- Creation menu action for ItemFlow -->
+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.ItemFlowCreateCommand"
+			label="Create a new ItemFlow" tooltip="Create a new ItemFlow" style="push"		
+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/ItemFlow.gif" >
+			<visibleWhen checkEnabled="true"/>
+		</command>
+		
+		<!-- Creation menu action for Problem -->
+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.ProblemCreateCommand"
+			label="Create a new Problem" tooltip="Create a new Problem" style="push"		
+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/modelelements/Problem.gif" >
+			<visibleWhen checkEnabled="true"/>
+		</command>
+		
+		<!-- Creation menu action for Rationale -->
+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.RationaleCreateCommand"
+			label="Create a new Rationale" tooltip="Create a new Rationale" style="push"		
+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/modelelements/Rationale.gif" >
+			<visibleWhen checkEnabled="true"/>
+		</command>
+		
+		<!-- Creation menu action for Requirement -->
+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.RequirementCreateCommand"
+			label="Create a new Requirement" tooltip="Create a new Requirement" style="push"		
+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Requirement.gif" >
+			<visibleWhen checkEnabled="true"/>
+		</command>
+		
+		<!-- Creation menu action for Unit -->
+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.UnitCreateCommand"
+			label="Create a new Unit" tooltip="Create a new Unit" style="push"		
+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Unit.gif" >
+			<visibleWhen checkEnabled="true"/>
+		</command>
+		
+		<!-- Creation menu action for ValueType -->
+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.ValueTypeCreateCommand"
+			label="Create a new ValueType" tooltip="Create a new ValueType" style="push"		
+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/ValueType.gif" >
+			<visibleWhen checkEnabled="true"/>
+		</command>
+		
+		<!-- Creation menu action for ValueType_Enumeration -->
+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.ValueType_EnumerationCreateCommand"
+			label="Create a new ValueType_Enumeration" tooltip="Create a new ValueType_Enumeration" style="push"		
+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/ValueType.gif" >
+			<visibleWhen checkEnabled="true"/>
+		</command>
+		
+		<!-- Creation menu action for ValueType_PrimitiveType -->
+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.ValueType_PrimitiveTypeCreateCommand"
+			label="Create a new ValueType_PrimitiveType" tooltip="Create a new ValueType_PrimitiveType" style="push"		
+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/ValueType.gif" >
+			<visibleWhen checkEnabled="true"/>
+		</command>
+		
+		<!-- Creation menu action for Verify -->
+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.VerifyCreateCommand"
+			label="Create a new Verify" tooltip="Create a new Verify" style="push"		
+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Verify.gif" >
+			<visibleWhen checkEnabled="true"/>
+		</command>
+		
+		<!-- Creation menu action for View -->
+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.ViewCreateCommand"
+			label="Create a new View" tooltip="Create a new View" style="push"		
+			icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif" >
+			<visibleWhen checkEnabled="true"/>
+		</command>
+		
+		<!-- Creation menu action for ViewPoint -->
+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.ViewPointCreateCommand"
+			label="Create a new ViewPoint" tooltip="Create a new ViewPoint" style="push"		
+			icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" >
+			<visibleWhen checkEnabled="true"/>
+		</command>
+		
+		<!-- Creation menu action for Satisfy -->
+		<command commandId="org.eclipse.papyrus.sysml.modelexplorer.SatisfyCreateCommand"
+			label="Create a new Satisfy" tooltip="Create a new Satisfy" style="push"		
+			icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Satisfy.gif" >
+			<visibleWhen checkEnabled="true"/>
+		</command>
+		
+	</menuContribution>
+	
+</extension>
+</plugin>
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/.classpath b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/.classpath
index 64c5e31b7a2..ed2585fb3f4 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/.classpath
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/.classpath
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="src-gen"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/META-INF/MANIFEST.MF b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/META-INF/MANIFEST.MF
index 3a5f5e4c270..be13c1e45d3 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/META-INF/MANIFEST.MF
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/META-INF/MANIFEST.MF
@@ -11,7 +11,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.uml2.uml;bundle-version="3.1.0",
  org.eclipse.papyrus.sysml;bundle-version="0.8.0",
  org.eclipse.papyrus.log;bundle-version="0.8.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0"
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
+ org.eclipse.papyrus.uml.standard;bundle-version="0.7.1"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.papyrus.sysml.service.types,
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/ElementTypeModelForSySML.domaincontextcodegen b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/ElementTypeModelForSySML.domaincontextcodegen
new file mode 100644
index 00000000000..d971af423b8
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/ElementTypeModelForSySML.domaincontextcodegen
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<domaincontextcodegen:DomainContext xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:domaincontextcodegen="http://www.eclipse.org/papyrus/2010/domaincontextcodegen" typeProjectName="org.eclipse.papyrus.sysml.service.types" handlerProjectName="org.eclipse.papyrus.sysml.modelexplorer" IClientContextID="" elementTypeIDPrefix="org.eclipse.papyrus.sysml" elementTypeNamePrefix="SysML" defaultHelperPath="" generatedSourceFolder="src-gen">

+  <metamodel href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#/"/>

+  <specializationOf href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#/"/>

+  <elementTypes>

+    <types xsi:type="domaincontextcodegen:SpecializationType" name="Allocate" helper="org.eclipse.papyrus.sysml.service.types.helper.AllocateEditHelperAdvice" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.AllocateMatcher">

+      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.0"/>

+    </types>

+    <types xsi:type="domaincontextcodegen:SpecializationType" name="Block" helper="org.eclipse.papyrus.sysml.service.types.helper.BlockEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Block.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.BlockMatcher">

+      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.31"/>

+    </types>

+    <types xsi:type="domaincontextcodegen:SpecializationType" name="Conform" helper="org.eclipse.papyrus.sysml.service.types.helper.ConformEditHelperAdvice" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.ConformMatcher">

+      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.63"/>

+    </types>

+    <types xsi:type="domaincontextcodegen:SpecializationType" name="ConstraintBlock" helper="org.eclipse.papyrus.sysml.service.types.helper.ConstraintBlockEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/constraints/ConstraintBlock.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.ConstraintBlockMatcher">

+      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.31"/>

+    </types>

+    <types xsi:type="domaincontextcodegen:SpecializationType" name="ConstraintProperty" helper="org.eclipse.papyrus.sysml.service.types.helper.ConstraintPropertyEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/constraints/ConstraintProperty.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.ConstraintPropertyMatcher">

+      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.172"/>

+    </types>

+    <types xsi:type="domaincontextcodegen:SpecializationType" name="Copy" helper="org.eclipse.papyrus.sysml.service.types.helper.CopyEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Copy.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.CopyMatcher">

+      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.0"/>

+    </types>

+    <types xsi:type="domaincontextcodegen:SpecializationType" name="DeriveReqt" helper="org.eclipse.papyrus.sysml.service.types.helper.DeriveReqtEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/DeriveReqt.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.DeriveReqtMatcher">

+      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.0"/>

+    </types>

+    <types xsi:type="domaincontextcodegen:SpecializationType" name="Dimension" helper="org.eclipse.papyrus.sysml.service.types.helper.DimensionEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Dimension.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.DimensionMatcher">

+      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.112"/>

+    </types>

+    <types xsi:type="domaincontextcodegen:SpecializationType" name="FlowPort" helper="org.eclipse.papyrus.sysml.service.types.helper.FlowPortEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_INOUT_A.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortMatcher">

+      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.168"/>

+    </types>

+    <types xsi:type="domaincontextcodegen:SpecializationType" name="FlowPort_InOut" helper="org.eclipse.papyrus.sysml.service.types.helper.FlowPortInOutEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_INOUT_A.gif" ref="//@elementTypes/@types.8" matcher="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortInOutMatcher"/>

+    <types xsi:type="domaincontextcodegen:SpecializationType" name="FlowPort_In" helper="org.eclipse.papyrus.sysml.service.types.helper.FlowPortInEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_IN_A.gif" ref="//@elementTypes/@types.8" matcher="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortInMatcher"/>

+    <types xsi:type="domaincontextcodegen:SpecializationType" name="FlowPort_Out" helper="org.eclipse.papyrus.sysml.service.types.helper.FlowPortOutEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_OUT_A.gif" ref="//@elementTypes/@types.8" matcher="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortOutMatcher"/>

+    <types xsi:type="domaincontextcodegen:SpecializationType" name="FlowProperty" helper="org.eclipse.papyrus.sysml.service.types.helper.FlowPropertyEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowProperty_INOUT.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.FlowPropertyMatcher">

+      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.172"/>

+    </types>

+    <types xsi:type="domaincontextcodegen:SpecializationType" name="FlowSpecification" helper="org.eclipse.papyrus.sysml.service.types.helper.FlowSpecificationEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowSpecification.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.FlowSpecificationMatcher">

+      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.119"/>

+    </types>

+    <types xsi:type="domaincontextcodegen:SpecializationType" name="ItemFlow" helper="org.eclipse.papyrus.sysml.service.types.helper.ItemFlowEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/ItemFlow.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.ItemFlowMatcher">

+      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.108"/>

+    </types>

+    <types xsi:type="domaincontextcodegen:SpecializationType" name="Problem" helper="org.eclipse.papyrus.sysml.service.types.helper.ProblemEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/modelelements/Problem.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.ProblemMatcher">

+      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.41"/>

+    </types>

+    <types xsi:type="domaincontextcodegen:SpecializationType" name="Rationale" helper="org.eclipse.papyrus.sysml.service.types.helper.RationaleEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/modelelements/Rationale.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.RationaleMatcher">

+      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.41"/>

+    </types>

+    <types xsi:type="domaincontextcodegen:SpecializationType" name="Requirement" helper="org.eclipse.papyrus.sysml.service.types.helper.RequirementEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Requirement.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.RequirementMatcher">

+      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.31"/>

+    </types>

+    <types xsi:type="domaincontextcodegen:SpecializationType" name="Unit" helper="org.eclipse.papyrus.sysml.service.types.helper.UnitEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Unit.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.UnitMatcher">

+      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.112"/>

+    </types>

+    <types xsi:type="domaincontextcodegen:SpecializationType" name="ValueType" helper="org.eclipse.papyrus.sysml.service.types.helper.ValueTypeEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/ValueType.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.ValueTypeMatcher">

+      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.61"/>

+    </types>

+    <types xsi:type="domaincontextcodegen:SpecializationType" name="ValueType_Enumeration" helper="org.eclipse.papyrus.sysml.service.types.helper.ValueTypeEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/ValueType.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.ValueTypeEnumerationMatcher">

+      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.80"/>

+    </types>

+    <types xsi:type="domaincontextcodegen:SpecializationType" name="ValueType_PrimitiveType" helper="org.eclipse.papyrus.sysml.service.types.helper.ValueTypeEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/ValueType.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.ValueTypePrimitiveTypeMatcher">

+      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.169"/>

+    </types>

+    <types xsi:type="domaincontextcodegen:SpecializationType" name="Verify" helper="org.eclipse.papyrus.sysml.service.types.helper.VerifyEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Verify.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.VerifyMatcher">

+      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.0"/>

+    </types>

+    <types xsi:type="domaincontextcodegen:SpecializationType" name="View" helper="org.eclipse.papyrus.sysml.service.types.helper.ViewEditHelperAdvice" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.ViewMatcher">

+      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.159"/>

+    </types>

+    <types xsi:type="domaincontextcodegen:SpecializationType" name="ViewPoint" helper="org.eclipse.papyrus.sysml.service.types.helper.ViewPointEditHelperAdvice" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.ViewPointMatcher">

+      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.31"/>

+    </types>

+    <types xsi:type="domaincontextcodegen:SpecializationType" name="Satisfy" helper="org.eclipse.papyrus.sysml.service.types.helper.SatisfyEditHelperAdvice" icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Satisfy.gif" matcher="org.eclipse.papyrus.sysml.service.types.matcher.SatisfyMatcher">

+      <ref xsi:type="domaincontextcodegen:MetaClassType" href="../../org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen#//@elementTypes/@types.0"/>

+    </types>

+  </elementTypes>

+  <bindings clientContextID="org.eclipse.papyrus.service.edit.TypeContext">

+    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.1"/>

+    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.2"/>

+    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.3"/>

+    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.4"/>

+    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.5"/>

+    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.6"/>

+    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.7"/>

+    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.8"/>

+    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.9"/>

+    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.10"/>

+    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.11"/>

+    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.12"/>

+    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.13"/>

+    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.14"/>

+    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.15"/>

+    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.16"/>

+    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.17"/>

+    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.18"/>

+    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.19"/>

+    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.20"/>

+    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.21"/>

+    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.22"/>

+    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.23"/>

+    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.24"/>

+    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" ref="//@elementTypes/@types.25"/>

+  </bindings>

+  <genHandlers handlerPackage="org.eclipse.papyrus.sysml.modelexplorer.handler" superClass="CreateCommandHandler" superClassPackage="org.eclipse.papyrus.sysml.modelexplorer.handler" elementTypeEnumerator="SysMLElementTypes" elementTypeEnumeratorPackage="org.eclipse.papyrus.sysml.service.types.element" visibleCreateChildHandlers="//@elementTypes/@types.1 //@elementTypes/@types.3 //@elementTypes/@types.4 //@elementTypes/@types.7 //@elementTypes/@types.8 //@elementTypes/@types.10 //@elementTypes/@types.9 //@elementTypes/@types.11 //@elementTypes/@types.12 //@elementTypes/@types.13 //@elementTypes/@types.15 //@elementTypes/@types.16 //@elementTypes/@types.17 //@elementTypes/@types.18 //@elementTypes/@types.19 //@elementTypes/@types.23 //@elementTypes/@types.24" createChildMenuLocationURI="popup:org.eclipse.papyrus.modelexplorer.popupmenu.createsysmlchild"/>

+</domaincontextcodegen:DomainContext>

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/plugin.xml b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/plugin.xml
index 26fde5497c8..ad7be80c0f0 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/plugin.xml
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/plugin.xml
@@ -2,95 +2,286 @@
 <?eclipse version="3.4"?>
 <plugin>
 
-<!-- SysML ElementType declarations -->
+<!-- SysML ElementTypes declarations -->
 <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
 
+	<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
+	
 	<!-- Declaration of IElementTypes -->
 	
-	<!-- IElementTypes for Abstraction -->			
-	<specializationType id="org.eclipse.papyrus.sysml.Block"
+	<!-- ISpecializationType Allocate of UML::Abstraction -->
+	<specializationType id="org.eclipse.papyrus.sysml.Allocate" name="SysML::Allocate"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.AllocateEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::Allocate"/>
+		<specializes id="org.eclipse.papyrus.uml.Abstraction" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.AllocateMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType Block of UML::Class -->
+	<specializationType id="org.eclipse.papyrus.sysml.Block" name="SysML::Block"
 		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.BlockEditHelperAdvice"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="SysML::Block">
-		<param name="semanticHint" value="SysML::Block" />
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::Block"/>
 		<specializes id="org.eclipse.papyrus.uml.Class" />
-		<matcher class = "org.eclipse.papyrus.sysml.service.types.matcher.BlockMatcher" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.BlockMatcher" />
 	</specializationType>
-
-	<specializationType id="org.eclipse.papyrus.sysml.FlowPort"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.FlowPortEditHelperAdvice"    
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="SysML::FLowPort">
-		<param name="semanticHint" value="SysML::FLowPort" />
+	
+	<!-- ISpecializationType Conform of UML::Dependency -->
+	<specializationType id="org.eclipse.papyrus.sysml.Conform" name="SysML::Conform"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.ConformEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::Conform"/>
+		<specializes id="org.eclipse.papyrus.uml.Dependency" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.ConformMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType ConstraintBlock of UML::Class -->
+	<specializationType id="org.eclipse.papyrus.sysml.ConstraintBlock" name="SysML::ConstraintBlock"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.ConstraintBlockEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::ConstraintBlock"/>
+		<specializes id="org.eclipse.papyrus.uml.Class" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.ConstraintBlockMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType ConstraintProperty of UML::Property -->
+	<specializationType id="org.eclipse.papyrus.sysml.ConstraintProperty" name="SysML::ConstraintProperty"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.ConstraintPropertyEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::ConstraintProperty"/>
+		<specializes id="org.eclipse.papyrus.uml.Property" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.ConstraintPropertyMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType Copy of UML::Abstraction -->
+	<specializationType id="org.eclipse.papyrus.sysml.Copy" name="SysML::Copy"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.CopyEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::Copy"/>
+		<specializes id="org.eclipse.papyrus.uml.Abstraction" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.CopyMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType DeriveReqt of UML::Abstraction -->
+	<specializationType id="org.eclipse.papyrus.sysml.DeriveReqt" name="SysML::DeriveReqt"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.DeriveReqtEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::DeriveReqt"/>
+		<specializes id="org.eclipse.papyrus.uml.Abstraction" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.DeriveReqtMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType Dimension of UML::InstanceSpecification -->
+	<specializationType id="org.eclipse.papyrus.sysml.Dimension" name="SysML::Dimension"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.DimensionEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::Dimension"/>
+		<specializes id="org.eclipse.papyrus.uml.InstanceSpecification" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.DimensionMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType FlowPort of UML::Port -->
+	<specializationType id="org.eclipse.papyrus.sysml.FlowPort" name="SysML::FlowPort"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.FlowPortEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::FlowPort"/>
 		<specializes id="org.eclipse.papyrus.uml.Port" />
-		<matcher class = "org.eclipse.papyrus.sysml.service.types.matcher.FlowPortMatcher" />		
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortMatcher" />
 	</specializationType>
 	
-	<specializationType id="org.eclipse.papyrus.sysml.InOutFlowPort"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.InOutFlowPortEditHelperAdvice"    
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="SysML::FLowPort">
-		<param name="semanticHint" value="SysML::FLowPort_INOUT" />
+	<!-- ISpecializationType FlowPort_InOut of SysML::FlowPort -->
+	<specializationType id="org.eclipse.papyrus.sysml.FlowPort_InOut" name="SysML::FlowPort_InOut"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.FlowPortInOutEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::FlowPort_InOut"/>
 		<specializes id="org.eclipse.papyrus.sysml.FlowPort" />
-		<matcher class = "org.eclipse.papyrus.sysml.service.types.matcher.FlowPortInOutMatcher" />		
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortInOutMatcher" />
 	</specializationType>
-		
-	<specializationType id="org.eclipse.papyrus.sysml.InFlowPort"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.InFlowPortEditHelperAdvice"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="SysML::InFLowPort">
-		<param name="semanticHint" value="SysML::FLowPort_IN" />
+	
+	<!-- ISpecializationType FlowPort_In of SysML::FlowPort -->
+	<specializationType id="org.eclipse.papyrus.sysml.FlowPort_In" name="SysML::FlowPort_In"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.FlowPortInEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::FlowPort_In"/>
 		<specializes id="org.eclipse.papyrus.sysml.FlowPort" />
-		<matcher class = "org.eclipse.papyrus.sysml.service.types.matcher.FlowPortInMatcher" />		
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortInMatcher" />
 	</specializationType>
 	
-	<specializationType id="org.eclipse.papyrus.sysml.OutFlowPort"
-		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.OutFlowPortEditHelperAdvice"  
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="SysML::OutFLowPort">
-		<param name="semanticHint" value="SysML::FLowPort_OUT" />
+	<!-- ISpecializationType FlowPort_Out of SysML::FlowPort -->
+	<specializationType id="org.eclipse.papyrus.sysml.FlowPort_Out" name="SysML::FlowPort_Out"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.FlowPortOutEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::FlowPort_Out"/>
 		<specializes id="org.eclipse.papyrus.sysml.FlowPort" />
-		<matcher class = "org.eclipse.papyrus.sysml.service.types.matcher.FlowPortOutMatcher" />		
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortOutMatcher" />
 	</specializationType>
-
-	<specializationType id="org.eclipse.papyrus.sysml.FlowProperty"
+	
+	<!-- ISpecializationType FlowProperty of UML::Property -->
+	<specializationType id="org.eclipse.papyrus.sysml.FlowProperty" name="SysML::FlowProperty"
 		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.FlowPropertyEditHelperAdvice"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="SysML::FlowProperty">
-		<param name="semanticHint" value="SysML::FlowProperty" />
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::FlowProperty"/>
 		<specializes id="org.eclipse.papyrus.uml.Property" />
-		<matcher class = "org.eclipse.papyrus.sysml.service.types.matcher.FlowPropertyMatcher" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.FlowPropertyMatcher" />
 	</specializationType>
 	
-	<specializationType id="org.eclipse.papyrus.sysml.FlowSpecification"
+	<!-- ISpecializationType FlowSpecification of UML::Interface -->
+	<specializationType id="org.eclipse.papyrus.sysml.FlowSpecification" name="SysML::FlowSpecification"
 		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.FlowSpecificationEditHelperAdvice"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="SysML::FlowSpecification">
-		<param name="semanticHint" value="SysML::FlowSpecification" />
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::FlowSpecification"/>
 		<specializes id="org.eclipse.papyrus.uml.Interface" />
-		<matcher class = "org.eclipse.papyrus.sysml.service.types.matcher.FlowSpecificationMatcher" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.FlowSpecificationMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType ItemFlow of UML::InformationFlow -->
+	<specializationType id="org.eclipse.papyrus.sysml.ItemFlow" name="SysML::ItemFlow"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.ItemFlowEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::ItemFlow"/>
+		<specializes id="org.eclipse.papyrus.uml.InformationFlow" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.ItemFlowMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType Problem of UML::Comment -->
+	<specializationType id="org.eclipse.papyrus.sysml.Problem" name="SysML::Problem"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.ProblemEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::Problem"/>
+		<specializes id="org.eclipse.papyrus.uml.Comment" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.ProblemMatcher" />
 	</specializationType>
-		
-	<specializationType id="org.eclipse.papyrus.sysml.Requirement"
+	
+	<!-- ISpecializationType Rationale of UML::Comment -->
+	<specializationType id="org.eclipse.papyrus.sysml.Rationale" name="SysML::Rationale"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.RationaleEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::Rationale"/>
+		<specializes id="org.eclipse.papyrus.uml.Comment" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.RationaleMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType Requirement of UML::Class -->
+	<specializationType id="org.eclipse.papyrus.sysml.Requirement" name="SysML::Requirement"
 		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.RequirementEditHelperAdvice"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="SysML::Requirement">
-		<param name="semanticHint" value="SysML::Requirement" />
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::Requirement"/>
 		<specializes id="org.eclipse.papyrus.uml.Class" />
-		<matcher class = "org.eclipse.papyrus.sysml.service.types.matcher.RequirementMatcher" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.RequirementMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType Unit of UML::InstanceSpecification -->
+	<specializationType id="org.eclipse.papyrus.sysml.Unit" name="SysML::Unit"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.UnitEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::Unit"/>
+		<specializes id="org.eclipse.papyrus.uml.InstanceSpecification" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.UnitMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType ValueType of UML::DataType -->
+	<specializationType id="org.eclipse.papyrus.sysml.ValueType" name="SysML::ValueType"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.ValueTypeEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::ValueType"/>
+		<specializes id="org.eclipse.papyrus.uml.DataType" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.ValueTypeMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType ValueType_Enumeration of UML::Enumeration -->
+	<specializationType id="org.eclipse.papyrus.sysml.ValueType_Enumeration" name="SysML::ValueType_Enumeration"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.ValueTypeEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::ValueType_Enumeration"/>
+		<specializes id="org.eclipse.papyrus.uml.Enumeration" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.ValueTypeEnumerationMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType ValueType_PrimitiveType of UML::PrimitiveType -->
+	<specializationType id="org.eclipse.papyrus.sysml.ValueType_PrimitiveType" name="SysML::ValueType_PrimitiveType"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.ValueTypeEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::ValueType_PrimitiveType"/>
+		<specializes id="org.eclipse.papyrus.uml.PrimitiveType" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.ValueTypePrimitiveTypeMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType Verify of UML::Abstraction -->
+	<specializationType id="org.eclipse.papyrus.sysml.Verify" name="SysML::Verify"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.VerifyEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::Verify"/>
+		<specializes id="org.eclipse.papyrus.uml.Abstraction" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.VerifyMatcher" />
 	</specializationType>
 	
+	<!-- ISpecializationType View of UML::Package -->
+	<specializationType id="org.eclipse.papyrus.sysml.View" name="SysML::View"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.ViewEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::View"/>
+		<specializes id="org.eclipse.papyrus.uml.Package" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.ViewMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType ViewPoint of UML::Class -->
+	<specializationType id="org.eclipse.papyrus.sysml.ViewPoint" name="SysML::ViewPoint"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.ViewPointEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::ViewPoint"/>
+		<specializes id="org.eclipse.papyrus.uml.Class" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.ViewPointMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType Satisfy of UML::Abstraction -->
+	<specializationType id="org.eclipse.papyrus.sysml.Satisfy" name="SysML::Satisfy"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.SatisfyEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::Satisfy"/>
+		<specializes id="org.eclipse.papyrus.uml.Abstraction" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.SatisfyMatcher" />
+	</specializationType>
+	
+	</metamodel>
 </extension>
 
+
 <!-- SysML ElementType bindings to Papyrus shared IClientContext -->
 <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">
 
-	<!-- Binding declarations -->
-	<!-- 
-		Warning the Parametric diagram declares types with following (generated) ids 
-		org.eclipse.papyrus.sysml.diagram.* that should not be bound to shared context
-		The following regex "org.eclipse.papyrus.sysml.(?!diagram).*" is
-		expected to bind any ElementType with id starting with "org.eclipse.papyrus.sysml"
-		except those starting with "org.eclipse.papyrus.sysml.diagram".  
-	  -->
+	<!-- Bindings declaration -->
 	<binding context="org.eclipse.papyrus.service.edit.TypeContext">
-		<elementType pattern="org.eclipse.papyrus.sysml.(?!diagram).*" />
+	
+		<elementType ref="org.eclipse.papyrus.sysml.Block" />
+		<elementType ref="org.eclipse.papyrus.sysml.Conform" />
+		<elementType ref="org.eclipse.papyrus.sysml.ConstraintBlock" />
+		<elementType ref="org.eclipse.papyrus.sysml.ConstraintProperty" />
+		<elementType ref="org.eclipse.papyrus.sysml.Copy" />
+		<elementType ref="org.eclipse.papyrus.sysml.DeriveReqt" />
+		<elementType ref="org.eclipse.papyrus.sysml.Dimension" />
+		<elementType ref="org.eclipse.papyrus.sysml.FlowPort" />
+		<elementType ref="org.eclipse.papyrus.sysml.FlowPort_InOut" />
+		<elementType ref="org.eclipse.papyrus.sysml.FlowPort_In" />
+		<elementType ref="org.eclipse.papyrus.sysml.FlowPort_Out" />
+		<elementType ref="org.eclipse.papyrus.sysml.FlowProperty" />
+		<elementType ref="org.eclipse.papyrus.sysml.FlowSpecification" />
+		<elementType ref="org.eclipse.papyrus.sysml.ItemFlow" />
+		<elementType ref="org.eclipse.papyrus.sysml.Problem" />
+		<elementType ref="org.eclipse.papyrus.sysml.Rationale" />
+		<elementType ref="org.eclipse.papyrus.sysml.Requirement" />
+		<elementType ref="org.eclipse.papyrus.sysml.Unit" />
+		<elementType ref="org.eclipse.papyrus.sysml.ValueType" />
+		<elementType ref="org.eclipse.papyrus.sysml.ValueType_Enumeration" />
+		<elementType ref="org.eclipse.papyrus.sysml.ValueType_PrimitiveType" />
+		<elementType ref="org.eclipse.papyrus.sysml.Verify" />
+		<elementType ref="org.eclipse.papyrus.sysml.View" />
+		<elementType ref="org.eclipse.papyrus.sysml.ViewPoint" />
+		<elementType ref="org.eclipse.papyrus.sysml.Satisfy" />
+
 	</binding>
 	
 </extension>
 
-
-			
 </plugin>
+
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src-gen/org/eclipse/papyrus/sysml/service/types/element/SysMLElementTypes.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src-gen/org/eclipse/papyrus/sysml/service/types/element/SysMLElementTypes.java
new file mode 100644
index 00000000000..ee30d8cbbcc
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src-gen/org/eclipse/papyrus/sysml/service/types/element/SysMLElementTypes.java
@@ -0,0 +1,87 @@
+package org.eclipse.papyrus.sysml.service.types.element;
+
+import org.eclipse.gmf.runtime.emf.type.core.AbstractElementTypeEnumerator;
+import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
+
+/** Convenient utility class listing IElementType declared in plugin.xml */
+public class SysMLElementTypes extends AbstractElementTypeEnumerator {
+
+	/** IElementType for SysML Allocate */
+	public static final IHintedType ALLOCATE = (IHintedType)getElementType("org.eclipse.papyrus.sysml.Allocate"); //$NON-NLS-1$
+	
+	/** IElementType for SysML Block */
+	public static final IHintedType BLOCK = (IHintedType)getElementType("org.eclipse.papyrus.sysml.Block"); //$NON-NLS-1$
+	
+	/** IElementType for SysML Conform */
+	public static final IHintedType CONFORM = (IHintedType)getElementType("org.eclipse.papyrus.sysml.Conform"); //$NON-NLS-1$
+	
+	/** IElementType for SysML ConstraintBlock */
+	public static final IHintedType CONSTRAINT_BLOCK = (IHintedType)getElementType("org.eclipse.papyrus.sysml.ConstraintBlock"); //$NON-NLS-1$
+	
+	/** IElementType for SysML ConstraintProperty */
+	public static final IHintedType CONSTRAINT_PROPERTY = (IHintedType)getElementType("org.eclipse.papyrus.sysml.ConstraintProperty"); //$NON-NLS-1$
+	
+	/** IElementType for SysML Copy */
+	public static final IHintedType COPY = (IHintedType)getElementType("org.eclipse.papyrus.sysml.Copy"); //$NON-NLS-1$
+	
+	/** IElementType for SysML DeriveReqt */
+	public static final IHintedType DERIVE_REQT = (IHintedType)getElementType("org.eclipse.papyrus.sysml.DeriveReqt"); //$NON-NLS-1$
+	
+	/** IElementType for SysML Dimension */
+	public static final IHintedType DIMENSION = (IHintedType)getElementType("org.eclipse.papyrus.sysml.Dimension"); //$NON-NLS-1$
+	
+	/** IElementType for SysML FlowPort */
+	public static final IHintedType FLOW_PORT = (IHintedType)getElementType("org.eclipse.papyrus.sysml.FlowPort"); //$NON-NLS-1$
+	
+	/** IElementType for SysML FlowPort_InOut */
+	public static final IHintedType FLOW_PORT_IN_OUT = (IHintedType)getElementType("org.eclipse.papyrus.sysml.FlowPort_InOut"); //$NON-NLS-1$
+	
+	/** IElementType for SysML FlowPort_In */
+	public static final IHintedType FLOW_PORT_IN = (IHintedType)getElementType("org.eclipse.papyrus.sysml.FlowPort_In"); //$NON-NLS-1$
+	
+	/** IElementType for SysML FlowPort_Out */
+	public static final IHintedType FLOW_PORT_OUT = (IHintedType)getElementType("org.eclipse.papyrus.sysml.FlowPort_Out"); //$NON-NLS-1$
+	
+	/** IElementType for SysML FlowProperty */
+	public static final IHintedType FLOW_PROPERTY = (IHintedType)getElementType("org.eclipse.papyrus.sysml.FlowProperty"); //$NON-NLS-1$
+	
+	/** IElementType for SysML FlowSpecification */
+	public static final IHintedType FLOW_SPECIFICATION = (IHintedType)getElementType("org.eclipse.papyrus.sysml.FlowSpecification"); //$NON-NLS-1$
+	
+	/** IElementType for SysML ItemFlow */
+	public static final IHintedType ITEM_FLOW = (IHintedType)getElementType("org.eclipse.papyrus.sysml.ItemFlow"); //$NON-NLS-1$
+	
+	/** IElementType for SysML Problem */
+	public static final IHintedType PROBLEM = (IHintedType)getElementType("org.eclipse.papyrus.sysml.Problem"); //$NON-NLS-1$
+	
+	/** IElementType for SysML Rationale */
+	public static final IHintedType RATIONALE = (IHintedType)getElementType("org.eclipse.papyrus.sysml.Rationale"); //$NON-NLS-1$
+	
+	/** IElementType for SysML Requirement */
+	public static final IHintedType REQUIREMENT = (IHintedType)getElementType("org.eclipse.papyrus.sysml.Requirement"); //$NON-NLS-1$
+	
+	/** IElementType for SysML Unit */
+	public static final IHintedType UNIT = (IHintedType)getElementType("org.eclipse.papyrus.sysml.Unit"); //$NON-NLS-1$
+	
+	/** IElementType for SysML ValueType */
+	public static final IHintedType VALUE_TYPE = (IHintedType)getElementType("org.eclipse.papyrus.sysml.ValueType"); //$NON-NLS-1$
+	
+	/** IElementType for SysML ValueType_Enumeration */
+	public static final IHintedType VALUE_TYPE_ENUMERATION = (IHintedType)getElementType("org.eclipse.papyrus.sysml.ValueType_Enumeration"); //$NON-NLS-1$
+	
+	/** IElementType for SysML ValueType_PrimitiveType */
+	public static final IHintedType VALUE_TYPE_PRIMITIVE_TYPE = (IHintedType)getElementType("org.eclipse.papyrus.sysml.ValueType_PrimitiveType"); //$NON-NLS-1$
+	
+	/** IElementType for SysML Verify */
+	public static final IHintedType VERIFY = (IHintedType)getElementType("org.eclipse.papyrus.sysml.Verify"); //$NON-NLS-1$
+	
+	/** IElementType for SysML View */
+	public static final IHintedType VIEW = (IHintedType)getElementType("org.eclipse.papyrus.sysml.View"); //$NON-NLS-1$
+	
+	/** IElementType for SysML ViewPoint */
+	public static final IHintedType VIEW_POINT = (IHintedType)getElementType("org.eclipse.papyrus.sysml.ViewPoint"); //$NON-NLS-1$
+	
+	/** IElementType for SysML Satisfy */
+	public static final IHintedType SATISFY = (IHintedType)getElementType("org.eclipse.papyrus.sysml.Satisfy"); //$NON-NLS-1$
+	
+}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/element/SysMLElementTypes.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/element/SysMLElementTypes.java
deleted file mode 100644
index 594f1d2f0db..00000000000
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/element/SysMLElementTypes.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 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:
- * 
- * 		Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.service.types.element;
-
-import org.eclipse.gmf.runtime.emf.type.core.AbstractElementTypeEnumerator;
-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
-
-/** Convenient utility class listing IElementType declared in plugin.xml */
-public class SysMLElementTypes extends AbstractElementTypeEnumerator {
-
-	/** IHintedType of SysML Block */
-	public static final IHintedType BLOCK = (IHintedType)getElementType("org.eclipse.papyrus.sysml.Block"); //$NON-NLS-N$
-
-	/** IHintedType of SysML FlowPort */
-	public static final IHintedType FLOWPORT = (IHintedType)getElementType("org.eclipse.papyrus.sysml.FlowPort"); //$NON-NLS-N$
-
-	/** IHintedType of SysML FlowPort (direction = #INOUT - default) */
-	public static final IHintedType INOUT_FLOWPORT = (IHintedType)getElementType("org.eclipse.papyrus.sysml.InOutFlowPort"); //$NON-NLS-N$
-
-	/** IHintedType of SysML FlowPort (direction = #IN) */
-	public static final IHintedType IN_FLOWPORT = (IHintedType)getElementType("org.eclipse.papyrus.sysml.InFlowPort"); //$NON-NLS-N$
-
-	/** IHintedType of SysML FlowPort (direction = #OUT) */
-	public static final IHintedType OUT_FLOWPORT = (IHintedType)getElementType("org.eclipse.papyrus.sysml.OutFlowPort"); //$NON-NLS-N$
-
-	/** IHintedType of SysML FlowProperty */
-	public static final IHintedType FLOW_PROPERTY = (IHintedType)getElementType("org.eclipse.papyrus.sysml.FlowProperty"); //$NON-NLS-N$
-
-	/** IHintedType of SysML FlowSpecification */
-	public static final IHintedType FLOW_SPECIFICATION = (IHintedType)getElementType("org.eclipse.papyrus.sysml.FlowSpecification"); //$NON-NLS-N$
-
-	/** IHintedType of SysML Requirement */
-	public static final IHintedType REQUIREMENT = (IHintedType)getElementType("org.eclipse.papyrus.sysml.Requirement"); //$NON-NLS-N$
-}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/AllocateEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/AllocateEditHelperAdvice.java
new file mode 100644
index 00000000000..a350115103c
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/AllocateEditHelperAdvice.java
@@ -0,0 +1,58 @@
+/*****************************************************************************

+ * Copyright (c) 2010 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

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sysml.service.types.helper;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.papyrus.sysml.allocations.Allocate;

+import org.eclipse.papyrus.sysml.allocations.AllocationsPackage;

+import org.eclipse.papyrus.sysml.service.types.utils.NamedElementHelper;

+import org.eclipse.papyrus.sysml.util.SysmlResource;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Stereotype;

+

+/** SysML {@link Allocate} edit helper advice */

+public class AllocateEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {

+

+	/** Default constructor */

+	public AllocateEditHelperAdvice() {

+		requiredProfileIDs.add(SysmlResource.ALLOCATIONS_ID);

+	}

+

+	/** Complete creation process by applying the expected stereotype */

+	@Override

+	protected ICommand getAfterConfigureCommand(final ConfigureRequest request) {

+

+		return new ConfigureElementCommand(request) {

+

+			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

+				NamedElement element = (NamedElement)request.getElementToConfigure();

+				if(element != null) {

+					Stereotype stereotypeToApply = element.getApplicableStereotype(SysmlResource.ALLOCATE_ID);

+					if(stereotypeToApply != null) {

+						element.applyStereotype(stereotypeToApply);

+					}

+

+					// Set default name

+					// Initialize the element name based on the created IElementType

+					String initializedName = NamedElementHelper.EINSTANCE.getNewUMLElementName(element.getOwner(), AllocationsPackage.eINSTANCE.getAllocate());

+					element.setName(initializedName);

+				}

+				return CommandResult.newOKCommandResult();

+			}

+		};

+	}

+}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConformEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConformEditHelperAdvice.java
new file mode 100644
index 00000000000..bd1ed590118
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConformEditHelperAdvice.java
@@ -0,0 +1,58 @@
+/*****************************************************************************

+ * Copyright (c) 2010 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

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sysml.service.types.helper;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.papyrus.sysml.modelelements.Conform;

+import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;

+import org.eclipse.papyrus.sysml.service.types.utils.NamedElementHelper;

+import org.eclipse.papyrus.sysml.util.SysmlResource;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Stereotype;

+

+/** SysML {@link Conform} edit helper advice */

+public class ConformEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {

+

+	/** Default constructor */

+	public ConformEditHelperAdvice() {

+		requiredProfileIDs.add(SysmlResource.MODEL_ELEMENTS_ID);

+	}

+

+	/** Complete creation process by applying the expected stereotype */

+	@Override

+	protected ICommand getAfterConfigureCommand(final ConfigureRequest request) {

+

+		return new ConfigureElementCommand(request) {

+

+			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

+				NamedElement element = (NamedElement)request.getElementToConfigure();

+				if(element != null) {

+					Stereotype stereotypeToApply = element.getApplicableStereotype(SysmlResource.CONFORM_ID);

+					if(stereotypeToApply != null) {

+						element.applyStereotype(stereotypeToApply);

+					}

+

+					// Set default name

+					// Initialize the element name based on the created IElementType

+					String initializedName = NamedElementHelper.EINSTANCE.getNewUMLElementName(element.getOwner(), ModelelementsPackage.eINSTANCE.getConform());

+					element.setName(initializedName);

+				}

+				return CommandResult.newOKCommandResult();

+			}

+		};

+	}

+}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintBlockEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintBlockEditHelperAdvice.java
new file mode 100644
index 00000000000..f2e6ebbc2a1
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintBlockEditHelperAdvice.java
@@ -0,0 +1,58 @@
+/*****************************************************************************

+ * Copyright (c) 2010 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

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sysml.service.types.helper;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.papyrus.sysml.constraints.ConstraintBlock;

+import org.eclipse.papyrus.sysml.constraints.ConstraintsPackage;

+import org.eclipse.papyrus.sysml.service.types.utils.NamedElementHelper;

+import org.eclipse.papyrus.sysml.util.SysmlResource;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Stereotype;

+

+/** SysML {@link ConstraintBlock} edit helper advice */

+public class ConstraintBlockEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {

+

+	/** Default constructor */

+	public ConstraintBlockEditHelperAdvice() {

+		requiredProfileIDs.add(SysmlResource.CONSTRAINTS_ID);

+	}

+

+	/** Complete creation process by applying the expected stereotype */

+	@Override

+	protected ICommand getAfterConfigureCommand(final ConfigureRequest request) {

+

+		return new ConfigureElementCommand(request) {

+

+			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

+				NamedElement element = (NamedElement)request.getElementToConfigure();

+				if(element != null) {

+					Stereotype stereotypeToApply = element.getApplicableStereotype(SysmlResource.CONSTRAINT_BLOCK_ID);

+					if(stereotypeToApply != null) {

+						element.applyStereotype(stereotypeToApply);

+					}

+

+					// Set default name

+					// Initialize the element name based on the created IElementType

+					String initializedName = NamedElementHelper.EINSTANCE.getNewUMLElementName(element.getOwner(), ConstraintsPackage.eINSTANCE.getConstraintBlock());

+					element.setName(initializedName);

+				}

+				return CommandResult.newOKCommandResult();

+			}

+		};

+	}

+}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintPropertyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintPropertyEditHelperAdvice.java
new file mode 100644
index 00000000000..6287f1358cb
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintPropertyEditHelperAdvice.java
@@ -0,0 +1,58 @@
+/*****************************************************************************

+ * Copyright (c) 2010 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

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sysml.service.types.helper;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.papyrus.sysml.constraints.ConstraintProperty;

+import org.eclipse.papyrus.sysml.constraints.ConstraintsPackage;

+import org.eclipse.papyrus.sysml.service.types.utils.NamedElementHelper;

+import org.eclipse.papyrus.sysml.util.SysmlResource;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Stereotype;

+

+/** SysML {@link ConstraintProperty} edit helper advice */

+public class ConstraintPropertyEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {

+

+	/** Default constructor */

+	public ConstraintPropertyEditHelperAdvice() {

+		requiredProfileIDs.add(SysmlResource.CONSTRAINTS_ID);

+	}

+

+	/** Complete creation process by applying the expected stereotype */

+	@Override

+	protected ICommand getAfterConfigureCommand(final ConfigureRequest request) {

+

+		return new ConfigureElementCommand(request) {

+

+			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

+				NamedElement element = (NamedElement)request.getElementToConfigure();

+				if(element != null) {

+					Stereotype stereotypeToApply = element.getApplicableStereotype(SysmlResource.CONSTRAINT_PROPERTY_ID);

+					if(stereotypeToApply != null) {

+						element.applyStereotype(stereotypeToApply);

+					}

+

+					// Set default name

+					// Initialize the element name based on the created IElementType

+					String initializedName = NamedElementHelper.EINSTANCE.getNewUMLElementName(element.getOwner(), ConstraintsPackage.eINSTANCE.getConstraintProperty());

+					element.setName(initializedName);

+				}

+				return CommandResult.newOKCommandResult();

+			}

+		};

+	}

+}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/CopyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/CopyEditHelperAdvice.java
new file mode 100644
index 00000000000..49220426122
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/CopyEditHelperAdvice.java
@@ -0,0 +1,58 @@
+/*****************************************************************************

+ * Copyright (c) 2010 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

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sysml.service.types.helper;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.papyrus.sysml.requirements.Copy;

+import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;

+import org.eclipse.papyrus.sysml.service.types.utils.NamedElementHelper;

+import org.eclipse.papyrus.sysml.util.SysmlResource;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Stereotype;

+

+/** SysML {@link Copy} edit helper advice */

+public class CopyEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {

+

+	/** Default constructor */

+	public CopyEditHelperAdvice() {

+		requiredProfileIDs.add(SysmlResource.REQUIREMENTS_ID);

+	}

+

+	/** Complete creation process by applying the expected stereotype */

+	@Override

+	protected ICommand getAfterConfigureCommand(final ConfigureRequest request) {

+

+		return new ConfigureElementCommand(request) {

+

+			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

+				NamedElement element = (NamedElement)request.getElementToConfigure();

+				if(element != null) {

+					Stereotype stereotypeToApply = element.getApplicableStereotype(SysmlResource.COPY_ID);

+					if(stereotypeToApply != null) {

+						element.applyStereotype(stereotypeToApply);

+					}

+

+					// Set default name

+					// Initialize the element name based on the created IElementType

+					String initializedName = NamedElementHelper.EINSTANCE.getNewUMLElementName(element.getOwner(), RequirementsPackage.eINSTANCE.getCopy());

+					element.setName(initializedName);

+				}

+				return CommandResult.newOKCommandResult();

+			}

+		};

+	}

+}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/DeriveReqtEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/DeriveReqtEditHelperAdvice.java
new file mode 100644
index 00000000000..7261e1957a4
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/DeriveReqtEditHelperAdvice.java
@@ -0,0 +1,60 @@
+/*****************************************************************************

+ * Copyright (c) 2010 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:

+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sysml.service.types.helper;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;

+import org.eclipse.papyrus.sysml.service.types.utils.NamedElementHelper;

+import org.eclipse.papyrus.sysml.util.SysmlResource;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Stereotype;

+

+/** SysML DeriveReqt edit helper advice */

+public class DeriveReqtEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {

+

+	/** Default constructor */

+	public DeriveReqtEditHelperAdvice() {

+		requiredProfileIDs.add(SysmlResource.REQUIREMENTS_ID);

+	}

+

+	/** Complete creation process by applying the expected stereotype */

+	@Override

+	protected ICommand getAfterConfigureCommand(final ConfigureRequest request) {

+

+		return new ConfigureElementCommand(request) {

+

+			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

+				NamedElement element = (NamedElement)request.getElementToConfigure();

+				if(element != null) {

+					Stereotype stereotypeToApply = element.getApplicableStereotype(SysmlResource.DERIVE_REQT_ID);

+					if(stereotypeToApply != null) {

+						element.applyStereotype(stereotypeToApply);

+					}

+

+					// Set default name

+					// Initialize the element name based on the created IElementType

+					String initializedName = NamedElementHelper.EINSTANCE.getNewUMLElementName(element.getOwner(), RequirementsPackage.eINSTANCE.getDeriveReqt());

+					element.setName(initializedName);

+				}

+				return CommandResult.newOKCommandResult();

+			}

+		};

+	}

+}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/DimensionEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/DimensionEditHelperAdvice.java
new file mode 100644
index 00000000000..ed43d853c6a
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/DimensionEditHelperAdvice.java
@@ -0,0 +1,58 @@
+/*****************************************************************************

+ * Copyright (c) 2010 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

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sysml.service.types.helper;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.papyrus.sysml.blocks.BlocksPackage;

+import org.eclipse.papyrus.sysml.blocks.Dimension;

+import org.eclipse.papyrus.sysml.service.types.utils.NamedElementHelper;

+import org.eclipse.papyrus.sysml.util.SysmlResource;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Stereotype;

+

+/** SysML {@link Dimension} edit helper advice */

+public class DimensionEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {

+

+	/** Default constructor */

+	public DimensionEditHelperAdvice() {

+		requiredProfileIDs.add(SysmlResource.BLOCKS_ID);

+	}

+

+	/** Complete creation process by applying the expected stereotype */

+	@Override

+	protected ICommand getAfterConfigureCommand(final ConfigureRequest request) {

+

+		return new ConfigureElementCommand(request) {

+

+			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

+				NamedElement element = (NamedElement)request.getElementToConfigure();

+				if(element != null) {

+					Stereotype stereotypeToApply = element.getApplicableStereotype(SysmlResource.DIMENSION_ID);

+					if(stereotypeToApply != null) {

+						element.applyStereotype(stereotypeToApply);

+					}

+

+					// Set default name

+					// Initialize the element name based on the created IElementType

+					String initializedName = NamedElementHelper.EINSTANCE.getNewUMLElementName(element.getOwner(), BlocksPackage.eINSTANCE.getDimension());

+					element.setName(initializedName);

+				}

+				return CommandResult.newOKCommandResult();

+			}

+		};

+	}

+}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/InFlowPortEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortInEditHelperAdvice.java
index 092985e31f9..239dbcaf865 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/InFlowPortEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortInEditHelperAdvice.java
@@ -27,10 +27,10 @@ import org.eclipse.papyrus.sysml.util.SysmlResource;
 import org.eclipse.uml2.uml.Port;

 

 /** SysML FlowPort#In edit helper advice */

-public class InFlowPortEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {

+public class FlowPortInEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {

 

 	/** Default constructor */

-	public InFlowPortEditHelperAdvice() {

+	public FlowPortInEditHelperAdvice() {

 		requiredProfileIDs.add(SysmlResource.PORT_AND_FLOWS_ID);

 	}

 

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/InOutFlowPortEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortInOutEditHelperAdvice.java
index ac28c540e45..3b0152c6c70 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/InOutFlowPortEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortInOutEditHelperAdvice.java
@@ -27,10 +27,10 @@ import org.eclipse.papyrus.sysml.util.SysmlResource;
 import org.eclipse.uml2.uml.Port;

 

 /** SysML FlowPort#InOut edit helper advice */

-public class InOutFlowPortEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {

+public class FlowPortInOutEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {

 

 	/** Default constructor */

-	public InOutFlowPortEditHelperAdvice() {

+	public FlowPortInOutEditHelperAdvice() {

 		requiredProfileIDs.add(SysmlResource.PORT_AND_FLOWS_ID);

 	}

 

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/OutFlowPortEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortOutEditHelperAdvice.java
index 7fae3d0f236..a6656aafc8a 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/OutFlowPortEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortOutEditHelperAdvice.java
@@ -27,10 +27,10 @@ import org.eclipse.papyrus.sysml.util.SysmlResource;
 import org.eclipse.uml2.uml.Port;

 

 /** SysML FlowPort#Out edit helper advice */

-public class OutFlowPortEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {

+public class FlowPortOutEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {

 

 	/** Default constructor */

-	public OutFlowPortEditHelperAdvice() {

+	public FlowPortOutEditHelperAdvice() {

 		requiredProfileIDs.add(SysmlResource.PORT_AND_FLOWS_ID);

 	}

 

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ItemFlowEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ItemFlowEditHelperAdvice.java
new file mode 100644
index 00000000000..43e923d82ac
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ItemFlowEditHelperAdvice.java
@@ -0,0 +1,58 @@
+/*****************************************************************************

+ * Copyright (c) 2010 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

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sysml.service.types.helper;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.papyrus.sysml.portandflows.ItemFlow;

+import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;

+import org.eclipse.papyrus.sysml.service.types.utils.NamedElementHelper;

+import org.eclipse.papyrus.sysml.util.SysmlResource;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Stereotype;

+

+/** SysML {@link ItemFlow} edit helper advice */

+public class ItemFlowEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {

+

+	/** Default constructor */

+	public ItemFlowEditHelperAdvice() {

+		requiredProfileIDs.add(SysmlResource.PORT_AND_FLOWS_ID);

+	}

+

+	/** Complete creation process by applying the expected stereotype */

+	@Override

+	protected ICommand getAfterConfigureCommand(final ConfigureRequest request) {

+

+		return new ConfigureElementCommand(request) {

+

+			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

+				NamedElement element = (NamedElement)request.getElementToConfigure();

+				if(element != null) {

+					Stereotype stereotypeToApply = element.getApplicableStereotype(SysmlResource.ITEM_FLOW_ID);

+					if(stereotypeToApply != null) {

+						element.applyStereotype(stereotypeToApply);

+					}

+

+					// Set default name

+					// Initialize the element name based on the created IElementType

+					String initializedName = NamedElementHelper.EINSTANCE.getNewUMLElementName(element.getOwner(), PortandflowsPackage.eINSTANCE.getItemFlow());

+					element.setName(initializedName);

+				}

+				return CommandResult.newOKCommandResult();

+			}

+		};

+	}

+}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ProblemEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ProblemEditHelperAdvice.java
new file mode 100644
index 00000000000..c3fd0405a2d
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ProblemEditHelperAdvice.java
@@ -0,0 +1,51 @@
+/*****************************************************************************

+ * Copyright (c) 2010 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

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sysml.service.types.helper;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.papyrus.sysml.modelelements.Problem;

+import org.eclipse.papyrus.sysml.util.SysmlResource;

+import org.eclipse.uml2.uml.Element;

+import org.eclipse.uml2.uml.Stereotype;

+

+/** SysML {@link Problem} edit helper advice */

+public class ProblemEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {

+

+	/** Default constructor */

+	public ProblemEditHelperAdvice() {

+		requiredProfileIDs.add(SysmlResource.MODEL_ELEMENTS_ID);

+	}

+

+	/** Complete creation process by applying the expected stereotype */

+	@Override

+	protected ICommand getAfterConfigureCommand(final ConfigureRequest request) {

+

+		return new ConfigureElementCommand(request) {

+

+			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

+				Element element = (Element)request.getElementToConfigure();

+				if(element != null) {

+					Stereotype stereotypeToApply = element.getApplicableStereotype(SysmlResource.PROBLEM_ID);

+					if(stereotypeToApply != null) {

+						element.applyStereotype(stereotypeToApply);

+					}

+				}

+				return CommandResult.newOKCommandResult();

+			}

+		};

+	}

+}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/RationaleEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/RationaleEditHelperAdvice.java
new file mode 100644
index 00000000000..92ef6f2b0c3
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/RationaleEditHelperAdvice.java
@@ -0,0 +1,51 @@
+/*****************************************************************************

+ * Copyright (c) 2010 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

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sysml.service.types.helper;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.papyrus.sysml.modelelements.Rationale;

+import org.eclipse.papyrus.sysml.util.SysmlResource;

+import org.eclipse.uml2.uml.Element;

+import org.eclipse.uml2.uml.Stereotype;

+

+/** SysML {@link Rationale} edit helper advice */

+public class RationaleEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {

+

+	/** Default constructor */

+	public RationaleEditHelperAdvice() {

+		requiredProfileIDs.add(SysmlResource.MODEL_ELEMENTS_ID);

+	}

+

+	/** Complete creation process by applying the expected stereotype */

+	@Override

+	protected ICommand getAfterConfigureCommand(final ConfigureRequest request) {

+

+		return new ConfigureElementCommand(request) {

+

+			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

+				Element element = (Element)request.getElementToConfigure();

+				if(element != null) {

+					Stereotype stereotypeToApply = element.getApplicableStereotype(SysmlResource.RATIONALE_ID);

+					if(stereotypeToApply != null) {

+						element.applyStereotype(stereotypeToApply);

+					}

+				}

+				return CommandResult.newOKCommandResult();

+			}

+		};

+	}

+}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/SatisfyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/SatisfyEditHelperAdvice.java
new file mode 100644
index 00000000000..0dc3dc59fd1
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/SatisfyEditHelperAdvice.java
@@ -0,0 +1,61 @@
+/*****************************************************************************

+ * Copyright (c) 2010 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:

+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sysml.service.types.helper;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;

+import org.eclipse.papyrus.sysml.requirements.Satisfy;

+import org.eclipse.papyrus.sysml.service.types.utils.NamedElementHelper;

+import org.eclipse.papyrus.sysml.util.SysmlResource;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Stereotype;

+

+/** SysML {@link Satisfy} edit helper advice */

+public class SatisfyEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {

+

+	/** Default constructor */

+	public SatisfyEditHelperAdvice() {

+		requiredProfileIDs.add(SysmlResource.REQUIREMENTS_ID);

+	}

+

+	/** Complete creation process by applying the expected stereotype */

+	@Override

+	protected ICommand getAfterConfigureCommand(final ConfigureRequest request) {

+

+		return new ConfigureElementCommand(request) {

+

+			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

+				NamedElement element = (NamedElement)request.getElementToConfigure();

+				if(element != null) {

+					Stereotype stereotypeToApply = element.getApplicableStereotype(SysmlResource.SATISFY_ID);

+					if(stereotypeToApply != null) {

+						element.applyStereotype(stereotypeToApply);

+					}

+

+					// Set default name

+					// Initialize the element name based on the created IElementType

+					String initializedName = NamedElementHelper.EINSTANCE.getNewUMLElementName(element.getOwner(), RequirementsPackage.eINSTANCE.getSatisfy());

+					element.setName(initializedName);

+				}

+				return CommandResult.newOKCommandResult();

+			}

+		};

+	}

+}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/UnitEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/UnitEditHelperAdvice.java
new file mode 100644
index 00000000000..8e622738efd
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/UnitEditHelperAdvice.java
@@ -0,0 +1,58 @@
+/*****************************************************************************

+ * Copyright (c) 2010 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

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sysml.service.types.helper;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.papyrus.sysml.blocks.BlocksPackage;

+import org.eclipse.papyrus.sysml.blocks.Unit;

+import org.eclipse.papyrus.sysml.service.types.utils.NamedElementHelper;

+import org.eclipse.papyrus.sysml.util.SysmlResource;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Stereotype;

+

+/** SysML {@link Unit} edit helper advice */

+public class UnitEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {

+

+	/** Default constructor */

+	public UnitEditHelperAdvice() {

+		requiredProfileIDs.add(SysmlResource.BLOCKS_ID);

+	}

+

+	/** Complete creation process by applying the expected stereotype */

+	@Override

+	protected ICommand getAfterConfigureCommand(final ConfigureRequest request) {

+

+		return new ConfigureElementCommand(request) {

+

+			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

+				NamedElement element = (NamedElement)request.getElementToConfigure();

+				if(element != null) {

+					Stereotype stereotypeToApply = element.getApplicableStereotype(SysmlResource.UNIT_ID);

+					if(stereotypeToApply != null) {

+						element.applyStereotype(stereotypeToApply);

+					}

+

+					// Set default name

+					// Initialize the element name based on the created IElementType

+					String initializedName = NamedElementHelper.EINSTANCE.getNewUMLElementName(element.getOwner(), BlocksPackage.eINSTANCE.getUnit());

+					element.setName(initializedName);

+				}

+				return CommandResult.newOKCommandResult();

+			}

+		};

+	}

+}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ValueTypeEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ValueTypeEditHelperAdvice.java
new file mode 100644
index 00000000000..d1dbce2423a
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ValueTypeEditHelperAdvice.java
@@ -0,0 +1,58 @@
+/*****************************************************************************

+ * Copyright (c) 2010 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

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sysml.service.types.helper;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.papyrus.sysml.blocks.BlocksPackage;

+import org.eclipse.papyrus.sysml.blocks.ValueType;

+import org.eclipse.papyrus.sysml.service.types.utils.NamedElementHelper;

+import org.eclipse.papyrus.sysml.util.SysmlResource;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Stereotype;

+

+/** SysML {@link ValueType} edit helper advice */

+public class ValueTypeEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {

+

+	/** Default constructor */

+	public ValueTypeEditHelperAdvice() {

+		requiredProfileIDs.add(SysmlResource.BLOCKS_ID);

+	}

+

+	/** Complete creation process by applying the expected stereotype */

+	@Override

+	protected ICommand getAfterConfigureCommand(final ConfigureRequest request) {

+

+		return new ConfigureElementCommand(request) {

+

+			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

+				NamedElement element = (NamedElement)request.getElementToConfigure();

+				if(element != null) {

+					Stereotype stereotypeToApply = element.getApplicableStereotype(SysmlResource.VALUE_TYPE_ID);

+					if(stereotypeToApply != null) {

+						element.applyStereotype(stereotypeToApply);

+					}

+

+					// Set default name

+					// Initialize the element name based on the created IElementType

+					String initializedName = NamedElementHelper.EINSTANCE.getNewUMLElementName(element.getOwner(), BlocksPackage.eINSTANCE.getValueType());

+					element.setName(initializedName);

+				}

+				return CommandResult.newOKCommandResult();

+			}

+		};

+	}

+}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/VerifyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/VerifyEditHelperAdvice.java
new file mode 100644
index 00000000000..0c1995ca666
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/VerifyEditHelperAdvice.java
@@ -0,0 +1,61 @@
+/*****************************************************************************

+ * Copyright (c) 2010 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:

+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sysml.service.types.helper;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;

+import org.eclipse.papyrus.sysml.requirements.Verify;

+import org.eclipse.papyrus.sysml.service.types.utils.NamedElementHelper;

+import org.eclipse.papyrus.sysml.util.SysmlResource;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Stereotype;

+

+/** SysML {@link Verify} edit helper advice */

+public class VerifyEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {

+

+	/** Default constructor */

+	public VerifyEditHelperAdvice() {

+		requiredProfileIDs.add(SysmlResource.REQUIREMENTS_ID);

+	}

+

+	/** Complete creation process by applying the expected stereotype */

+	@Override

+	protected ICommand getAfterConfigureCommand(final ConfigureRequest request) {

+

+		return new ConfigureElementCommand(request) {

+

+			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

+				NamedElement element = (NamedElement)request.getElementToConfigure();

+				if(element != null) {

+					Stereotype stereotypeToApply = element.getApplicableStereotype(SysmlResource.VERIFY_ID);

+					if(stereotypeToApply != null) {

+						element.applyStereotype(stereotypeToApply);

+					}

+

+					// Set default name

+					// Initialize the element name based on the created IElementType

+					String initializedName = NamedElementHelper.EINSTANCE.getNewUMLElementName(element.getOwner(), RequirementsPackage.eINSTANCE.getVerify());

+					element.setName(initializedName);

+				}

+				return CommandResult.newOKCommandResult();

+			}

+		};

+	}

+}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ViewEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ViewEditHelperAdvice.java
new file mode 100644
index 00000000000..08d94ef649f
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ViewEditHelperAdvice.java
@@ -0,0 +1,58 @@
+/*****************************************************************************

+ * Copyright (c) 2010 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

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sysml.service.types.helper;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;

+import org.eclipse.papyrus.sysml.modelelements.View;

+import org.eclipse.papyrus.sysml.service.types.utils.NamedElementHelper;

+import org.eclipse.papyrus.sysml.util.SysmlResource;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Stereotype;

+

+/** SysML {@link View} edit helper advice */

+public class ViewEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {

+

+	/** Default constructor */

+	public ViewEditHelperAdvice() {

+		requiredProfileIDs.add(SysmlResource.MODEL_ELEMENTS_ID);

+	}

+

+	/** Complete creation process by applying the expected stereotype */

+	@Override

+	protected ICommand getAfterConfigureCommand(final ConfigureRequest request) {

+

+		return new ConfigureElementCommand(request) {

+

+			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

+				NamedElement element = (NamedElement)request.getElementToConfigure();

+				if(element != null) {

+					Stereotype stereotypeToApply = element.getApplicableStereotype(SysmlResource.VIEW_ID);

+					if(stereotypeToApply != null) {

+						element.applyStereotype(stereotypeToApply);

+					}

+

+					// Set default name

+					// Initialize the element name based on the created IElementType

+					String initializedName = NamedElementHelper.EINSTANCE.getNewUMLElementName(element.getOwner(), ModelelementsPackage.eINSTANCE.getView());

+					element.setName(initializedName);

+				}

+				return CommandResult.newOKCommandResult();

+			}

+		};

+	}

+}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ViewPointEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ViewPointEditHelperAdvice.java
new file mode 100644
index 00000000000..88396c3cac2
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ViewPointEditHelperAdvice.java
@@ -0,0 +1,58 @@
+/*****************************************************************************

+ * Copyright (c) 2010 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

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sysml.service.types.helper;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;

+import org.eclipse.papyrus.sysml.modelelements.ViewPoint;

+import org.eclipse.papyrus.sysml.service.types.utils.NamedElementHelper;

+import org.eclipse.papyrus.sysml.util.SysmlResource;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Stereotype;

+

+/** SysML {@link ViewPoint} edit helper advice */

+public class ViewPointEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {

+

+	/** Default constructor */

+	public ViewPointEditHelperAdvice() {

+		requiredProfileIDs.add(SysmlResource.MODEL_ELEMENTS_ID);

+	}

+

+	/** Complete creation process by applying the expected stereotype */

+	@Override

+	protected ICommand getAfterConfigureCommand(final ConfigureRequest request) {

+

+		return new ConfigureElementCommand(request) {

+

+			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

+				NamedElement element = (NamedElement)request.getElementToConfigure();

+				if(element != null) {

+					Stereotype stereotypeToApply = element.getApplicableStereotype(SysmlResource.VIEWPOINT_ID);

+					if(stereotypeToApply != null) {

+						element.applyStereotype(stereotypeToApply);

+					}

+

+					// Set default name

+					// Initialize the element name based on the created IElementType

+					String initializedName = NamedElementHelper.EINSTANCE.getNewUMLElementName(element.getOwner(), ModelelementsPackage.eINSTANCE.getViewPoint());

+					element.setName(initializedName);

+				}

+				return CommandResult.newOKCommandResult();

+			}

+		};

+	}

+}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/AllocateMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/AllocateMatcher.java
new file mode 100644
index 00000000000..aba216cf98c
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/AllocateMatcher.java
@@ -0,0 +1,36 @@
+/*****************************************************************************

+ * Copyright (c) 2010 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

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sysml.service.types.matcher;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

+import org.eclipse.papyrus.sysml.allocations.Allocate;

+import org.eclipse.papyrus.sysml.service.types.utils.ElementUtil;

+import org.eclipse.uml2.uml.Abstraction;

+

+/**

+ * Test if current Abstraction is a Allocate

+ */

+public class AllocateMatcher implements IElementMatcher {

+

+	public boolean matches(EObject eObject) {

+

+		boolean isMatch = false;

+		if(eObject instanceof Abstraction) {

+

+			Abstraction element = (Abstraction)eObject;

+			if(ElementUtil.getStereotypeApplication(element, Allocate.class) != null) {

+				isMatch = true;

+			}

+		}

+		return isMatch;

+	}

+

+}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ConformMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ConformMatcher.java
new file mode 100644
index 00000000000..6097fcb5021
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ConformMatcher.java
@@ -0,0 +1,36 @@
+/*****************************************************************************

+ * Copyright (c) 2010 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

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sysml.service.types.matcher;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

+import org.eclipse.papyrus.sysml.modelelements.Conform;

+import org.eclipse.papyrus.sysml.service.types.utils.ElementUtil;

+import org.eclipse.uml2.uml.Dependency;

+

+/**

+ * Test if current Dependency is a Conform

+ */

+public class ConformMatcher implements IElementMatcher {

+

+	public boolean matches(EObject eObject) {

+

+		boolean isMatch = false;

+		if(eObject instanceof Dependency) {

+

+			Dependency element = (Dependency)eObject;

+			if(ElementUtil.getStereotypeApplication(element, Conform.class) != null) {

+				isMatch = true;

+			}

+		}

+		return isMatch;

+	}

+

+}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ConstraintBlockMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ConstraintBlockMatcher.java
new file mode 100644
index 00000000000..34df482e8e0
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ConstraintBlockMatcher.java
@@ -0,0 +1,35 @@
+/*****************************************************************************

+ * Copyright (c) 2010 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

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sysml.service.types.matcher;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

+import org.eclipse.papyrus.sysml.constraints.ConstraintBlock;

+import org.eclipse.papyrus.sysml.service.types.utils.ElementUtil;

+

+/**

+ * Test if current Class is a ConstraintBlock

+ */

+public class ConstraintBlockMatcher implements IElementMatcher {

+

+	public boolean matches(EObject eObject) {

+

+		boolean isMatch = false;

+		if(eObject instanceof org.eclipse.uml2.uml.Class) {

+

+			org.eclipse.uml2.uml.Class element = (org.eclipse.uml2.uml.Class)eObject;

+			if(ElementUtil.getStereotypeApplication(element, ConstraintBlock.class) != null) {

+				isMatch = true;

+			}

+		}

+		return isMatch;

+	}

+

+}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ConstraintPropertyMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ConstraintPropertyMatcher.java
new file mode 100644
index 00000000000..60d2e47f556
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ConstraintPropertyMatcher.java
@@ -0,0 +1,36 @@
+/*****************************************************************************

+ * Copyright (c) 2010 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

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sysml.service.types.matcher;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

+import org.eclipse.papyrus.sysml.constraints.ConstraintProperty;

+import org.eclipse.papyrus.sysml.service.types.utils.ElementUtil;

+import org.eclipse.uml2.uml.Property;

+

+/**

+ * Test if current Property is a ConstraintProperty

+ */

+public class ConstraintPropertyMatcher implements IElementMatcher {

+

+	public boolean matches(EObject eObject) {

+

+		boolean isMatch = false;

+		if(eObject instanceof Property) {

+

+			Property element = (Property) eObject;

+			if(ElementUtil.getStereotypeApplication(element, ConstraintProperty.class) != null) {

+				isMatch = true;

+			}

+		}

+		return isMatch;

+	}

+

+}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/CopyMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/CopyMatcher.java
new file mode 100644
index 00000000000..c17b87a18f4
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/CopyMatcher.java
@@ -0,0 +1,36 @@
+/*****************************************************************************

+ * Copyright (c) 2010 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

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sysml.service.types.matcher;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

+import org.eclipse.papyrus.sysml.requirements.Copy;

+import org.eclipse.papyrus.sysml.service.types.utils.ElementUtil;

+import org.eclipse.uml2.uml.Abstraction;

+

+/**

+ * Test if current Abstraction is a Copy

+ */

+public class CopyMatcher implements IElementMatcher {

+

+	public boolean matches(EObject eObject) {

+

+		boolean isMatch = false;

+		if(eObject instanceof Abstraction) {

+

+			Abstraction element = (Abstraction)eObject;

+			if(ElementUtil.getStereotypeApplication(element, Copy.class) != null) {

+				isMatch = true;

+			}

+		}

+		return isMatch;

+	}

+

+}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/DeriveReqtMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/DeriveReqtMatcher.java
new file mode 100644
index 00000000000..65d9584014f
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/DeriveReqtMatcher.java
@@ -0,0 +1,36 @@
+/*****************************************************************************

+ * Copyright (c) 2010 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

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sysml.service.types.matcher;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

+import org.eclipse.papyrus.sysml.requirements.DeriveReqt;

+import org.eclipse.papyrus.sysml.service.types.utils.ElementUtil;

+import org.eclipse.uml2.uml.Abstraction;

+

+/**

+ * Test if current {@link Abstraction} is a {@link DeriveReqt}

+ */

+public class DeriveReqtMatcher implements IElementMatcher {

+

+	public boolean matches(EObject eObject) {

+

+		boolean isMatch = false;

+		if(eObject instanceof Abstraction) {

+

+			Abstraction element = (Abstraction)eObject;

+			if(ElementUtil.getStereotypeApplication(element, DeriveReqt.class) != null) {

+				isMatch = true;

+			}

+		}

+		return isMatch;

+	}

+

+}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/DimensionMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/DimensionMatcher.java
new file mode 100644
index 00000000000..4e5ae210882
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/DimensionMatcher.java
@@ -0,0 +1,36 @@
+/*****************************************************************************

+ * Copyright (c) 2010 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

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sysml.service.types.matcher;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

+import org.eclipse.papyrus.sysml.blocks.Dimension;

+import org.eclipse.papyrus.sysml.service.types.utils.ElementUtil;

+import org.eclipse.uml2.uml.InstanceSpecification;

+

+/**

+ * Test if current {@link InstanceSpecification} is a {@link Dimension}

+ */

+public class DimensionMatcher implements IElementMatcher {

+

+	public boolean matches(EObject eObject) {

+

+		boolean isMatch = false;

+		if(eObject instanceof InstanceSpecification) {

+

+			InstanceSpecification element = (InstanceSpecification)eObject;

+			if(ElementUtil.getStereotypeApplication(element, Dimension.class) != null) {

+				isMatch = true;

+			}

+		}

+		return isMatch;

+	}

+

+}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ItemFlowMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ItemFlowMatcher.java
new file mode 100644
index 00000000000..376556b70c0
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ItemFlowMatcher.java
@@ -0,0 +1,35 @@
+/*****************************************************************************

+ * Copyright (c) 2010 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

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sysml.service.types.matcher;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;import org.eclipse.papyrus.sysml.portandflows.ItemFlow;

+import org.eclipse.papyrus.sysml.service.types.utils.ElementUtil;

+import org.eclipse.uml2.uml.InformationFlow;

+

+/**

+ * Test if current {@link InformationFlow} is a {@link ItemFlow}

+ */

+public class ItemFlowMatcher implements IElementMatcher {

+

+	public boolean matches(EObject eObject) {

+

+		boolean isMatch = false;

+		if(eObject instanceof InformationFlow) {

+

+			InformationFlow element = (InformationFlow)eObject;

+			if(ElementUtil.getStereotypeApplication(element, ItemFlow.class) != null) {

+				isMatch = true;

+			}

+		}

+		return isMatch;

+	}

+

+}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ProblemMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ProblemMatcher.java
new file mode 100644
index 00000000000..2f6e88f3b2d
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ProblemMatcher.java
@@ -0,0 +1,36 @@
+/*****************************************************************************

+ * Copyright (c) 2010 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

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sysml.service.types.matcher;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

+import org.eclipse.papyrus.sysml.modelelements.Problem;

+import org.eclipse.papyrus.sysml.service.types.utils.ElementUtil;

+import org.eclipse.uml2.uml.Comment;

+

+/**

+ * Test if current {@link Comment} is a {@link Problem}

+ */

+public class ProblemMatcher implements IElementMatcher {

+

+	public boolean matches(EObject eObject) {

+

+		boolean isMatch = false;

+		if(eObject instanceof Comment) {

+

+			Comment element = (Comment)eObject;

+			if(ElementUtil.getStereotypeApplication(element, Problem.class) != null) {

+				isMatch = true;

+			}

+		}

+		return isMatch;

+	}

+

+}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/RationaleMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/RationaleMatcher.java
new file mode 100644
index 00000000000..095368b752e
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/RationaleMatcher.java
@@ -0,0 +1,36 @@
+/*****************************************************************************

+ * Copyright (c) 2010 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

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sysml.service.types.matcher;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

+import org.eclipse.papyrus.sysml.modelelements.Rationale;

+import org.eclipse.papyrus.sysml.service.types.utils.ElementUtil;

+import org.eclipse.uml2.uml.Comment;

+

+/**

+ * Test if current {@link Comment} is a {@link Rationale}

+ */

+public class RationaleMatcher implements IElementMatcher {

+

+	public boolean matches(EObject eObject) {

+

+		boolean isMatch = false;

+		if(eObject instanceof Comment) {

+

+			Comment element = (Comment)eObject;

+			if(ElementUtil.getStereotypeApplication(element, Rationale.class) != null) {

+				isMatch = true;

+			}

+		}

+		return isMatch;

+	}

+

+}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/SatisfyMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/SatisfyMatcher.java
new file mode 100644
index 00000000000..53e5880f0a1
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/SatisfyMatcher.java
@@ -0,0 +1,36 @@
+/*****************************************************************************

+ * Copyright (c) 2010 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

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sysml.service.types.matcher;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

+import org.eclipse.papyrus.sysml.requirements.Satisfy;

+import org.eclipse.papyrus.sysml.service.types.utils.ElementUtil;

+import org.eclipse.uml2.uml.Abstraction;

+

+/**

+ * Test if current Abstraction is a {@link Satisfy}

+ */

+public class SatisfyMatcher implements IElementMatcher {

+

+	public boolean matches(EObject eObject) {

+

+		boolean isMatch = false;

+		if(eObject instanceof Abstraction) {

+

+			Abstraction element = (Abstraction)eObject;

+			if(ElementUtil.getStereotypeApplication(element, Satisfy.class) != null) {

+				isMatch = true;

+			}

+		}

+		return isMatch;

+	}

+

+}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/UnitMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/UnitMatcher.java
new file mode 100644
index 00000000000..062874c46ec
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/UnitMatcher.java
@@ -0,0 +1,36 @@
+/*****************************************************************************

+ * Copyright (c) 2010 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

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sysml.service.types.matcher;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

+import org.eclipse.papyrus.sysml.blocks.Unit;

+import org.eclipse.papyrus.sysml.service.types.utils.ElementUtil;

+import org.eclipse.uml2.uml.InstanceSpecification;

+

+/**

+ * Test if current {@link InstanceSpecification} is a {@link Unit}

+ */

+public class UnitMatcher implements IElementMatcher {

+

+	public boolean matches(EObject eObject) {

+

+		boolean isMatch = false;

+		if(eObject instanceof InstanceSpecification) {

+

+			InstanceSpecification element = (InstanceSpecification)eObject;

+			if(ElementUtil.getStereotypeApplication(element, Unit.class) != null) {

+				isMatch = true;

+			}

+		}

+		return isMatch;

+	}

+

+}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ValueTypeEnumerationMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ValueTypeEnumerationMatcher.java
new file mode 100644
index 00000000000..5dde72b5bdb
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ValueTypeEnumerationMatcher.java
@@ -0,0 +1,36 @@
+/*****************************************************************************

+ * Copyright (c) 2010 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

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sysml.service.types.matcher;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

+import org.eclipse.papyrus.sysml.blocks.ValueType;

+import org.eclipse.papyrus.sysml.service.types.utils.ElementUtil;

+import org.eclipse.uml2.uml.Enumeration;

+

+/**

+ * Test if current {@link Enumeration} is a {@link ValueType}

+ */

+public class ValueTypeEnumerationMatcher implements IElementMatcher {

+

+	public boolean matches(EObject eObject) {

+

+		boolean isMatch = false;

+		if(eObject instanceof Enumeration) {

+

+			Enumeration element = (Enumeration)eObject;

+			if(ElementUtil.getStereotypeApplication(element, ValueType.class) != null) {

+				isMatch = true;

+			}

+		}

+		return isMatch;

+	}

+

+}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ValueTypeMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ValueTypeMatcher.java
new file mode 100644
index 00000000000..76516a3dba4
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ValueTypeMatcher.java
@@ -0,0 +1,36 @@
+/*****************************************************************************

+ * Copyright (c) 2010 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

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sysml.service.types.matcher;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

+import org.eclipse.papyrus.sysml.blocks.ValueType;

+import org.eclipse.papyrus.sysml.service.types.utils.ElementUtil;

+import org.eclipse.uml2.uml.DataType;

+

+/**

+ * Test if current {@link DataType} is a {@link ValueType}

+ */

+public class ValueTypeMatcher implements IElementMatcher {

+

+	public boolean matches(EObject eObject) {

+

+		boolean isMatch = false;

+		if(eObject instanceof DataType) {

+

+			DataType element = (DataType)eObject;

+			if(ElementUtil.getStereotypeApplication(element, ValueType.class) != null) {

+				isMatch = true;

+			}

+		}

+		return isMatch;

+	}

+

+}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ValueTypePrimitiveTypeMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ValueTypePrimitiveTypeMatcher.java
new file mode 100644
index 00000000000..9a875dfed99
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ValueTypePrimitiveTypeMatcher.java
@@ -0,0 +1,36 @@
+/*****************************************************************************

+ * Copyright (c) 2010 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

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sysml.service.types.matcher;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

+import org.eclipse.papyrus.sysml.blocks.ValueType;

+import org.eclipse.papyrus.sysml.service.types.utils.ElementUtil;

+import org.eclipse.uml2.uml.PrimitiveType;

+

+/**

+ * Test if current {@link PrimitiveType} is a {@link ValueType}

+ */

+public class ValueTypePrimitiveTypeMatcher implements IElementMatcher {

+

+	public boolean matches(EObject eObject) {

+

+		boolean isMatch = false;

+		if(eObject instanceof PrimitiveType) {

+

+			PrimitiveType element = (PrimitiveType)eObject;

+			if(ElementUtil.getStereotypeApplication(element, ValueType.class) != null) {

+				isMatch = true;

+			}

+		}

+		return isMatch;

+	}

+

+}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/VerifyMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/VerifyMatcher.java
new file mode 100644
index 00000000000..a83030d8ed4
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/VerifyMatcher.java
@@ -0,0 +1,36 @@
+/*****************************************************************************

+ * Copyright (c) 2010 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

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sysml.service.types.matcher;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

+import org.eclipse.papyrus.sysml.requirements.Verify;

+import org.eclipse.papyrus.sysml.service.types.utils.ElementUtil;

+import org.eclipse.uml2.uml.Abstraction;

+

+/**

+ * Test if current Abstraction is a {@link Verify}

+ */

+public class VerifyMatcher implements IElementMatcher {

+

+	public boolean matches(EObject eObject) {

+

+		boolean isMatch = false;

+		if(eObject instanceof Abstraction) {

+

+			Abstraction element = (Abstraction)eObject;

+			if(ElementUtil.getStereotypeApplication(element, Verify.class) != null) {

+				isMatch = true;

+			}

+		}

+		return isMatch;

+	}

+

+}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ViewMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ViewMatcher.java
new file mode 100644
index 00000000000..45733ac8311
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ViewMatcher.java
@@ -0,0 +1,36 @@
+/*****************************************************************************

+ * Copyright (c) 2010 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

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sysml.service.types.matcher;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

+import org.eclipse.papyrus.sysml.modelelements.View;

+import org.eclipse.papyrus.sysml.service.types.utils.ElementUtil;

+import org.eclipse.uml2.uml.Package;

+

+/**

+ * Test if current {@link Package} is a {@link View}

+ */

+public class ViewMatcher implements IElementMatcher {

+

+	public boolean matches(EObject eObject) {

+

+		boolean isMatch = false;

+		if(eObject instanceof Package) {

+

+			Package element = (Package)eObject;

+			if(ElementUtil.getStereotypeApplication(element, View.class) != null) {

+				isMatch = true;

+			}

+		}

+		return isMatch;

+	}

+

+}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ViewPointMatcher.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ViewPointMatcher.java
new file mode 100644
index 00000000000..5797dee884d
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/matcher/ViewPointMatcher.java
@@ -0,0 +1,35 @@
+/*****************************************************************************

+ * Copyright (c) 2010 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

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sysml.service.types.matcher;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

+import org.eclipse.papyrus.sysml.modelelements.ViewPoint;

+import org.eclipse.papyrus.sysml.service.types.utils.ElementUtil;

+

+/**

+ * Test if current {@link org.eclipse.uml2.uml.Class} is a {@link ViewPoint}

+ */

+public class ViewPointMatcher implements IElementMatcher {

+

+	public boolean matches(EObject eObject) {

+

+		boolean isMatch = false;

+		if(eObject instanceof org.eclipse.uml2.uml.Class) {

+

+			org.eclipse.uml2.uml.Class element = (org.eclipse.uml2.uml.Class)eObject;

+			if(ElementUtil.getStereotypeApplication(element, ViewPoint.class) != null) {

+				isMatch = true;

+			}

+		}

+		return isMatch;

+	}

+

+}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/xmlElementTypes.xml b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/xmlElementTypes.xml
new file mode 100644
index 00000000000..ad7be80c0f0
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/xmlElementTypes.xml
@@ -0,0 +1,287 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+
+<!-- SysML ElementTypes declarations -->
+<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
+
+	<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
+	
+	<!-- Declaration of IElementTypes -->
+	
+	<!-- ISpecializationType Allocate of UML::Abstraction -->
+	<specializationType id="org.eclipse.papyrus.sysml.Allocate" name="SysML::Allocate"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.AllocateEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::Allocate"/>
+		<specializes id="org.eclipse.papyrus.uml.Abstraction" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.AllocateMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType Block of UML::Class -->
+	<specializationType id="org.eclipse.papyrus.sysml.Block" name="SysML::Block"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.BlockEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::Block"/>
+		<specializes id="org.eclipse.papyrus.uml.Class" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.BlockMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType Conform of UML::Dependency -->
+	<specializationType id="org.eclipse.papyrus.sysml.Conform" name="SysML::Conform"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.ConformEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::Conform"/>
+		<specializes id="org.eclipse.papyrus.uml.Dependency" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.ConformMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType ConstraintBlock of UML::Class -->
+	<specializationType id="org.eclipse.papyrus.sysml.ConstraintBlock" name="SysML::ConstraintBlock"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.ConstraintBlockEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::ConstraintBlock"/>
+		<specializes id="org.eclipse.papyrus.uml.Class" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.ConstraintBlockMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType ConstraintProperty of UML::Property -->
+	<specializationType id="org.eclipse.papyrus.sysml.ConstraintProperty" name="SysML::ConstraintProperty"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.ConstraintPropertyEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::ConstraintProperty"/>
+		<specializes id="org.eclipse.papyrus.uml.Property" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.ConstraintPropertyMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType Copy of UML::Abstraction -->
+	<specializationType id="org.eclipse.papyrus.sysml.Copy" name="SysML::Copy"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.CopyEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::Copy"/>
+		<specializes id="org.eclipse.papyrus.uml.Abstraction" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.CopyMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType DeriveReqt of UML::Abstraction -->
+	<specializationType id="org.eclipse.papyrus.sysml.DeriveReqt" name="SysML::DeriveReqt"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.DeriveReqtEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::DeriveReqt"/>
+		<specializes id="org.eclipse.papyrus.uml.Abstraction" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.DeriveReqtMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType Dimension of UML::InstanceSpecification -->
+	<specializationType id="org.eclipse.papyrus.sysml.Dimension" name="SysML::Dimension"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.DimensionEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::Dimension"/>
+		<specializes id="org.eclipse.papyrus.uml.InstanceSpecification" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.DimensionMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType FlowPort of UML::Port -->
+	<specializationType id="org.eclipse.papyrus.sysml.FlowPort" name="SysML::FlowPort"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.FlowPortEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::FlowPort"/>
+		<specializes id="org.eclipse.papyrus.uml.Port" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType FlowPort_InOut of SysML::FlowPort -->
+	<specializationType id="org.eclipse.papyrus.sysml.FlowPort_InOut" name="SysML::FlowPort_InOut"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.FlowPortInOutEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::FlowPort_InOut"/>
+		<specializes id="org.eclipse.papyrus.sysml.FlowPort" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortInOutMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType FlowPort_In of SysML::FlowPort -->
+	<specializationType id="org.eclipse.papyrus.sysml.FlowPort_In" name="SysML::FlowPort_In"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.FlowPortInEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::FlowPort_In"/>
+		<specializes id="org.eclipse.papyrus.sysml.FlowPort" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortInMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType FlowPort_Out of SysML::FlowPort -->
+	<specializationType id="org.eclipse.papyrus.sysml.FlowPort_Out" name="SysML::FlowPort_Out"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.FlowPortOutEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::FlowPort_Out"/>
+		<specializes id="org.eclipse.papyrus.sysml.FlowPort" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortOutMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType FlowProperty of UML::Property -->
+	<specializationType id="org.eclipse.papyrus.sysml.FlowProperty" name="SysML::FlowProperty"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.FlowPropertyEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::FlowProperty"/>
+		<specializes id="org.eclipse.papyrus.uml.Property" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.FlowPropertyMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType FlowSpecification of UML::Interface -->
+	<specializationType id="org.eclipse.papyrus.sysml.FlowSpecification" name="SysML::FlowSpecification"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.FlowSpecificationEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::FlowSpecification"/>
+		<specializes id="org.eclipse.papyrus.uml.Interface" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.FlowSpecificationMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType ItemFlow of UML::InformationFlow -->
+	<specializationType id="org.eclipse.papyrus.sysml.ItemFlow" name="SysML::ItemFlow"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.ItemFlowEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::ItemFlow"/>
+		<specializes id="org.eclipse.papyrus.uml.InformationFlow" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.ItemFlowMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType Problem of UML::Comment -->
+	<specializationType id="org.eclipse.papyrus.sysml.Problem" name="SysML::Problem"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.ProblemEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::Problem"/>
+		<specializes id="org.eclipse.papyrus.uml.Comment" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.ProblemMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType Rationale of UML::Comment -->
+	<specializationType id="org.eclipse.papyrus.sysml.Rationale" name="SysML::Rationale"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.RationaleEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::Rationale"/>
+		<specializes id="org.eclipse.papyrus.uml.Comment" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.RationaleMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType Requirement of UML::Class -->
+	<specializationType id="org.eclipse.papyrus.sysml.Requirement" name="SysML::Requirement"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.RequirementEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::Requirement"/>
+		<specializes id="org.eclipse.papyrus.uml.Class" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.RequirementMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType Unit of UML::InstanceSpecification -->
+	<specializationType id="org.eclipse.papyrus.sysml.Unit" name="SysML::Unit"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.UnitEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::Unit"/>
+		<specializes id="org.eclipse.papyrus.uml.InstanceSpecification" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.UnitMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType ValueType of UML::DataType -->
+	<specializationType id="org.eclipse.papyrus.sysml.ValueType" name="SysML::ValueType"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.ValueTypeEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::ValueType"/>
+		<specializes id="org.eclipse.papyrus.uml.DataType" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.ValueTypeMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType ValueType_Enumeration of UML::Enumeration -->
+	<specializationType id="org.eclipse.papyrus.sysml.ValueType_Enumeration" name="SysML::ValueType_Enumeration"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.ValueTypeEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::ValueType_Enumeration"/>
+		<specializes id="org.eclipse.papyrus.uml.Enumeration" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.ValueTypeEnumerationMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType ValueType_PrimitiveType of UML::PrimitiveType -->
+	<specializationType id="org.eclipse.papyrus.sysml.ValueType_PrimitiveType" name="SysML::ValueType_PrimitiveType"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.ValueTypeEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::ValueType_PrimitiveType"/>
+		<specializes id="org.eclipse.papyrus.uml.PrimitiveType" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.ValueTypePrimitiveTypeMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType Verify of UML::Abstraction -->
+	<specializationType id="org.eclipse.papyrus.sysml.Verify" name="SysML::Verify"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.VerifyEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::Verify"/>
+		<specializes id="org.eclipse.papyrus.uml.Abstraction" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.VerifyMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType View of UML::Package -->
+	<specializationType id="org.eclipse.papyrus.sysml.View" name="SysML::View"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.ViewEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::View"/>
+		<specializes id="org.eclipse.papyrus.uml.Package" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.ViewMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType ViewPoint of UML::Class -->
+	<specializationType id="org.eclipse.papyrus.sysml.ViewPoint" name="SysML::ViewPoint"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.ViewPointEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::ViewPoint"/>
+		<specializes id="org.eclipse.papyrus.uml.Class" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.ViewPointMatcher" />
+	</specializationType>
+	
+	<!-- ISpecializationType Satisfy of UML::Abstraction -->
+	<specializationType id="org.eclipse.papyrus.sysml.Satisfy" name="SysML::Satisfy"
+		edithelperadvice="org.eclipse.papyrus.sysml.service.types.helper.SatisfyEditHelperAdvice"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="SysML::Satisfy"/>
+		<specializes id="org.eclipse.papyrus.uml.Abstraction" />
+		<matcher class ="org.eclipse.papyrus.sysml.service.types.matcher.SatisfyMatcher" />
+	</specializationType>
+	
+	</metamodel>
+</extension>
+
+
+<!-- SysML ElementType bindings to Papyrus shared IClientContext -->
+<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">
+
+	<!-- Bindings declaration -->
+	<binding context="org.eclipse.papyrus.service.edit.TypeContext">
+	
+		<elementType ref="org.eclipse.papyrus.sysml.Block" />
+		<elementType ref="org.eclipse.papyrus.sysml.Conform" />
+		<elementType ref="org.eclipse.papyrus.sysml.ConstraintBlock" />
+		<elementType ref="org.eclipse.papyrus.sysml.ConstraintProperty" />
+		<elementType ref="org.eclipse.papyrus.sysml.Copy" />
+		<elementType ref="org.eclipse.papyrus.sysml.DeriveReqt" />
+		<elementType ref="org.eclipse.papyrus.sysml.Dimension" />
+		<elementType ref="org.eclipse.papyrus.sysml.FlowPort" />
+		<elementType ref="org.eclipse.papyrus.sysml.FlowPort_InOut" />
+		<elementType ref="org.eclipse.papyrus.sysml.FlowPort_In" />
+		<elementType ref="org.eclipse.papyrus.sysml.FlowPort_Out" />
+		<elementType ref="org.eclipse.papyrus.sysml.FlowProperty" />
+		<elementType ref="org.eclipse.papyrus.sysml.FlowSpecification" />
+		<elementType ref="org.eclipse.papyrus.sysml.ItemFlow" />
+		<elementType ref="org.eclipse.papyrus.sysml.Problem" />
+		<elementType ref="org.eclipse.papyrus.sysml.Rationale" />
+		<elementType ref="org.eclipse.papyrus.sysml.Requirement" />
+		<elementType ref="org.eclipse.papyrus.sysml.Unit" />
+		<elementType ref="org.eclipse.papyrus.sysml.ValueType" />
+		<elementType ref="org.eclipse.papyrus.sysml.ValueType_Enumeration" />
+		<elementType ref="org.eclipse.papyrus.sysml.ValueType_PrimitiveType" />
+		<elementType ref="org.eclipse.papyrus.sysml.Verify" />
+		<elementType ref="org.eclipse.papyrus.sysml.View" />
+		<elementType ref="org.eclipse.papyrus.sysml.ViewPoint" />
+		<elementType ref="org.eclipse.papyrus.sysml.Satisfy" />
+
+	</binding>
+	
+</extension>
+
+</plugin>
+
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.activity/messages.properties b/plugins/uml/org.eclipse.papyrus.diagram.activity/messages.properties
index dfc40edb665..da2fcede952 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.activity/messages.properties
+++ b/plugins/uml/org.eclipse.papyrus.diagram.activity/messages.properties
@@ -184,8 +184,6 @@ NavigatorGroupName_DurationConstraint_3034_incominglinks=incoming links
 NavigatorGroupName_DurationConstraint_3035_incominglinks=incoming links
 NavigatorGroupName_TimeConstraint_3036_incominglinks=incoming links
 NavigatorGroupName_TimeConstraint_3037_incominglinks=incoming links
-NavigatorGroupName_InteractionConstraint_3030_incominglinks=incoming links
-NavigatorGroupName_InteractionConstraint_3031_incominglinks=incoming links
 NavigatorGroupName_IntervalConstraint_3032_incominglinks=incoming links
 NavigatorGroupName_IntervalConstraint_3033_incominglinks=incoming links
 NavigatorGroupName_Constraint_3011_incominglinks=incoming links
@@ -276,12 +274,6 @@ NavigatorGroupName_OutputPin_3077_incominglinks=incoming links
 NavigatorGroupName_OutputPin_3077_outgoinglinks=outgoing links
 NavigatorGroupName_DataStoreNode_3078_incominglinks=incoming links
 NavigatorGroupName_DataStoreNode_3078_outgoinglinks=outgoing links
-createObjects1Group_title=Objects
-createActions2Group_title=Actions
-createGroups3Group_title=Groups
-createPins4Group_title=Pins
-createEdges5Group_title=Edges
-createActionsLocalConditions6Group_title=Actions' Local Conditions
 createInitialnode1CreationTool_title=Initial node
 createInitialnode1CreationTool_desc=Create an Initial node
 createActivityfinal2CreationTool_title=Activity final
@@ -300,87 +292,12 @@ createActivityParameterNode8CreationTool_title=Activity Parameter Node
 createActivityParameterNode8CreationTool_desc=Create an Activity Parameter Node
 createDataStoreNode9CreationTool_title=Data Store Node
 createDataStoreNode9CreationTool_desc=Create a Data Store Node
-createOpaqueAction1CreationTool_title=Opaque Action
-createOpaqueAction1CreationTool_desc=Create an Opaque Action node
-createCallBehaviorAction2CreationTool_title=Call Behavior Action
-createCallBehaviorAction2CreationTool_desc=Create an Call Behavior Action node
-createCallOperationAction3CreationTool_title=Call Operation Action
-createCallOperationAction3CreationTool_desc=Create a Call Operation Action node
-createSendObjectAction4CreationTool_title=Send Object Action
-createSendObjectAction4CreationTool_desc=Create a Send Object Action node
-createSendSignalAction5CreationTool_title=Send Signal Action
-createSendSignalAction5CreationTool_desc=Create a Send Signal Action node
-createAcceptEventAction6CreationTool_title=Accept Event Action
-createAcceptEventAction6CreationTool_desc=Create an Accept Event Action node
-createValueSpecificationAction7CreationTool_title=Value Specification Action
-createValueSpecificationAction7CreationTool_desc=Create a Value Specification Action node
-createActivityPartition1CreationTool_title=Activity Partition
-createActivityPartition1CreationTool_desc=Create an Activity Partition
-createInterruptibleActivityRegion2CreationTool_title=Interruptible Activity Region
-createInterruptibleActivityRegion2CreationTool_desc=Create an Interruptible Activity Region
-createStructuredActivityNode3CreationTool_title=Structured Activity Node
-createStructuredActivityNode3CreationTool_desc=Create a Structured Activity Node
-createConditionalNode4CreationTool_title=Conditional Node
-createConditionalNode4CreationTool_desc=Create a Conditional Node
-createExpansionRegion5CreationTool_title=Expansion Region
-createExpansionRegion5CreationTool_desc=Create an Expansion Region
-createLoopNode6CreationTool_title=Loop Node
-createLoopNode6CreationTool_desc=Create a Loop Node
-createSequenceNode7CreationTool_title=Sequence Node
-createSequenceNode7CreationTool_desc=Create a Sequence Node
-createOutputPin1CreationTool_title=Output Pin
-createOutputPin1CreationTool_desc=Create an Output Pin
-createInputPin2CreationTool_title=Input Pin
-createInputPin2CreationTool_desc=Create an Input Pin
-createActionInputPin3CreationTool_title=Action Input Pin
-createActionInputPin3CreationTool_desc=Create an Action Input Pin
-createValuePin4CreationTool_title=Value Pin
-createValuePin4CreationTool_desc=Create a Value Pin
-createInputExpansionNode5CreationTool_title=Input Expansion Node
-createInputExpansionNode5CreationTool_desc=Create an Expansion Node as Input of an Expansion Region
-createOutputExpansionNode6CreationTool_title=Output Expansion Node
-createOutputExpansionNode6CreationTool_desc=Create an Expansion Node as Output of an Expansion Region
 createControlFlow1CreationTool_title=Control Flow
 createControlFlow1CreationTool_desc=Create a Control Flow
 createObjectFlow2CreationTool_title=Object Flow
 createObjectFlow2CreationTool_desc=Create an Object Flow
 createExceptionHandler3CreationTool_title=Exception Handler
 createExceptionHandler3CreationTool_desc=Create an Exception Handler
-createLocalPreconditionConstraint1CreationTool_title=Local Precondition Constraint
-createLocalPreconditionConstraint1CreationTool_desc=Create a Constraint as Local Precondition for an Action
-createLocalPreconditionInteractionConstraint2CreationTool_title=Local Precondition Interaction Constraint
-createLocalPreconditionInteractionConstraint2CreationTool_desc=Create an Interaction Constraint as Local Precondition for an Action
-createLocalPreconditionIntervalConstraint3CreationTool_title=Local Precondition Interval Constraint
-createLocalPreconditionIntervalConstraint3CreationTool_desc=Create an Interval Constraint as Local Precondition for an Action
-createLocalPreconditionDurationConstraint4CreationTool_title=Local Precondition Duration Constraint
-createLocalPreconditionDurationConstraint4CreationTool_desc=Create a Duration Constraint as Local Precondition for an Action
-createLocalPreconditionTimeConstraint5CreationTool_title=Local Precondition Time Constraint
-createLocalPreconditionTimeConstraint5CreationTool_desc=Create a Time Constraint as Local Precondition for an Action
-createLocalPostconditionConstraint6CreationTool_title=Local Postcondition Constraint
-createLocalPostconditionConstraint6CreationTool_desc=Create a Constraint as Local Postcondition for an Action
-createLocalPostconditionInteractionConstraint7CreationTool_title=Local Postcondition Interaction Constraint
-createLocalPostconditionInteractionConstraint7CreationTool_desc=Create an Interaction Constraint as Local Postcondition for an Action
-createLocalPostconditionIntervalConstraint8CreationTool_title=Local Postcondition Interval Constraint
-createLocalPostconditionIntervalConstraint8CreationTool_desc=Create an Interval Constraint as Local Postcondition for an Action
-createLocalPostconditionDurationConstraint9CreationTool_title=Local Postcondition Duration Constraint
-createLocalPostconditionDurationConstraint9CreationTool_desc=Create a Duration Constraint as Local Postcondition for an Action
-createLocalPostconditionTimeConstraint10CreationTool_title=Local Postcondition Time Constraint
-createLocalPostconditionTimeConstraint10CreationTool_desc=Create a Time Constraint as Local Postcondition for an Action
-createLocalPreconditionIntervalConstraint2CreationTool_title=Local Precondition Interval Constraint
-createLocalPreconditionIntervalConstraint2CreationTool_desc=Create an Interval Constraint as Local Precondition for an Action
-createLocalPreconditionDurationConstraint3CreationTool_title=Local Precondition Duration Constraint
-createLocalPreconditionDurationConstraint3CreationTool_desc=Create a Duration Constraint as Local Precondition for an Action
-createLocalPreconditionTimeConstraint4CreationTool_title=Local Precondition Time Constraint
-createLocalPreconditionTimeConstraint4CreationTool_desc=Create a Time Constraint as Local Precondition for an Action
-createLocalPostconditionConstraint5CreationTool_title=Local Postcondition Constraint
-createLocalPostconditionConstraint5CreationTool_desc=Create a Constraint as Local Postcondition for an Action
-createLocalPostconditionIntervalConstraint6CreationTool_title=Local Postcondition Interval Constraint
-createLocalPostconditionIntervalConstraint6CreationTool_desc=Create an Interval Constraint as Local Postcondition for an Action
-createLocalPostconditionDurationConstraint7CreationTool_title=Local Postcondition Duration Constraint
-createLocalPostconditionDurationConstraint7CreationTool_desc=Create a Duration Constraint as Local Postcondition for an Action
-createLocalPostconditionTimeConstraint8CreationTool_title=Local Postcondition Time Constraint
-createLocalPostconditionTimeConstraint8CreationTool_desc=Create a Time Constraint as Local Postcondition for an Action
-NavigatorGroupName_File_incominglinks=incoming links
 createNodes1Group_title=Nodes
 createEdges2Group_title=Edges
 createOpaqueAction10CreationTool_title=Opaque Action
@@ -397,70 +314,10 @@ createAcceptEventAction15CreationTool_title=Accept Event Action
 createAcceptEventAction15CreationTool_desc=Create an Accept Event Action node
 createValueSpecificationAction16CreationTool_title=Value Specification Action
 createValueSpecificationAction16CreationTool_desc=Create a Value Specification Action node
-createActivityPartition17CreationTool_title=Activity Partition
-createActivityPartition17CreationTool_desc=Create an Activity Partition
-createInterruptibleActivityRegion18CreationTool_title=Interruptible Activity Region
-createInterruptibleActivityRegion18CreationTool_desc=Create an Interruptible Activity Region
-createStructuredActivityNode19CreationTool_title=Structured Activity Node
-createStructuredActivityNode19CreationTool_desc=Create a Structured Activity Node
-createConditionalNode20CreationTool_title=Conditional Node
-createConditionalNode20CreationTool_desc=Create a Conditional Node
-createExpansionRegion21CreationTool_title=Expansion Region
-createExpansionRegion21CreationTool_desc=Create an Expansion Region
-createLoopNode22CreationTool_title=Loop Node
-createLoopNode22CreationTool_desc=Create a Loop Node
-createSequenceNode23CreationTool_title=Sequence Node
-createSequenceNode23CreationTool_desc=Create a Sequence Node
-createOutputPin24CreationTool_title=Output Pin
-createOutputPin24CreationTool_desc=Create an Output Pin
-createInputPin25CreationTool_title=Input Pin
-createInputPin25CreationTool_desc=Create an Input Pin
-createActionInputPin26CreationTool_title=Action Input Pin
-createActionInputPin26CreationTool_desc=Create an Action Input Pin
-createValuePin27CreationTool_title=Value Pin
-createValuePin27CreationTool_desc=Create a Value Pin
-createInputExpansionNode28CreationTool_title=Input Expansion Node
-createInputExpansionNode28CreationTool_desc=Create an Expansion Node as Input of an Expansion Region
-createOutputExpansionNode29CreationTool_title=Output Expansion Node
-createOutputExpansionNode29CreationTool_desc=Create an Expansion Node as Output of an Expansion Region
-createLocalPreconditionConstraint30CreationTool_title=Local Precondition Constraint
-createLocalPreconditionConstraint30CreationTool_desc=Create a Constraint as Local Precondition for an Action
-createLocalPreconditionIntervalConstraint31CreationTool_title=Local Precondition Interval Constraint
-createLocalPreconditionIntervalConstraint31CreationTool_desc=Create an Interval Constraint as Local Precondition for an Action
-createLocalPreconditionDurationConstraint32CreationTool_title=Local Precondition Duration Constraint
-createLocalPreconditionDurationConstraint32CreationTool_desc=Create a Duration Constraint as Local Precondition for an Action
-createLocalPreconditionTimeConstraint33CreationTool_title=Local Precondition Time Constraint
-createLocalPreconditionTimeConstraint33CreationTool_desc=Create a Time Constraint as Local Precondition for an Action
-createLocalPostconditionConstraint34CreationTool_title=Local Postcondition Constraint
-createLocalPostconditionConstraint34CreationTool_desc=Create a Constraint as Local Postcondition for an Action
-createLocalPostconditionIntervalConstraint35CreationTool_title=Local Postcondition Interval Constraint
-createLocalPostconditionIntervalConstraint35CreationTool_desc=Create an Interval Constraint as Local Postcondition for an Action
-createLocalPostconditionDurationConstraint36CreationTool_title=Local Postcondition Duration Constraint
-createLocalPostconditionDurationConstraint36CreationTool_desc=Create a Duration Constraint as Local Postcondition for an Action
-createLocalPostconditionTimeConstraint37CreationTool_title=Local Postcondition Time Constraint
-createLocalPostconditionTimeConstraint37CreationTool_desc=Create a Time Constraint as Local Postcondition for an Action
 createCommentCreationTool_title=Local Postcondition Time Constraint
 createCommentCreationTool_desc=Create a comment
 createLink4CreationTool_title=Link
 createLink4CreationTool_desc=Creation of a link for comment
-createAcceptEventAction9CreationTool_title=Accept Event Action
-createAcceptEventAction9CreationTool_desc=Create an Accept Event Action node
-createCallBehaviorAction10CreationTool_title=Call Behavior Action
-createCallBehaviorAction10CreationTool_desc=Create an Call Behavior Action node
-createCallOperationAction11CreationTool_title=Call Operation Action
-createCallOperationAction11CreationTool_desc=Create a Call Operation Action node
-createDataStoreNode12CreationTool_title=Data Store Node
-createDataStoreNode12CreationTool_desc=Create a Data Store Node
-createOpaqueAction13CreationTool_title=Opaque Action
-createOpaqueAction13CreationTool_desc=Create an Opaque Action node
-ReadSelfActionCreationTool_title=ReadSelfAction
-ReadSelfActionCreationTool_desc=Create a ReadSelfAction
-createSendObjectAction15CreationTool_title=Send Object Action
-createSendObjectAction15CreationTool_desc=Create a Send Object Action node
-createSendSignalAction16CreationTool_title=Send Signal Action
-createSendSignalAction16CreationTool_desc=Create a Send Signal Action node
-createValueSpecificationAction17CreationTool_title=Value Specification Action
-createValueSpecificationAction17CreationTool_desc=Create a Value Specification Action node
 createActivityPartition18CreationTool_title=Activity Partition
 createActivityPartition18CreationTool_desc=Create an Activity Partition
 createInterruptibleActivityRegion19CreationTool_title=Interruptible Activity Region
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.clazz/messages.properties b/plugins/uml/org.eclipse.papyrus.diagram.clazz/messages.properties
index a1cbdf5d84f..2910a54f955 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.clazz/messages.properties
+++ b/plugins/uml/org.eclipse.papyrus.diagram.clazz/messages.properties
@@ -10,11 +10,11 @@
 #     Emilien Perico (Atos Origin) - move tags to common
 ##################################################################################
 # not-generated
-AppliedStereotypeLabel_ElementImportTag=import
-AppliedStereotypeLabel_UsageTag=use
-AppliedStereotypeLabel_PackageImportTag=import
-AppliedStereotypeLabel_AbstractionTag=abstraction
-AppliedStereotypeLabel_PackageMergeTag=merge
+#AppliedStereotypeLabel_ElementImportTag=import
+#AppliedStereotypeLabel_UsageTag=use
+#AppliedStereotypeLabel_PackageImportTag=import
+#AppliedStereotypeLabel_AbstractionTag=abstraction
+#AppliedStereotypeLabel_PackageMergeTag=merge
 
 #end not generated
 # generated
@@ -94,20 +94,6 @@ createModel13CreationTool_title=Model
 createModel13CreationTool_desc=Create a model
 createOperation14CreationTool_title=Operation
 createOperation14CreationTool_desc=Create an operation
-createPackage15CreationTool_title=Package
-createPackage15CreationTool_desc=Create new Package
-createProperty16CreationTool_title=Property
-createProperty16CreationTool_desc=Create a new Property
-createReception17CreationTool_title=Reception
-createReception17CreationTool_desc=Create a reception
-createRedefinableTemplateSignature18CreationTool_title=RedefinableTemplateSignature
-createRedefinableTemplateSignature18CreationTool_desc=Create a RedefinableTemplateSignature
-createSignal19CreationTool_title=Signal
-createSignal19CreationTool_desc=Create a signal
-createSlot20CreationTool_title=Slot
-createSlot20CreationTool_desc=Create a Slot
-createTemplateParameter21CreationTool_title=TemplateParameter
-createTemplateParameter21CreationTool_desc=Create a templateParameter
 createTimeObservation22CreationTool_title=TimeObservation
 createTimeObservation22CreationTool_desc=Create new TimeObservation
 createAbstraction1CreationTool_title=Abstraction
@@ -212,8 +198,6 @@ createTemplateParameter22CreationTool_title=TemplateParameter
 createTemplateParameter22CreationTool_desc=Create a templateParameter
 createTemplateSignatureCreationTool_title=TemplateSignature
 createTemplateSignatureCreationTool_desc=Create a TemplateSignature
-createTimeObservation24CreationTool_title=TimeObservation
-createTimeObservation24CreationTool_desc=Create new TimeObservation
 createConnectableElementTemplateParameter25CreationTool_title=ConnectableElementTemplateParameter
 createConnectableElementTemplateParameter25CreationTool_desc=Create a ConnectableElementTemplateParameter
 TemplateSignatureTemplateParameterCompartmentEditPart_title=TemplateParameterCompartment
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/providers/UMLValidationDecoratorProvider.java b/plugins/uml/org.eclipse.papyrus.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/providers/UMLValidationDecoratorProvider.java
index 6b1cb4d7772..ad3a52efb09 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/providers/UMLValidationDecoratorProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/providers/UMLValidationDecoratorProvider.java
@@ -1,74 +1,38 @@
+/*****************************************************************************

+ * Copyright (c) 2009-2010 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:

+ *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

 package org.eclipse.papyrus.diagram.clazz.providers;

 

-import java.util.ArrayList;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IMarker;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.draw2d.FlowLayout;

-import org.eclipse.draw2d.Label;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EValidator;

-import org.eclipse.emf.transaction.util.TransactionUtil;

-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

 import org.eclipse.gef.EditDomain;

 import org.eclipse.gef.EditPart;

 import org.eclipse.gef.editparts.AbstractConnectionEditPart;

-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;

 import org.eclipse.gmf.runtime.common.core.service.IOperation;

-import org.eclipse.gmf.runtime.common.ui.resources.FileChangeManager;

-import org.eclipse.gmf.runtime.common.ui.resources.IFileObserver;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditDomain;

-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.AbstractDecorator;

 import org.eclipse.gmf.runtime.diagram.ui.services.decorator.CreateDecoratorsOperation;

-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecorator;

 import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorProvider;

 import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget;

-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;

-import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.core.utils.ValidationUtils;

+import org.eclipse.papyrus.diagram.common.providers.ValidationDecoratorProvider;

 import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.common.util.CrossReferencerUtil;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.ui.ISharedImages;

-import org.eclipse.ui.PlatformUI;

 

 /**

  * @generated

  */

-public class UMLValidationDecoratorProvider extends AbstractProvider implements IDecoratorProvider {

-

-	/**

-	 * @generated

-	 */

-	private static final String KEY = "validationStatus"; //$NON-NLS-1$

-

-	/**

-	 * @generated

-	 */

-	private static final String MARKER_TYPE = UMLDiagramEditorPlugin.ID + ".diagnostic"; //$NON-NLS-1$

-

-	/**

-	 * @generated

-	 */

-	private static MarkerObserver fileObserver;

-

-	/**

-	 * @generated

-	 */

-	private static Map/* <String, List<IDecorator>> */allDecorators = new HashMap();

+public class UMLValidationDecoratorProvider extends ValidationDecoratorProvider implements IDecoratorProvider {

 

 	/**

 	 * @generated

@@ -105,349 +69,4 @@ public class UMLValidationDecoratorProvider extends AbstractProvider implements
 		return view != null && ModelEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(view));

 	}

 

-	/**

-	 * @generated

-	 */

-	public static void refreshDecorators(View view) {

-		refreshDecorators(ViewUtil.getIdStr(view), view.getDiagram());

-	}

-

-	/**

-	 * @generated

-	 */

-	private static void refreshDecorators(String viewId, Diagram diagram) {

-		final List decorators = viewId != null ? (List)allDecorators.get(viewId) : null;

-		if(decorators == null || decorators.isEmpty() || diagram == null) {

-			return;

-		}

-		final Diagram fdiagram = diagram;

-		PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {

-

-			public void run() {

-				try {

-					TransactionUtil.getEditingDomain(fdiagram).runExclusive(new Runnable() {

-

-						public void run() {

-							for(Iterator it = decorators.iterator(); it.hasNext();) {

-								IDecorator decorator = (IDecorator)it.next();

-								decorator.refresh();

-							}

-						}

-					});

-				} catch (Exception e) {

-					UMLDiagramEditorPlugin.getInstance().logError("Decorator refresh failure", e); //$NON-NLS-1$

-				}

-			}

-		});

-	}

-

-	/**

-	 * @generated

-	 */

-	public static class StatusDecorator extends AbstractDecorator {

-

-		/**

-		 * @generated

-		 */

-		private String viewId;

-

-		/**

-		 * @generated

-		 */

-		public StatusDecorator(IDecoratorTarget decoratorTarget) {

-			super(decoratorTarget);

-			try {

-				final View view = (View)getDecoratorTarget().getAdapter(View.class);

-				TransactionUtil.getEditingDomain(view).runExclusive(new Runnable() {

-

-					public void run() {

-						StatusDecorator.this.viewId = view != null ? ViewUtil.getIdStr(view) : null;

-					}

-				});

-			} catch (Exception e) {

-				UMLDiagramEditorPlugin.getInstance().logError("ViewID access failure", e); //$NON-NLS-1$			

-			}

-		}

-

-		/**

-		 * @generated

-		 */

-		public void refresh() {

-			removeDecoration();

-			View view = (View)getDecoratorTarget().getAdapter(View.class);

-			if(view == null || view.eResource() == null) {

-				return;

-			}

-			EditPart editPart = (EditPart)getDecoratorTarget().getAdapter(EditPart.class);

-			if(editPart == null || editPart.getViewer() == null) {

-				return;

-			}

-

-			// query for all the validation markers of the current resource

-			String elementId = ViewUtil.getIdStr(view);

-			if(elementId == null) {

-				return;

-			}

-			int severity = IMarker.SEVERITY_INFO;

-			IMarker foundMarker = null;

-			IResource gmfResource = WorkspaceSynchronizer.getFile(view.eResource());

-			if(gmfResource == null || !gmfResource.exists()) {

-				return;

-			}

-			IResource emfResource = null;

-			if(view.getElement() != null) {

-				emfResource = WorkspaceSynchronizer.getFile(view.getElement().eResource());

-				// allow emfResource being empty, since there might be gmf views without an EObject behind;

-			}

-

-			IMarker[] gmfMarkers = null;

-			IMarker[] emfMarkers = new IMarker[0];

-			try {

-				gmfMarkers = gmfResource.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE);

-				if(emfResource != null) {

-					emfMarkers = emfResource.findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_INFINITE);

-				}

-			} catch (CoreException e) {

-				UMLDiagramEditorPlugin.getInstance().logError("Validation markers refresh failure", e); //$NON-NLS-1$

-			}

-			if(gmfMarkers == null) {

-				// indicates an exception, findMarkers returns an empty array, if there are no markers

-				return;

-			}

-			Label toolTip = null;

-			// look for GMF markers

-			for(int i = 0; i < gmfMarkers.length + emfMarkers.length; i++) {

-				IMarker marker;

-				boolean markerIsForMe = false;

-				if(i < gmfMarkers.length) {

-					// get marker from GMF list

-					marker = gmfMarkers[i];

-					String attribute = marker.getAttribute(org.eclipse.gmf.runtime.common.ui.resources.IMarker.ELEMENT_ID, ""); //$NON-NLS-1$

-					markerIsForMe = attribute.equals(elementId);

-				} else {

-					// get marker from EMF list

-					marker = emfMarkers[i - gmfMarkers.length];

-					EObject eObjectOfMarker = ValidationUtils.eObjectFromMarkerOrMap(marker, null, TransactionUtil.getEditingDomain(view));

-					markerIsForMe = (eObjectOfMarker == view.getElement());

-				}

-				if(markerIsForMe) {

-					int nextSeverity = marker.getAttribute(IMarker.SEVERITY, IMarker.SEVERITY_INFO);

-					Image nextImage = getImage(nextSeverity);

-					if(foundMarker == null) {

-						foundMarker = marker;

-						toolTip = new Label(marker.getAttribute(IMarker.MESSAGE, ""), //$NON-NLS-1$

-						nextImage);

-					} else {

-						if(toolTip.getChildren().isEmpty()) {

-							Label comositeLabel = new Label();

-							FlowLayout fl = new FlowLayout(false);

-							fl.setMinorSpacing(0);

-							comositeLabel.setLayoutManager(fl);

-							comositeLabel.add(toolTip);

-							toolTip = comositeLabel;

-						}

-						toolTip.add(new Label(marker.getAttribute(IMarker.MESSAGE, ""), //$NON-NLS-1$

-						nextImage));

-					}

-					severity = (nextSeverity > severity) ? nextSeverity : severity;

-				}

-			}

-			if(foundMarker == null) {

-				return;

-			}

-

-			// add decoration

-			if(editPart instanceof org.eclipse.gef.GraphicalEditPart) {

-				if(view instanceof Edge) {

-					setDecoration(getDecoratorTarget().addConnectionDecoration(getImage(severity), 50, true));

-				} else {

-					int margin = -1;

-					if(editPart instanceof org.eclipse.gef.GraphicalEditPart) {

-						margin = MapModeUtil.getMapMode(((org.eclipse.gef.GraphicalEditPart)editPart).getFigure()).DPtoLP(margin);

-					}

-					setDecoration(getDecoratorTarget().addShapeDecoration(getImage(severity), IDecoratorTarget.Direction.NORTH_EAST, margin, true));

-				}

-				getDecoration().setToolTip(toolTip);

-			}

-		}

-

-		/**

-		 * @generated

-		 */

-		private Image getImage(int severity) {

-			String imageName = ISharedImages.IMG_OBJS_ERROR_TSK;

-			switch(severity) {

-			case IMarker.SEVERITY_ERROR:

-				imageName = ISharedImages.IMG_OBJS_ERROR_TSK;

-				break;

-			case IMarker.SEVERITY_WARNING:

-				imageName = ISharedImages.IMG_OBJS_WARN_TSK;

-				break;

-			default:

-				imageName = ISharedImages.IMG_OBJS_INFO_TSK;

-			}

-			return PlatformUI.getWorkbench().getSharedImages().getImage(imageName);

-		}

-

-		/**

-		 * @generated

-		 */

-		public void activate() {

-			if(viewId == null) {

-				return;

-			}

-

-			// add self to global decorators registry

-			List list = (List)allDecorators.get(viewId);

-			if(list == null) {

-				list = new ArrayList(2);

-				list.add(this);

-				allDecorators.put(viewId, list);

-			} else if(!list.contains(this)) {

-				list.add(this);

-			}

-

-			// start listening to changes in resources

-			View view = (View)getDecoratorTarget().getAdapter(View.class);

-			if(view == null) {

-				return;

-			}

-			Diagram diagramView = view.getDiagram();

-			if(diagramView == null) {

-				return;

-			}

-			if(fileObserver == null) {

-				FileChangeManager.getInstance().addFileObserver(fileObserver = new MarkerObserver(diagramView));

-			}

-		}

-

-		/**

-		 * @generated

-		 */

-		public void deactivate() {

-			if(viewId == null) {

-				return;

-			}

-

-			// remove self from global decorators registry

-			List list = (List)allDecorators.get(viewId);

-			if(list != null) {

-				list.remove(this);

-				if(list.isEmpty()) {

-					allDecorators.remove(viewId);

-				}

-			}

-

-			// stop listening to changes in resources if there are no more decorators

-			if(fileObserver != null && allDecorators.isEmpty()) {

-				FileChangeManager.getInstance().removeFileObserver(fileObserver);

-				fileObserver = null;

-			}

-			super.deactivate();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	static class MarkerObserver implements IFileObserver {

-

-		/**

-		 * @generated

-		 */

-		private Diagram diagram;

-

-		/**

-		 * @generated

-		 */

-		private MarkerObserver(Diagram diagram) {

-			this.diagram = diagram;

-		}

-

-		/**

-		 * @generated

-		 */

-		public void handleFileRenamed(IFile oldFile, IFile file) {

-		}

-

-		/**

-		 * @generated

-		 */

-		public void handleFileMoved(IFile oldFile, IFile file) {

-		}

-

-		/**

-		 * @generated

-		 */

-		public void handleFileDeleted(IFile file) {

-		}

-

-		/**

-		 * @generated

-		 */

-		public void handleFileChanged(IFile file) {

-		}

-

-		/**

-		 * @generated

-		 */

-		public void handleMarkerAdded(IMarker marker) {

-			handleMarkerChanged(marker);

-		}

-

-		/**

-		 * @generated

-		 */

-		public void handleMarkerDeleted(IMarker marker, Map attributes) {

-			String viewId = (String)attributes.get(org.eclipse.gmf.runtime.common.ui.resources.IMarker.ELEMENT_ID);

-			if(viewId != null) {

-				refreshDecorators(viewId, diagram);

-			} else {

-				// no viewID => assume EMF validation marker

-				EObject eObjectFromMarker = ValidationUtils.eObjectFromMarkerOrMap(null, attributes, TransactionUtil.getEditingDomain(diagram));

-

-				if(eObjectFromMarker != null) {

-					// loop over all views that reference the eObject from the marker

-					for(View view : CrossReferencerUtil.getCrossReferencingViews(eObjectFromMarker, null)) {

-						refreshDecorators(view);

-					}

-				}

-			}

-		}

-

-		/**

-		 * @generated

-		 */

-		public void handleMarkerChanged(IMarker marker) {

-			try {

-				if(getType(marker).equals(MARKER_TYPE)) {

-					String viewId = marker.getAttribute(org.eclipse.gmf.runtime.common.ui.resources.IMarker.ELEMENT_ID, ""); //$NON-NLS-1$

-					refreshDecorators(viewId, diagram);

-				} else if(marker.isSubtypeOf((EValidator.MARKER))) {

-					EObject eObjectFromMarker = ValidationUtils.eObjectFromMarkerOrMap(marker, null, TransactionUtil.getEditingDomain(diagram));

-

-					if(eObjectFromMarker != null) {

-						// loop over all views that reference the eObject from the marker

-						for(View view : CrossReferencerUtil.getCrossReferencingViews(eObjectFromMarker, null)) {

-							refreshDecorators(view);

-						}

-					}

-				}

-			} catch (CoreException e) {

-				// only reason: marker does not exist (ignore, shoudl not happen)

-			}

-		}

-

-		/**

-		 * @generated

-		 */

-		private String getType(IMarker marker) {

-			try {

-				return marker.getType();

-			} catch (CoreException e) {

-				UMLDiagramEditorPlugin.getInstance().logError("Validation marker refresh failure", e); //$NON-NLS-1$

-				return ""; //$NON-NLS-1$

-			}

-		}

-	}

 }

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.common/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.diagram.common/META-INF/MANIFEST.MF
index d50bc440919..4cfb626cfa6 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.common/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.diagram.common/META-INF/MANIFEST.MF
@@ -64,7 +64,8 @@ Require-Bundle: org.eclipse.uml2.uml.edit;visibility:=reexport,
  org.eclipse.papyrus.preferences;bundle-version="0.8.0",
  org.eclipse.gmf.runtime.diagram.ui.actions,
  org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="1.4.0",
- org.eclipse.core.expressions
+ org.eclipse.core.expressions,
+ org.eclipse.papyrus.validation;bundle-version="0.7.1"
 Created-By: 1.5.0_06-b05 (Sun Microsystems Inc.)
 Ant-Version: Apache Ant 1.7.0
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/ShowHideContentsAction.java b/plugins/uml/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/ShowHideContentsAction.java
index aa3003669c0..1dc19566aff 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/ShowHideContentsAction.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/ShowHideContentsAction.java
@@ -42,12 +42,12 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ITreeContentProvider;

 import org.eclipse.jface.viewers.StructuredSelection;

 import org.eclipse.jface.viewers.Viewer;

+import org.eclipse.papyrus.diagram.common.Activator;

 import org.eclipse.papyrus.diagram.common.Messages;

 import org.eclipse.papyrus.diagram.common.commands.ShowHideElementsRequest;

 import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

 import org.eclipse.papyrus.diagram.common.providers.EditorLabelProvider;

 import org.eclipse.papyrus.diagram.common.util.Util;

-import org.eclipse.papyrus.wizards.Activator;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.ui.IActionDelegate;

 import org.eclipse.ui.IWorkbenchWindow;

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/LinkRepresentationForLayoutAction.java b/plugins/uml/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/LinkRepresentationForLayoutAction.java
index 06dec9dc243..8229c8b5a2d 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/LinkRepresentationForLayoutAction.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/LinkRepresentationForLayoutAction.java
@@ -30,8 +30,8 @@ import org.eclipse.gef.editpolicies.GraphicalNodeEditPolicy;
 import org.eclipse.gef.requests.ReconnectRequest;

 import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.diagram.common.Activator;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGEFCommandWrapper;

-import org.eclipse.papyrus.wizards.Activator;

 

 /**

  * 

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/ValidationDecoratorProvider.java b/plugins/uml/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/ValidationDecoratorProvider.java
index 869a686b27b..22f70264733 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/ValidationDecoratorProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/ValidationDecoratorProvider.java
@@ -45,8 +45,8 @@ import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget;
 import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
 import org.eclipse.gmf.runtime.notation.Edge;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.core.utils.ValidationUtils;
 import org.eclipse.papyrus.diagram.common.util.CrossReferencerUtil;
+import org.eclipse.papyrus.validation.ValidationUtils;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.ISharedImages;
 import org.eclipse.ui.PlatformUI;
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/resourceupdate/ResourceUpdateService.java b/plugins/uml/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/resourceupdate/ResourceUpdateService.java
index db823f77e35..8c449c807b3 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/resourceupdate/ResourceUpdateService.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/resourceupdate/ResourceUpdateService.java
@@ -75,21 +75,23 @@ public class ResourceUpdateService implements IService, IResourceChangeListener,
 		lifeCycleEvents.addDoSaveListener(new ISaveEventListener() {
 
 			public void doSave(DoSaveEvent event) {
-				isActive = false;
+				deactivate();
 			}
 
 			public void doSaveAs(DoSaveEvent event) {
-				isActive = false;
+				// isActive = false;
+				deactivate();
 			}
 		});
 		lifeCycleEvents.addPostDoSaveListener(new ISaveEventListener() {
 
 			public void doSave(DoSaveEvent event) {
-				isActive = true;
+				activate();
 			}
 
 			public void doSaveAs(DoSaveEvent event) {
 				isActive = true;
+				activate();
 			}
 		});
 	}
@@ -123,10 +125,10 @@ public class ResourceUpdateService implements IService, IResourceChangeListener,
 	 * A visitor for resource changes. Detects, whether a changed resource belongs to an opened editor
 	 */
 	public boolean visit(IResourceDelta delta) {
-		if(!isActive) {
+		// if(!isActive) {
 			// don't follow resource changes, once inactive (either due to save or due to a pending user dialog) 
-			return false;
-		}
+			// return false;
+		// }
 		IResource changedResource = delta.getResource();
 		if(delta.getFlags() == IResourceDelta.MARKERS) {
 			// only markers have been changed. Refresh their display only (no need to reload resources)
@@ -241,16 +243,24 @@ public class ResourceUpdateService implements IService, IResourceChangeListener,
 
 	private ModelSet modelSet;
 
-
-	public void startService() throws ServiceException {
+	// private ILifeCycleEventsProvider lifeCycleEvents;
+	
+	private void activate() {
 		// ... add service to the workspace
 		ResourcesPlugin.getWorkspace().addResourceChangeListener(this, IResourceChangeEvent.POST_CHANGE);
+	}
 
+	private void deactivate() {
+		// remove it from workspace
+		ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
+	}
 
+	public void startService() throws ServiceException {
+		activate();
 	}
 
 	public void disposeService() throws ServiceException {
-		// remove it from workspace
-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
+		deactivate();
+		// lifeCycleEvents.removeDoSaveListener(listener);
 	}
 }
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/CustomAdapterFactoryContentProvider.java b/plugins/uml/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/CustomAdapterFactoryContentProvider.java
index f541e542d83..34ff7253aa9 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/CustomAdapterFactoryContentProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/CustomAdapterFactoryContentProvider.java
@@ -41,6 +41,7 @@ public class CustomAdapterFactoryContentProvider extends AdapterFactoryContentPr
 	/**

 	 * {@inheritDoc}

 	 */

+	@Override

 	public Object[] getChildren(Object object) {

 		Object[] result = super.getChildren(object);

 		ArrayList diagfound = lookForAttachedDiagram(object);

@@ -55,6 +56,7 @@ public class CustomAdapterFactoryContentProvider extends AdapterFactoryContentPr
 	/**

 	 * {@inheritDoc}

 	 */

+	@Override

 	public boolean hasChildren(Object object) {

 		if(object instanceof Diagram) {

 			return false;

@@ -74,12 +76,12 @@ public class CustomAdapterFactoryContentProvider extends AdapterFactoryContentPr
 	 */

 	public ArrayList lookForAttachedDiagram(Object object) {

 		ArrayList result = new ArrayList();

-		IPageMngr iPageMngr = (IPageMngr)EditorUtils.getIPageMngr();

+		IPageMngr iPageMngr = EditorUtils.getIPageMngr();

 		Iterator iter = iPageMngr.allPages().iterator();

 		while(iter.hasNext()) {

 			Diagram diag = (Diagram)iter.next();

 			//sometimes diag can loose the link to the element, so we need to test it.

-			if(diag.getElement()!=null){

+			if(diag != null && diag.getElement() != null) {//if the model is a little corrupted, we can have diag==null

 				if(diag.getElement().equals(object)) {

 					result.add(diag);

 				}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/EditorLookForDiagram.java b/plugins/uml/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/EditorLookForDiagram.java
index ad42e583ae6..3c29a9ba844 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/EditorLookForDiagram.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/EditorLookForDiagram.java
@@ -13,7 +13,9 @@
  *****************************************************************************/

 package org.eclipse.papyrus.diagram.common.ui.hyperlinkshell;

 

+import java.util.ArrayList;

 import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

@@ -306,7 +308,16 @@ public class EditorLookForDiagram extends AbstractLookForDiagramShell {
 			try {

 				IPageMngr iPageMngr = EditorUtils.getIPageMngr();

 				Object[] result = iPageMngr.allPages().toArray();

-				return result;

+

+				List<Object> res = new ArrayList<Object>();

+				for(Object current : result) {

+					if(current != null) { //if the model is a little bit corrupted, we can have a null element in the list

+						res.add(current);

+					}

+				}

+				return res.toArray();

+

+				//				return result;

 			} catch (Exception e) {

 			}

 			return null;

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.menu/src/org/eclipse/papyrus/diagram/menu/actions/ShowHideCompartmentAction.java b/plugins/uml/org.eclipse.papyrus.diagram.menu/src/org/eclipse/papyrus/diagram/menu/actions/ShowHideCompartmentAction.java
index 67a61b52f8f..1185a62ef11 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.menu/src/org/eclipse/papyrus/diagram/menu/actions/ShowHideCompartmentAction.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.menu/src/org/eclipse/papyrus/diagram/menu/actions/ShowHideCompartmentAction.java
@@ -18,10 +18,15 @@ import java.util.ArrayList;
 import java.util.Iterator;

 import java.util.List;

 

+import org.eclipse.gmf.runtime.notation.TitleStyle;

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

 import org.eclipse.gef.EditPart;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gef.commands.CompoundCommand;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.diagram.core.commands.SetPropertyCommand;

 import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;

@@ -34,7 +39,7 @@ import org.eclipse.gmf.runtime.diagram.ui.services.editpart.EditPartService;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.DecorationNode;

-import org.eclipse.gmf.runtime.notation.ListCompartment;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.action.IAction;

 import org.eclipse.jface.viewers.ITreeContentProvider;

@@ -265,6 +270,11 @@ public class ShowHideCompartmentAction extends AbstractShowHideAction {
 			super(domain, new EObjectAdapter(showNameOfCompartmentItem.compartment), Properties.ID_SHOWCOMPARTMENTTITLE, "Show/Hide Compartment Title", Boolean.valueOf(showNotHide));

 		}

 

+		protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

+			return super.doExecuteWithResult(progressMonitor, info);

+		}

+

+

 	}

 

 	/**

@@ -534,9 +544,10 @@ public class ShowHideCompartmentAction extends AbstractShowHideAction {
 			List<ShowNameOfCompartmentItem> result = new ArrayList<ShowNameOfCompartmentItem>();

 			View notationView = ((GraphicalEditPart)representedEditPart).getNotationView();

 			for(Object next : notationView.getChildren()) {

-				if(next instanceof ListCompartment) {

-					ListCompartment compartment = (ListCompartment)next;

-					if(compartment.isShowTitle()) {

+				if(next instanceof View) {

+					View compartment = (View)next;

+					TitleStyle style = (TitleStyle)compartment.getStyle(NotationPackage.eINSTANCE.getTitleStyle());

+					if(style != null && style.isShowTitle()) {

 						result.add(new ShowNameOfCompartmentItem(compartment));

 					}

 

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/PropertyLabelEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/PropertyLabelEditPolicy.java
index 524a027fc2b..75f3bf388bd 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/PropertyLabelEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/custom/policies/PropertyLabelEditPolicy.java
@@ -145,7 +145,7 @@ public class PropertyLabelEditPolicy extends AbstractMaskManagedEditPolicy {
 		Object object = notification.getNotifier();

 		Property property = getUMLElement();

 

-		if(object == null||property==null) {

+		if(object == null || property == null) {

 			return;

 		}

 

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/service/PreSaveProfileListener.java b/plugins/uml/org.eclipse.papyrus.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/service/PreSaveProfileListener.java
index 6dbe3c7532d..ad82263967f 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/service/PreSaveProfileListener.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.profile/custom-src/org/eclipse/papyrus/diagram/profile/service/PreSaveProfileListener.java
@@ -65,8 +65,8 @@ public class PreSaveProfileListener implements ISaveEventListener {
 			IMultiDiagramEditor multidiag = event.getMultiDiagramEditor();

 			if(multidiag instanceof PapyrusMultiDiagramEditor) {

 				diag = ((PapyrusMultiDiagramEditor)multidiag).getDiagram();

-				

-				if(diag == null ||diag.getElement()==null|| (!(diag.getElement() instanceof Profile))) {

+

+				if(diag == null || diag.getElement() == null || (!(diag.getElement() instanceof Profile))) {

 					return;

 				}

 			}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.profile/model/profilediagram.gmfgen b/plugins/uml/org.eclipse.papyrus.diagram.profile/model/profilediagram.gmfgen
index 6af4dc4243e..5f2c316379b 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.profile/model/profilediagram.gmfgen
+++ b/plugins/uml/org.eclipse.papyrus.diagram.profile/model/profilediagram.gmfgen
@@ -2316,7 +2316,8 @@
           </modelFacet>

         </labels>

         <creationConstraints

-            sourceEnd="/0/@expressionProviders/@providers.0/@expressions.9"/>

+            sourceEnd="/0/@expressionProviders/@providers.0/@expressions.10"

+            targetEnd="/0/@expressionProviders/@providers.0/@expressions.11"/>

       </links>

       <links

           visualID="1045">

@@ -2438,7 +2439,8 @@
           </modelFacet>

         </labels>

         <creationConstraints

-            sourceEnd="/0/@expressionProviders/@providers.0/@expressions.9"/>

+            sourceEnd="/0/@expressionProviders/@providers.0/@expressions.10"

+            targetEnd="/0/@expressionProviders/@providers.0/@expressions.11"/>

       </links>

       <links

           visualID="4002">

@@ -2498,7 +2500,8 @@
           </modelFacet>

         </labels>

         <creationConstraints

-            sourceEnd="/0/@expressionProviders/@providers.0/@expressions.8"/>

+            sourceEnd="/0/@expressionProviders/@providers.0/@expressions.8"

+            targetEnd="/0/@expressionProviders/@providers.0/@expressions.9"/>

       </links>

       <links

           visualID="4008">

@@ -2586,7 +2589,8 @@
           </modelFacet>

         </labels>

         <creationConstraints

-            sourceEnd="/0/@expressionProviders/@providers.0/@expressions.10"/>

+            sourceEnd="/0/@expressionProviders/@providers.0/@expressions.12"

+            targetEnd="/0/@expressionProviders/@providers.0/@expressions.13"/>

       </links>

       <links

           visualID="4018"

@@ -2629,7 +2633,8 @@
               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Dependency/supplier"/>

         </modelFacet>

         <creationConstraints

-            sourceEnd="/0/@expressionProviders/@providers.0/@expressions.10"/>

+            sourceEnd="/0/@expressionProviders/@providers.0/@expressions.12"

+            targetEnd="/0/@expressionProviders/@providers.0/@expressions.13"/>

       </links>

       <links

           visualID="1064">

@@ -2714,7 +2719,8 @@
           </modelFacet>

         </labels>

         <creationConstraints

-            sourceEnd="/0/@expressionProviders/@providers.0/@expressions.11"/>

+            sourceEnd="/0/@expressionProviders/@providers.0/@expressions.14"

+            targetEnd="/0/@expressionProviders/@providers.0/@expressions.15"/>

       </links>

       <links

           visualID="1065">

@@ -2772,7 +2778,7 @@
           </modelFacet>

         </labels>

         <creationConstraints

-            sourceEnd="/0/@expressionProviders/@providers.0/@expressions.12"/>

+            sourceEnd="/0/@expressionProviders/@providers.0/@expressions.16"/>

       </links>

       <links

           visualID="1022"

@@ -2800,7 +2806,7 @@
               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/annotatedElement"/>

         </modelFacet>

         <creationConstraints

-            targetEnd="/0/@expressionProviders/@providers.0/@expressions.13"/>

+            targetEnd="/0/@expressionProviders/@providers.0/@expressions.17"/>

       </links>

       <links

           visualID="4014">

@@ -2824,7 +2830,7 @@
               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/constrainedElement"/>

         </modelFacet>

         <creationConstraints

-            targetEnd="/0/@expressionProviders/@providers.0/@expressions.14"/>

+            targetEnd="/0/@expressionProviders/@providers.0/@expressions.18"/>

       </links>

       <compartments

           visualID="1005"

@@ -3541,19 +3547,31 @@
             body="org.eclipse.uml2.uml.LiteralString literalString=org.eclipse.uml2.uml.UMLFactory.eINSTANCE.createLiteralString();&#xD;&#xA;literalString.setValue(&quot;&quot;);&#xD;&#xA;return literalString;"/>

         <expressions

             xsi:type="gmfgen:GenConstraint"

-            body="//GeneralizationSource&#xD;&#xA;if((source instanceof org.eclipse.uml2.uml.Type) &amp;&amp; org.eclipse.papyrus.profile.utils.Util.isMetaclass((org.eclipse.uml2.uml.Type)source)) {&#xD;&#xA;&#x9;return false;&#xD;&#xA;}"/>

+            body="//GeneralizationSource&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;if(!(source instanceof org.eclipse.uml2.uml.Classifier)) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;if(org.eclipse.papyrus.profile.utils.Util.isMetaclass(source)) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;if(source instanceof org.eclipse.uml2.uml.Extension){&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;return false; //meaningless&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;}"/>

+        <expressions

+            xsi:type="gmfgen:GenConstraint"

+            body="//GeneralizationTarget&#xD;&#xA;if(target != null) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;if(!(target instanceof org.eclipse.uml2.uml.Classifier)) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;if(Util.isMetaclass(target)) {&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;return false;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;if(target instanceof org.eclipse.uml2.uml.Extension){&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;return false;//meaningless&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;}"/>

+        <expressions

+            xsi:type="gmfgen:GenConstraint"

+            body="//AssociationSource&#xD;&#xA;if((source instanceof org.eclipse.uml2.uml.Type) &amp;&amp; org.eclipse.papyrus.profile.utils.Util.isMetaclass((org.eclipse.uml2.uml.Type)source)) {&#xD;&#xA;&#x9;return false;&#xD;&#xA;}&#xD;&#xA;if(source instanceof org.eclipse.uml2.uml.Extension){&#xD;&#xA;&#x9;return false;&#xD;&#xA;}"/>

+        <expressions

+            xsi:type="gmfgen:GenConstraint"

+            body="//AssociationTarget&#xD;&#xA;if(target!=null){&#xD;&#xA;&#x9;if(target instanceof org.eclipse.uml2.uml.Extension){&#xD;&#xA;&#x9;&#x9;return false;&#xD;&#xA;&#x9;}&#xD;&#xA;}"/>

+        <expressions

+            xsi:type="gmfgen:GenConstraint"

+            body="//DependencySource&#xD;&#xA;if((source instanceof org.eclipse.uml2.uml.Type) &amp;&amp; org.eclipse.papyrus.profile.utils.Util.isMetaclass((org.eclipse.uml2.uml.Type)source)) {&#xD;&#xA;&#x9;return false;&#xD;&#xA;}&#xD;&#xA;if(source instanceof org.eclipse.uml2.uml.Extension){&#xD;&#xA;&#x9;return false;&#xD;&#xA;}"/>

         <expressions

             xsi:type="gmfgen:GenConstraint"

-            body="//AssociationSource&#xD;&#xA;if((source instanceof org.eclipse.uml2.uml.Type) &amp;&amp; org.eclipse.papyrus.profile.utils.Util.isMetaclass((org.eclipse.uml2.uml.Type)source)) {&#xD;&#xA;&#x9;return false;&#xD;&#xA;}"/>

+            body="//DependencyTarget &#xD;&#xA;if(target!=null){&#xD;&#xA;&#x9;if(target instanceof org.eclipse.uml2.uml.Extension){&#xD;&#xA;&#x9;&#x9;return false;&#xD;&#xA;&#x9;}&#xD;&#xA;}"/>

         <expressions

             xsi:type="gmfgen:GenConstraint"

-            body="//DependencySource&#xD;&#xA;if((source instanceof org.eclipse.uml2.uml.Type) &amp;&amp; org.eclipse.papyrus.profile.utils.Util.isMetaclass((org.eclipse.uml2.uml.Type)source)) {&#xD;&#xA;&#x9;return false;&#xD;&#xA;}"/>

+            body="//ElementImportSource&#xD;&#xA;if((source instanceof org.eclipse.uml2.uml.Type) &amp;&amp; org.eclipse.papyrus.profile.utils.Util.isMetaclass((org.eclipse.uml2.uml.Type)source)) {&#xD;&#xA;&#x9;return false;&#xD;&#xA;}&#xD;&#xA;if(source instanceof  org.eclipse.uml2.uml.Extension){&#xD;&#xA;&#x9;return false;&#xD;&#xA;}"/>

         <expressions

             xsi:type="gmfgen:GenConstraint"

-            body="//ElementImportSource&#xD;&#xA;if((source instanceof org.eclipse.uml2.uml.Type) &amp;&amp; org.eclipse.papyrus.profile.utils.Util.isMetaclass((org.eclipse.uml2.uml.Type)source)) {&#xD;&#xA;&#x9;return false;&#xD;&#xA;}"/>

+            body="//ElementImportTarget&#xD;&#xA;if(target!=null){&#xD;&#xA;&#x9;if(target instanceof  org.eclipse.uml2.uml.Extension){&#xD;&#xA;&#x9;&#x9;return false;&#xD;&#xA;&#x9;}&#xD;&#xA;}"/>

         <expressions

             xsi:type="gmfgen:GenConstraint"

-            body="//PackageImportSource&#xD;&#xA;if((source instanceof org.eclipse.uml2.uml.Type) &amp;&amp; org.eclipse.papyrus.profile.utils.Util.isMetaclass((org.eclipse.uml2.uml.Type)source)) {&#xD;&#xA;&#x9;return false;&#xD;&#xA;}"/>

+            body="//PackageImportSource&#xD;&#xA;if((source instanceof org.eclipse.uml2.uml.Type) &amp;&amp; org.eclipse.papyrus.profile.utils.Util.isMetaclass((org.eclipse.uml2.uml.Type)source)) {&#xD;&#xA;&#x9;return false;&#xD;&#xA;}&#xD;&#xA;if(source instanceof org.eclipse.uml2.uml.Extension){&#xD;&#xA;&#x9;return false;&#xD;&#xA;}"/>

         <expressions

             xsi:type="gmfgen:GenConstraint"

             body="//AnnotatedElementLink target&#xD;&#xA;if((target instanceof org.eclipse.uml2.uml.Type) &amp;&amp; org.eclipse.papyrus.profile.utils.Util.isMetaclass((org.eclipse.uml2.uml.Type)target)) {&#xD;&#xA;&#x9;return false;&#xD;&#xA;}"/>

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationAppliedStereotypeEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationAppliedStereotypeEditPart.java
index 16c251a8f99..8731e707fea 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationAppliedStereotypeEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationAppliedStereotypeEditPart.java
@@ -597,15 +597,7 @@ public class AssociationAppliedStereotypeEditPart extends LabelEditPart implemen
 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if(checkExtendedEditor()) {

-			initExtendedEditorConfiguration();

-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

-		}

-		if(checkDefaultEdition()) {

-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

-		}

-

-		// not a named element. no specific editor => do nothing

+		// The label is read-only (defined in GMFGen model)

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationBranchMultiplicityEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationBranchMultiplicityEditPart.java
index 317a4bef222..0decab03e20 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationBranchMultiplicityEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationBranchMultiplicityEditPart.java
@@ -599,15 +599,7 @@ public class AssociationBranchMultiplicityEditPart extends LabelEditPart impleme
 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if(checkExtendedEditor()) {

-			initExtendedEditorConfiguration();

-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

-		}

-		if(checkDefaultEdition()) {

-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

-		}

-

-		// not a named element. no specific editor => do nothing

+		// The label is read-only (defined in GMFGen model)

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationBranchRoleEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationBranchRoleEditPart.java
index 45ac11d83d7..f43f14a9220 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationBranchRoleEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationBranchRoleEditPart.java
@@ -599,15 +599,7 @@ public class AssociationBranchRoleEditPart extends LabelEditPart implements ITex
 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if(checkExtendedEditor()) {

-			initExtendedEditorConfiguration();

-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

-		}

-		if(checkDefaultEdition()) {

-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

-		}

-

-		// not a named element. no specific editor => do nothing

+		// The label is read-only (defined in GMFGen model)

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationRoleSourceEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationRoleSourceEditPart.java
index cbae15bbd0e..ba841bb652f 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationRoleSourceEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationRoleSourceEditPart.java
@@ -599,15 +599,7 @@ public class AssociationRoleSourceEditPart extends LabelEditPart implements ITex
 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if(checkExtendedEditor()) {

-			initExtendedEditorConfiguration();

-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

-		}

-		if(checkDefaultEdition()) {

-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

-		}

-

-		// not a named element. no specific editor => do nothing

+		// The label is read-only (defined in GMFGen model)

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationRoleTargetEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationRoleTargetEditPart.java
index a1fa253d8f2..6fbafd600e3 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationRoleTargetEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/AssociationRoleTargetEditPart.java
@@ -599,15 +599,7 @@ public class AssociationRoleTargetEditPart extends LabelEditPart implements ITex
 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if(checkExtendedEditor()) {

-			initExtendedEditorConfiguration();

-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

-		}

-		if(checkDefaultEdition()) {

-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

-		}

-

-		// not a named element. no specific editor => do nothing

+		// The label is read-only (defined in GMFGen model)

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/DependencyAppliedStereotypeEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/DependencyAppliedStereotypeEditPart.java
index 9ec973c628f..f8b5d5fcfbd 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/DependencyAppliedStereotypeEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/DependencyAppliedStereotypeEditPart.java
@@ -597,15 +597,7 @@ public class DependencyAppliedStereotypeEditPart extends LabelEditPart implement
 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if(checkExtendedEditor()) {

-			initExtendedEditorConfiguration();

-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

-		}

-		if(checkDefaultEdition()) {

-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

-		}

-

-		// not a named element. no specific editor => do nothing

+		// The label is read-only (defined in GMFGen model)

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/GeneralizationAppliedStereotypeEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/GeneralizationAppliedStereotypeEditPart.java
index fbe3ef3b2cb..31192319921 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/GeneralizationAppliedStereotypeEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/GeneralizationAppliedStereotypeEditPart.java
@@ -597,15 +597,7 @@ public class GeneralizationAppliedStereotypeEditPart extends LabelEditPart imple
 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if(checkExtendedEditor()) {

-			initExtendedEditorConfiguration();

-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

-		}

-		if(checkDefaultEdition()) {

-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

-		}

-

-		// not a named element. no specific editor => do nothing

+		// The label is read-only (defined in GMFGen model)

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/PackageImportAppliedStereotypeEditPart.java b/plugins/uml/org.eclipse.papyrus.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/PackageImportAppliedStereotypeEditPart.java
index fd54fbf67a2..223de307d02 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/PackageImportAppliedStereotypeEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/parts/PackageImportAppliedStereotypeEditPart.java
@@ -597,15 +597,7 @@ public class PackageImportAppliedStereotypeEditPart extends LabelEditPart implem
 	 * @generated

 	 */

 	public int getDirectEditionType() {

-		if(checkExtendedEditor()) {

-			initExtendedEditorConfiguration();

-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

-		}

-		if(checkDefaultEdition()) {

-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

-		}

-

-		// not a named element. no specific editor => do nothing

+		// The label is read-only (defined in GMFGen model)

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

 

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/UMLBaseItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/UMLBaseItemSemanticEditPolicy.java
index f19bac89cfe..f825e3e0739 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/UMLBaseItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.profile/src/org/eclipse/papyrus/diagram/profile/edit/policies/UMLBaseItemSemanticEditPolicy.java
@@ -112,6 +112,7 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 	 * 

 	 * @generated

 	 */

+	@Override

 	@SuppressWarnings("unchecked")

 	public Command getCommand(Request request) {

 		if(request instanceof ReconnectRequest) {

@@ -138,6 +139,7 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 	/**

 	 * @generated

 	 */

+	@Override

 	protected Command getSemanticCommand(IEditCommandRequest request) {

 		IEditCommandRequest completedRequest = completeRequest(request);

 		Command semanticCommand = getSemanticCommandSwitch(completedRequest);

@@ -490,6 +492,15 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 				if((source instanceof Type) && Util.isMetaclass((Type)source)) {

 					return false;

 				}

+				if(source instanceof Extension) {

+					return false;

+				}

+				//AssociationTarget

+				if(target != null) {

+					if(target instanceof Extension) {

+						return false;

+					}

+				}

 				return true;

 			} catch (Exception e) {

 				UMLDiagramEditorPlugin.getInstance().logError("Link constraint evaluation error", e); //$NON-NLS-1$

@@ -513,6 +524,15 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 				if((source instanceof Type) && Util.isMetaclass((Type)source)) {

 					return false;

 				}

+				if(source instanceof Extension) {

+					return false;

+				}

+				//AssociationTarget

+				if(target != null) {

+					if(target instanceof Extension) {

+						return false;

+					}

+				}

 				return true;

 			} catch (Exception e) {

 				UMLDiagramEditorPlugin.getInstance().logError("Link constraint evaluation error", e); //$NON-NLS-1$

@@ -526,9 +546,27 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		public boolean canExistGeneralization_4002(Generalization linkInstance, Classifier source, Classifier target) {

 			try {

 				//GeneralizationSource

-				if((source instanceof Type) && Util.isMetaclass((Type)source)) {

+				if(!(source instanceof Classifier)) {

+					return false;

+				}

+				if(Util.isMetaclass(source)) {

 					return false;

 				}

+				if(source instanceof Extension) {

+					return false; //meaningless

+				}

+				//GeneralizationTarget

+				if(target != null) {

+					if(!(target instanceof Classifier)) {

+						return false;

+					}

+					if(Util.isMetaclass(target)) {

+						return false;

+					}

+					if(target instanceof Extension) {

+						return false;//meaningless

+					}

+				}

 				return true;

 			} catch (Exception e) {

 				UMLDiagramEditorPlugin.getInstance().logError("Link constraint evaluation error", e); //$NON-NLS-1$

@@ -545,6 +583,15 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 				if((source instanceof Type) && Util.isMetaclass((Type)source)) {

 					return false;

 				}

+				if(source instanceof Extension) {

+					return false;

+				}

+				//DependencyTarget 

+				if(target != null) {

+					if(target instanceof Extension) {

+						return false;

+					}

+				}

 				return true;

 			} catch (Exception e) {

 				UMLDiagramEditorPlugin.getInstance().logError("Link constraint evaluation error", e); //$NON-NLS-1$

@@ -561,6 +608,15 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 				if((source instanceof Type) && Util.isMetaclass((Type)source)) {

 					return false;

 				}

+				if(source instanceof Extension) {

+					return false;

+				}

+				//DependencyTarget 

+				if(target != null) {

+					if(target instanceof Extension) {

+						return false;

+					}

+				}

 				return true;

 			} catch (Exception e) {

 				UMLDiagramEditorPlugin.getInstance().logError("Link constraint evaluation error", e); //$NON-NLS-1$

@@ -577,6 +633,15 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 				if((source instanceof Type) && Util.isMetaclass((Type)source)) {

 					return false;

 				}

+				if(source instanceof Extension) {

+					return false;

+				}

+				//ElementImportTarget

+				if(target != null) {

+					if(target instanceof Extension) {

+						return false;

+					}

+				}

 				return true;

 			} catch (Exception e) {

 				UMLDiagramEditorPlugin.getInstance().logError("Link constraint evaluation error", e); //$NON-NLS-1$

@@ -593,6 +658,9 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 				if((source instanceof Type) && Util.isMetaclass((Type)source)) {

 					return false;

 				}

+				if(source instanceof Extension) {

+					return false;

+				}

 				return true;

 			} catch (Exception e) {

 				UMLDiagramEditorPlugin.getInstance().logError("Link constraint evaluation error", e); //$NON-NLS-1$

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.sequence/messages.properties b/plugins/uml/org.eclipse.papyrus.diagram.sequence/messages.properties
index 2defe5d9f1e..fe766b4ac44 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.sequence/messages.properties
+++ b/plugins/uml/org.eclipse.papyrus.diagram.sequence/messages.properties
@@ -175,10 +175,6 @@ createMessageLost6CreationTool_title=Message Lost
 createMessageLost6CreationTool_desc=Create MessageLost
 createMessageFound7CreationTool_title=Message Found
 createMessageFound7CreationTool_desc=Create MessageFound
-createCommentlink8CreationTool_title=Comment link
-createCommentlink8CreationTool_desc=Create a comment link
-createConstraintlink9CreationTool_title=Constraint link
-createConstraintlink9CreationTool_desc=Create a constraint link
 NavigatorGroupName_Message_4007_incominglinks=incoming links
 NavigatorGroupName_Message_4007_outgoinglinks=outgoing links
 NavigatorGroupName_Message_4004_incominglinks=incoming links
diff --git a/plugins/uml/org.eclipse.papyrus.properties.tabbed.uml/resources/uml_generic_sections.xml b/plugins/uml/org.eclipse.papyrus.properties.tabbed.uml/resources/uml_generic_sections.xml
index 746160aa2c1..df13f606542 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.tabbed.uml/resources/uml_generic_sections.xml
+++ b/plugins/uml/org.eclipse.papyrus.properties.tabbed.uml/resources/uml_generic_sections.xml
@@ -3257,14 +3257,14 @@
 						<layout kind="Grid" numColumns="2" sameWidth="true"/>

 					</container>

 					<container>

-						<controller predefinedId="UML_Property_subsettedProperty"/>

-						<layout kind="Grid" numColumns="1" sameWidth="true"/>

-					</container>

-					<container>

 						<controller predefinedId="UML_Port_provided"/>

 						<controller predefinedId="UML_Port_required"/>

 						<layout kind="Grid" numColumns="2" sameWidth="true"/>

 					</container>

+					<container>

+						<controller predefinedId="UML_Property_subsettedProperty"/>

+						<layout kind="Grid" numColumns="1" sameWidth="true"/>

+					</container>

 				</content>

 			</fragment>

 		</section>

diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/plugin.xml b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/plugin.xml
index 82506e6bb8d..caade348190 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/plugin.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/plugin.xml
@@ -677,6 +677,13 @@
 		defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.GateHandler">

 	</command>

 	

+	<!-- Creation command for GeneralOrdering -->
+	<command categoryId="org.eclipse.papyrus.editor.category"
+		id="org.eclipse.papyrus.uml.modelexplorer.GeneralOrderingCreateCommand"
+		name="Create a new GeneralOrdering" description="Create a new GeneralOrdering"
+		defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.GeneralOrderingHandler">
+	</command>
+	
 	<!-- Creation command for Generalization -->

 	<command categoryId="org.eclipse.papyrus.editor.category"

 		id="org.eclipse.papyrus.uml.modelexplorer.GeneralizationCreateCommand"

@@ -691,13 +698,6 @@
 		defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.GeneralizationSetHandler">

 	</command>

 	

-	<!-- Creation command for GeneralOrdering -->

-	<command categoryId="org.eclipse.papyrus.editor.category"

-		id="org.eclipse.papyrus.uml.modelexplorer.GeneralOrderingCreateCommand"

-		name="Create a new GeneralOrdering" description="Create a new GeneralOrdering"

-		defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.GeneralOrderingHandler">

-	</command>

-	

 	<!-- Creation command for Image -->

 	<command categoryId="org.eclipse.papyrus.editor.category"

 		id="org.eclipse.papyrus.uml.modelexplorer.ImageCreateCommand"

@@ -1502,8 +1502,7 @@
 <!-- UI Menu declaration for creation commands -->

 <extension point="org.eclipse.ui.menus">

 

-	<menuContribution locationURI="popup:org.eclipse.papyrus.modelexplorer.popupmenu.createchild"

-		allPopups="false">

+	<menuContribution locationURI="popup:org.eclipse.papyrus.modelexplorer.popupmenu.createchild" allPopups="false">
 	

 		<!-- Creation menu action for Abstraction -->

 		<command commandId="org.eclipse.papyrus.uml.modelexplorer.AbstractionCreateCommand"

@@ -2079,6 +2078,13 @@
 			<visibleWhen checkEnabled="true"/>

 		</command>

 		

+		<!-- Creation menu action for GeneralOrdering -->
+		<command commandId="org.eclipse.papyrus.uml.modelexplorer.GeneralOrderingCreateCommand"
+			label="Create a new GeneralOrdering" tooltip="Create a new GeneralOrdering" style="push"		
+			icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/GeneralOrdering.gif" >
+			<visibleWhen checkEnabled="true"/>
+		</command>
+		
 		<!-- Creation menu action for Generalization -->

 		<command commandId="org.eclipse.papyrus.uml.modelexplorer.GeneralizationCreateCommand"

 			label="Create a new Generalization" tooltip="Create a new Generalization" style="push"		

@@ -2093,13 +2099,6 @@
 			<visibleWhen checkEnabled="true"/>

 		</command>

 		

-		<!-- Creation menu action for GeneralOrdering -->

-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.GeneralOrderingCreateCommand"

-			label="Create a new GeneralOrdering" tooltip="Create a new GeneralOrdering" style="push"		

-			icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/GeneralOrdering.gif" >

-			<visibleWhen checkEnabled="true"/>

-		</command>

-		

 		<!-- Creation menu action for Image -->

 		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ImageCreateCommand"

 			label="Create a new Image" tooltip="Create a new Image" style="push"		

diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/handler/CommandFilter.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/filter/CommandFilter.java
index b34e320e0f0..c8c7e90537f 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/handler/CommandFilter.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/filter/CommandFilter.java
@@ -1,233 +1,220 @@
-/*****************************************************************************

- * Copyright (c) 2010 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:

- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.modelexplorer.handler;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;

-

-public class CommandFilter {

-

-	private static List<IElementType> visibleCommands;

-

-	public static List<IElementType> getVisibleCommands() {

-		if(visibleCommands == null) {

-			visibleCommands = new ArrayList<IElementType>();

-

-			visibleCommands.add(UMLElementTypes.COMMENT);

-			visibleCommands.add(UMLElementTypes.PACKAGE);

-			visibleCommands.add(UMLElementTypes.CLASS);

-			//			visibleCommands.add(UMLElementTypes.DEPENDENCY);

-			visibleCommands.add(UMLElementTypes.ELEMENT_IMPORT);

-			visibleCommands.add(UMLElementTypes.PACKAGE_IMPORT);

-			visibleCommands.add(UMLElementTypes.CONSTRAINT);

-			//			visibleCommands.add(UMLElementTypes.ASSOCIATION);

-			visibleCommands.add(UMLElementTypes.TEMPLATE_BINDING);

-			visibleCommands.add(UMLElementTypes.TEMPLATE_SIGNATURE);

-			visibleCommands.add(UMLElementTypes.TEMPLATE_PARAMETER);

-			visibleCommands.add(UMLElementTypes.TEMPLATE_PARAMETER_SUBSTITUTION);

-			//			visibleCommands.add(UMLElementTypes.GENERALIZATION);

-			//			visibleCommands.add(UMLElementTypes.GENERALIZATION_SET);

-			//			visibleCommands.add(UMLElementTypes.SUBSTITUTION);

-			//			visibleCommands.add(UMLElementTypes.REALIZATION);

-			//			visibleCommands.add(UMLElementTypes.ABSTRACTION);

-			visibleCommands.add(UMLElementTypes.OPAQUE_EXPRESSION);

-			visibleCommands.add(UMLElementTypes.PARAMETER);

-			visibleCommands.add(UMLElementTypes.CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER);

-			visibleCommands.add(UMLElementTypes.PROPERTY);

-			//			visibleCommands.add(UMLElementTypes.DEPLOYMENT);

-			visibleCommands.add(UMLElementTypes.DEPLOYMENT_SPECIFICATION);

-			visibleCommands.add(UMLElementTypes.ARTIFACT);

-			//			visibleCommands.add(UMLElementTypes.MANIFESTATION);

-			visibleCommands.add(UMLElementTypes.OPERATION);

-			//			visibleCommands.add(UMLElementTypes.INTERFACE_REALIZATION);

-			visibleCommands.add(UMLElementTypes.INTERFACE);

-			visibleCommands.add(UMLElementTypes.RECEPTION);

-			visibleCommands.add(UMLElementTypes.SIGNAL);

-			visibleCommands.add(UMLElementTypes.PROTOCOL_STATE_MACHINE);

-			visibleCommands.add(UMLElementTypes.STATE_MACHINE);

-			visibleCommands.add(UMLElementTypes.REGION);

-			//			visibleCommands.add(UMLElementTypes.TRANSITION);

-			visibleCommands.add(UMLElementTypes.TRIGGER);

-			visibleCommands.add(UMLElementTypes.PORT);

-			visibleCommands.add(UMLElementTypes.STATE);

-			//			visibleCommands.add(UMLElementTypes.CONNECTION_POINT_REFERENCE);

-			//			visibleCommands.add(UMLElementTypes.PSEUDOSTATE);

-			//			visibleCommands.add(UMLElementTypes.PROTOCOL_CONFORMANCE);

-			//			visibleCommands.add(UMLElementTypes.CONNECTOR);

-			//			visibleCommands.add(UMLElementTypes.CONNECTOR_END);

-			//			visibleCommands.add(UMLElementTypes.EXTENSION);

-			//			visibleCommands.add(UMLElementTypes.EXTENSION_END);

-			visibleCommands.add(UMLElementTypes.STEREOTYPE);

-			visibleCommands.add(UMLElementTypes.IMAGE);

-			visibleCommands.add(UMLElementTypes.PROFILE);

-			visibleCommands.add(UMLElementTypes.MODEL);

-			visibleCommands.add(UMLElementTypes.PARAMETER_SET);

-			visibleCommands.add(UMLElementTypes.DATA_TYPE);

-			visibleCommands.add(UMLElementTypes.OPERATION_TEMPLATE_PARAMETER);

-			visibleCommands.add(UMLElementTypes.COLLABORATION_USE);

-			visibleCommands.add(UMLElementTypes.COLLABORATION);

-			visibleCommands.add(UMLElementTypes.USE_CASE);

-			//			visibleCommands.add(UMLElementTypes.INCLUDE);

-			//			visibleCommands.add(UMLElementTypes.EXTEND);

-			visibleCommands.add(UMLElementTypes.EXTENSION_POINT);

-			visibleCommands.add(UMLElementTypes.REDEFINABLE_TEMPLATE_SIGNATURE);

-			visibleCommands.add(UMLElementTypes.CLASSIFIER_TEMPLATE_PARAMETER);

-			visibleCommands.add(UMLElementTypes.STRING_EXPRESSION);

-			visibleCommands.add(UMLElementTypes.EXPRESSION);

-			//			visibleCommands.add(UMLElementTypes.USAGE);

-			//			visibleCommands.add(UMLElementTypes.PACKAGE_MERGE);

-			//			visibleCommands.add(UMLElementTypes.PROFILE_APPLICATION);

-			visibleCommands.add(UMLElementTypes.ENUMERATION);

-			visibleCommands.add(UMLElementTypes.ENUMERATION_LITERAL);

-			visibleCommands.add(UMLElementTypes.INSTANCE_SPECIFICATION);

-			visibleCommands.add(UMLElementTypes.SLOT);

-			visibleCommands.add(UMLElementTypes.PRIMITIVE_TYPE);

-			visibleCommands.add(UMLElementTypes.LITERAL_INTEGER);

-			visibleCommands.add(UMLElementTypes.LITERAL_BOOLEAN);

-			visibleCommands.add(UMLElementTypes.LITERAL_STRING);

-			visibleCommands.add(UMLElementTypes.LITERAL_NULL);

-			visibleCommands.add(UMLElementTypes.INSTANCE_VALUE);

-			visibleCommands.add(UMLElementTypes.LITERAL_UNLIMITED_NATURAL);

-			visibleCommands.add(UMLElementTypes.OPAQUE_BEHAVIOR);

-			visibleCommands.add(UMLElementTypes.FUNCTION_BEHAVIOR);

-			visibleCommands.add(UMLElementTypes.OPAQUE_ACTION);

-			visibleCommands.add(UMLElementTypes.STRUCTURED_ACTIVITY_NODE);

-			visibleCommands.add(UMLElementTypes.ACTIVITY);

-			visibleCommands.add(UMLElementTypes.VARIABLE);

-			visibleCommands.add(UMLElementTypes.ACTIVITY_PARTITION);

-			visibleCommands.add(UMLElementTypes.INTERRUPTIBLE_ACTIVITY_REGION);

-			visibleCommands.add(UMLElementTypes.EXCEPTION_HANDLER);

-			visibleCommands.add(UMLElementTypes.OUTPUT_PIN);

-			visibleCommands.add(UMLElementTypes.PIN);

-			visibleCommands.add(UMLElementTypes.INPUT_PIN);

-			visibleCommands.add(UMLElementTypes.SEND_SIGNAL_ACTION);

-			visibleCommands.add(UMLElementTypes.CALL_OPERATION_ACTION);

-			visibleCommands.add(UMLElementTypes.CALL_BEHAVIOR_ACTION);

-			visibleCommands.add(UMLElementTypes.SEQUENCE_NODE);

-			visibleCommands.add(UMLElementTypes.CONTROL_FLOW);

-			visibleCommands.add(UMLElementTypes.INITIAL_NODE);

-			visibleCommands.add(UMLElementTypes.ACTIVITY_PARAMETER_NODE);

-			visibleCommands.add(UMLElementTypes.VALUE_PIN);

-			//			visibleCommands.add(UMLElementTypes.MESSAGE);

-			visibleCommands.add(UMLElementTypes.INTERACTION);

-			visibleCommands.add(UMLElementTypes.LIFELINE);

-			visibleCommands.add(UMLElementTypes.PART_DECOMPOSITION);

-			visibleCommands.add(UMLElementTypes.INTERACTION_USE);

-			visibleCommands.add(UMLElementTypes.GATE);

-			visibleCommands.add(UMLElementTypes.GENERAL_ORDERING);

-			visibleCommands.add(UMLElementTypes.OCCURRENCE_SPECIFICATION);

-			visibleCommands.add(UMLElementTypes.INTERACTION_OPERAND);

-			visibleCommands.add(UMLElementTypes.INTERACTION_CONSTRAINT);

-			visibleCommands.add(UMLElementTypes.STATE_INVARIANT);

-			visibleCommands.add(UMLElementTypes.ACTION_EXECUTION_SPECIFICATION);

-			visibleCommands.add(UMLElementTypes.BEHAVIOR_EXECUTION_SPECIFICATION);

-			visibleCommands.add(UMLElementTypes.EXECUTION_EVENT);

-			visibleCommands.add(UMLElementTypes.CREATION_EVENT);

-			visibleCommands.add(UMLElementTypes.DESTRUCTION_EVENT);

-			visibleCommands.add(UMLElementTypes.SEND_OPERATION_EVENT);

-			visibleCommands.add(UMLElementTypes.SEND_SIGNAL_EVENT);

-			visibleCommands.add(UMLElementTypes.MESSAGE_OCCURRENCE_SPECIFICATION);

-			visibleCommands.add(UMLElementTypes.EXECUTION_OCCURRENCE_SPECIFICATION);

-			visibleCommands.add(UMLElementTypes.RECEIVE_OPERATION_EVENT);

-			visibleCommands.add(UMLElementTypes.RECEIVE_SIGNAL_EVENT);

-			visibleCommands.add(UMLElementTypes.ACTOR);

-			visibleCommands.add(UMLElementTypes.CALL_EVENT);

-			visibleCommands.add(UMLElementTypes.CHANGE_EVENT);

-			visibleCommands.add(UMLElementTypes.SIGNAL_EVENT);

-			visibleCommands.add(UMLElementTypes.ANY_RECEIVE_EVENT);

-			visibleCommands.add(UMLElementTypes.FORK_NODE);

-			visibleCommands.add(UMLElementTypes.FLOW_FINAL_NODE);

-			visibleCommands.add(UMLElementTypes.CENTRAL_BUFFER_NODE);

-			visibleCommands.add(UMLElementTypes.MERGE_NODE);

-			visibleCommands.add(UMLElementTypes.DECISION_NODE);

-			visibleCommands.add(UMLElementTypes.ACTIVITY_FINAL_NODE);

-			//			visibleCommands.add(UMLElementTypes.COMPONENT_REALIZATION);

-			visibleCommands.add(UMLElementTypes.COMPONENT);

-			visibleCommands.add(UMLElementTypes.NODE);

-			visibleCommands.add(UMLElementTypes.DEVICE);

-			visibleCommands.add(UMLElementTypes.EXECUTION_ENVIRONMENT);

-			//			visibleCommands.add(UMLElementTypes.COMMUNICATION_PATH);

-			visibleCommands.add(UMLElementTypes.COMBINED_FRAGMENT);

-			visibleCommands.add(UMLElementTypes.CONTINUATION);

-			visibleCommands.add(UMLElementTypes.CONSIDER_IGNORE_FRAGMENT);

-			visibleCommands.add(UMLElementTypes.CREATE_OBJECT_ACTION);

-			visibleCommands.add(UMLElementTypes.DESTROY_OBJECT_ACTION);

-			visibleCommands.add(UMLElementTypes.TEST_IDENTITY_ACTION);

-			visibleCommands.add(UMLElementTypes.READ_SELF_ACTION);

-			visibleCommands.add(UMLElementTypes.READ_STRUCTURAL_FEATURE_ACTION);

-			visibleCommands.add(UMLElementTypes.CLEAR_STRUCTURAL_FEATURE_ACTION);

-			visibleCommands.add(UMLElementTypes.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION);

-			visibleCommands.add(UMLElementTypes.ADD_STRUCTURAL_FEATURE_VALUE_ACTION);

-			visibleCommands.add(UMLElementTypes.LINK_END_DATA);

-			visibleCommands.add(UMLElementTypes.QUALIFIER_VALUE);

-			visibleCommands.add(UMLElementTypes.READ_LINK_ACTION);

-			visibleCommands.add(UMLElementTypes.LINK_END_CREATION_DATA);

-			visibleCommands.add(UMLElementTypes.CREATE_LINK_ACTION);

-			visibleCommands.add(UMLElementTypes.DESTROY_LINK_ACTION);

-			visibleCommands.add(UMLElementTypes.LINK_END_DESTRUCTION_DATA);

-			visibleCommands.add(UMLElementTypes.CLEAR_ASSOCIATION_ACTION);

-			visibleCommands.add(UMLElementTypes.BROADCAST_SIGNAL_ACTION);

-			visibleCommands.add(UMLElementTypes.SEND_OBJECT_ACTION);

-			visibleCommands.add(UMLElementTypes.VALUE_SPECIFICATION);

-			visibleCommands.add(UMLElementTypes.TIME_EXPRESSION);

-			visibleCommands.add(UMLElementTypes.DURATION);

-			visibleCommands.add(UMLElementTypes.DURATION_INTERVAL);

-			visibleCommands.add(UMLElementTypes.INTERVAL);

-			visibleCommands.add(UMLElementTypes.TIME_CONSTRAINT);

-			visibleCommands.add(UMLElementTypes.INTERVAL_CONSTRAINT);

-			visibleCommands.add(UMLElementTypes.TIME_INTERVAL);

-			visibleCommands.add(UMLElementTypes.DURATION_CONSTRAINT);

-			visibleCommands.add(UMLElementTypes.TIME_OBSERVATION);

-			visibleCommands.add(UMLElementTypes.DURATION_OBSERVATION);

-			visibleCommands.add(UMLElementTypes.FINAL_STATE);

-			visibleCommands.add(UMLElementTypes.TIME_EVENT);

-			visibleCommands.add(UMLElementTypes.READ_VARIABLE_ACTION);

-			visibleCommands.add(UMLElementTypes.CLEAR_VARIABLE_ACTION);

-			visibleCommands.add(UMLElementTypes.ADD_VARIABLE_VALUE_ACTION);

-			visibleCommands.add(UMLElementTypes.REMOVE_VARIABLE_VALUE_ACTION);

-			visibleCommands.add(UMLElementTypes.RAISE_EXCEPTION_ACTION);

-			visibleCommands.add(UMLElementTypes.ACTION_INPUT_PIN);

-			visibleCommands.add(UMLElementTypes.INFORMATION_ITEM);

-			//			visibleCommands.add(UMLElementTypes.INFORMATION_FLOW);

-			visibleCommands.add(UMLElementTypes.READ_EXTENT_ACTION);

-			visibleCommands.add(UMLElementTypes.RECLASSIFY_OBJECT_ACTION);

-			visibleCommands.add(UMLElementTypes.READ_IS_CLASSIFIED_OBJECT_ACTION);

-			visibleCommands.add(UMLElementTypes.START_CLASSIFIER_BEHAVIOR_ACTION);

-			visibleCommands.add(UMLElementTypes.READ_LINK_OBJECT_END_ACTION);

-			visibleCommands.add(UMLElementTypes.READ_LINK_OBJECT_END_QUALIFIER_ACTION);

-			visibleCommands.add(UMLElementTypes.CREATE_LINK_OBJECT_ACTION);

-			visibleCommands.add(UMLElementTypes.ACCEPT_EVENT_ACTION);

-			visibleCommands.add(UMLElementTypes.ACCEPT_CALL_ACTION);

-			visibleCommands.add(UMLElementTypes.REPLY_ACTION);

-			visibleCommands.add(UMLElementTypes.UNMARSHALL_ACTION);

-			visibleCommands.add(UMLElementTypes.REDUCE_ACTION);

-			visibleCommands.add(UMLElementTypes.JOIN_NODE);

-			visibleCommands.add(UMLElementTypes.DATA_STORE_NODE);

-			visibleCommands.add(UMLElementTypes.OBJECT_FLOW);

-			visibleCommands.add(UMLElementTypes.CONDITIONAL_NODE);

-			visibleCommands.add(UMLElementTypes.CLAUSE);

-			visibleCommands.add(UMLElementTypes.LOOP_NODE);

-			visibleCommands.add(UMLElementTypes.EXPANSION_NODE);

-			visibleCommands.add(UMLElementTypes.EXPANSION_REGION);

-			visibleCommands.add(UMLElementTypes.PROTOCOL_TRANSITION);

-			visibleCommands.add(UMLElementTypes.ASSOCIATION_CLASS);

-

-		}

-

-		return visibleCommands;

-	}

-}

+package org.eclipse.papyrus.uml.modelexplorer.filter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
+
+public class CommandFilter {
+
+	private static List<IElementType> visibleCommands;
+
+	public static List<IElementType> getVisibleCommands() {
+		if(visibleCommands == null) {
+			visibleCommands = new ArrayList<IElementType>();
+
+			// visibleCommands.add(UMLElementTypes.ABSTRACTION);
+			visibleCommands.add(UMLElementTypes.ACCEPT_CALL_ACTION);
+			visibleCommands.add(UMLElementTypes.ACCEPT_EVENT_ACTION);
+			visibleCommands.add(UMLElementTypes.ACTION_EXECUTION_SPECIFICATION);
+			visibleCommands.add(UMLElementTypes.ACTION_INPUT_PIN);
+			visibleCommands.add(UMLElementTypes.ACTIVITY);
+			visibleCommands.add(UMLElementTypes.ACTIVITY_FINAL_NODE);
+			visibleCommands.add(UMLElementTypes.ACTIVITY_PARAMETER_NODE);
+			visibleCommands.add(UMLElementTypes.ACTIVITY_PARTITION);
+			visibleCommands.add(UMLElementTypes.ACTOR);
+			visibleCommands.add(UMLElementTypes.ADD_STRUCTURAL_FEATURE_VALUE_ACTION);
+			visibleCommands.add(UMLElementTypes.ADD_VARIABLE_VALUE_ACTION);
+			visibleCommands.add(UMLElementTypes.ANY_RECEIVE_EVENT);
+			visibleCommands.add(UMLElementTypes.ARTIFACT);
+			// visibleCommands.add(UMLElementTypes.ASSOCIATION);
+			// visibleCommands.add(UMLElementTypes.ASSOCIATION_CLASS);
+			visibleCommands.add(UMLElementTypes.BEHAVIOR_EXECUTION_SPECIFICATION);
+			visibleCommands.add(UMLElementTypes.BROADCAST_SIGNAL_ACTION);
+			visibleCommands.add(UMLElementTypes.CALL_BEHAVIOR_ACTION);
+			visibleCommands.add(UMLElementTypes.CALL_EVENT);
+			visibleCommands.add(UMLElementTypes.CALL_OPERATION_ACTION);
+			visibleCommands.add(UMLElementTypes.CENTRAL_BUFFER_NODE);
+			visibleCommands.add(UMLElementTypes.CHANGE_EVENT);
+			visibleCommands.add(UMLElementTypes.CLASS);
+			visibleCommands.add(UMLElementTypes.CLASSIFIER_TEMPLATE_PARAMETER);
+			visibleCommands.add(UMLElementTypes.CLAUSE);
+			visibleCommands.add(UMLElementTypes.CLEAR_ASSOCIATION_ACTION);
+			visibleCommands.add(UMLElementTypes.CLEAR_STRUCTURAL_FEATURE_ACTION);
+			visibleCommands.add(UMLElementTypes.CLEAR_VARIABLE_ACTION);
+			visibleCommands.add(UMLElementTypes.COLLABORATION);
+			visibleCommands.add(UMLElementTypes.COLLABORATION_USE);
+			visibleCommands.add(UMLElementTypes.COMBINED_FRAGMENT);
+			visibleCommands.add(UMLElementTypes.COMMENT);
+			// visibleCommands.add(UMLElementTypes.COMMUNICATION_PATH);
+			visibleCommands.add(UMLElementTypes.COMPONENT);
+			// visibleCommands.add(UMLElementTypes.COMPONENT_REALIZATION);
+			visibleCommands.add(UMLElementTypes.CONDITIONAL_NODE);
+			visibleCommands.add(UMLElementTypes.CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER);
+			// visibleCommands.add(UMLElementTypes.CONNECTION_POINT_REFERENCE);
+			// visibleCommands.add(UMLElementTypes.CONNECTOR);
+			// visibleCommands.add(UMLElementTypes.CONNECTOR_END);
+			visibleCommands.add(UMLElementTypes.CONSIDER_IGNORE_FRAGMENT);
+			visibleCommands.add(UMLElementTypes.CONSTRAINT);
+			visibleCommands.add(UMLElementTypes.CONTINUATION);
+			visibleCommands.add(UMLElementTypes.CONTROL_FLOW);
+			visibleCommands.add(UMLElementTypes.CREATE_LINK_ACTION);
+			visibleCommands.add(UMLElementTypes.CREATE_LINK_OBJECT_ACTION);
+			visibleCommands.add(UMLElementTypes.CREATE_OBJECT_ACTION);
+			visibleCommands.add(UMLElementTypes.CREATION_EVENT);
+			visibleCommands.add(UMLElementTypes.DATA_STORE_NODE);
+			visibleCommands.add(UMLElementTypes.DATA_TYPE);
+			visibleCommands.add(UMLElementTypes.DECISION_NODE);
+			// visibleCommands.add(UMLElementTypes.DEPENDENCY);
+			// visibleCommands.add(UMLElementTypes.DEPLOYMENT);
+			visibleCommands.add(UMLElementTypes.DEPLOYMENT_SPECIFICATION);
+			visibleCommands.add(UMLElementTypes.DESTROY_LINK_ACTION);
+			visibleCommands.add(UMLElementTypes.DESTROY_OBJECT_ACTION);
+			visibleCommands.add(UMLElementTypes.DESTRUCTION_EVENT);
+			visibleCommands.add(UMLElementTypes.DEVICE);
+			visibleCommands.add(UMLElementTypes.DURATION);
+			visibleCommands.add(UMLElementTypes.DURATION_CONSTRAINT);
+			visibleCommands.add(UMLElementTypes.DURATION_INTERVAL);
+			visibleCommands.add(UMLElementTypes.DURATION_OBSERVATION);
+			visibleCommands.add(UMLElementTypes.ELEMENT_IMPORT);
+			visibleCommands.add(UMLElementTypes.ENUMERATION);
+			visibleCommands.add(UMLElementTypes.ENUMERATION_LITERAL);
+			visibleCommands.add(UMLElementTypes.EXCEPTION_HANDLER);
+			visibleCommands.add(UMLElementTypes.EXECUTION_ENVIRONMENT);
+			visibleCommands.add(UMLElementTypes.EXECUTION_EVENT);
+			visibleCommands.add(UMLElementTypes.EXECUTION_OCCURRENCE_SPECIFICATION);
+			visibleCommands.add(UMLElementTypes.EXPANSION_NODE);
+			visibleCommands.add(UMLElementTypes.EXPANSION_REGION);
+			visibleCommands.add(UMLElementTypes.EXPRESSION);
+			// visibleCommands.add(UMLElementTypes.EXTEND);
+			// visibleCommands.add(UMLElementTypes.EXTENSION);
+			// visibleCommands.add(UMLElementTypes.EXTENSION_END);
+			visibleCommands.add(UMLElementTypes.EXTENSION_POINT);
+			visibleCommands.add(UMLElementTypes.FINAL_STATE);
+			visibleCommands.add(UMLElementTypes.FLOW_FINAL_NODE);
+			visibleCommands.add(UMLElementTypes.FORK_NODE);
+			visibleCommands.add(UMLElementTypes.FUNCTION_BEHAVIOR);
+			visibleCommands.add(UMLElementTypes.GATE);
+			visibleCommands.add(UMLElementTypes.GENERAL_ORDERING);
+			// visibleCommands.add(UMLElementTypes.GENERALIZATION);
+			// visibleCommands.add(UMLElementTypes.GENERALIZATION_SET);
+			visibleCommands.add(UMLElementTypes.IMAGE);
+			// visibleCommands.add(UMLElementTypes.INCLUDE);
+			// visibleCommands.add(UMLElementTypes.INFORMATION_FLOW);
+			visibleCommands.add(UMLElementTypes.INFORMATION_ITEM);
+			visibleCommands.add(UMLElementTypes.INITIAL_NODE);
+			visibleCommands.add(UMLElementTypes.INPUT_PIN);
+			visibleCommands.add(UMLElementTypes.INSTANCE_SPECIFICATION);
+			visibleCommands.add(UMLElementTypes.INSTANCE_VALUE);
+			visibleCommands.add(UMLElementTypes.INTERACTION);
+			visibleCommands.add(UMLElementTypes.INTERACTION_CONSTRAINT);
+			visibleCommands.add(UMLElementTypes.INTERACTION_OPERAND);
+			visibleCommands.add(UMLElementTypes.INTERACTION_USE);
+			visibleCommands.add(UMLElementTypes.INTERFACE);
+			// visibleCommands.add(UMLElementTypes.INTERFACE_REALIZATION);
+			visibleCommands.add(UMLElementTypes.INTERRUPTIBLE_ACTIVITY_REGION);
+			visibleCommands.add(UMLElementTypes.INTERVAL);
+			visibleCommands.add(UMLElementTypes.INTERVAL_CONSTRAINT);
+			visibleCommands.add(UMLElementTypes.JOIN_NODE);
+			visibleCommands.add(UMLElementTypes.LIFELINE);
+			visibleCommands.add(UMLElementTypes.LINK_END_CREATION_DATA);
+			visibleCommands.add(UMLElementTypes.LINK_END_DATA);
+			visibleCommands.add(UMLElementTypes.LINK_END_DESTRUCTION_DATA);
+			visibleCommands.add(UMLElementTypes.LITERAL_BOOLEAN);
+			visibleCommands.add(UMLElementTypes.LITERAL_INTEGER);
+			visibleCommands.add(UMLElementTypes.LITERAL_NULL);
+			visibleCommands.add(UMLElementTypes.LITERAL_STRING);
+			visibleCommands.add(UMLElementTypes.LITERAL_UNLIMITED_NATURAL);
+			visibleCommands.add(UMLElementTypes.LOOP_NODE);
+			// visibleCommands.add(UMLElementTypes.MANIFESTATION);
+			visibleCommands.add(UMLElementTypes.MERGE_NODE);
+			// visibleCommands.add(UMLElementTypes.MESSAGE);
+			// visibleCommands.add(UMLElementTypes.MESSAGE_OCCURRENCE_SPECIFICATION);
+			visibleCommands.add(UMLElementTypes.MODEL);
+			visibleCommands.add(UMLElementTypes.NODE);
+			visibleCommands.add(UMLElementTypes.OBJECT_FLOW);
+			visibleCommands.add(UMLElementTypes.OCCURRENCE_SPECIFICATION);
+			visibleCommands.add(UMLElementTypes.OPAQUE_ACTION);
+			visibleCommands.add(UMLElementTypes.OPAQUE_BEHAVIOR);
+			visibleCommands.add(UMLElementTypes.OPAQUE_EXPRESSION);
+			visibleCommands.add(UMLElementTypes.OPERATION);
+			visibleCommands.add(UMLElementTypes.OPERATION_TEMPLATE_PARAMETER);
+			visibleCommands.add(UMLElementTypes.OUTPUT_PIN);
+			visibleCommands.add(UMLElementTypes.PACKAGE);
+			visibleCommands.add(UMLElementTypes.PACKAGE_IMPORT);
+			// visibleCommands.add(UMLElementTypes.PACKAGE_MERGE);
+			visibleCommands.add(UMLElementTypes.PARAMETER);
+			visibleCommands.add(UMLElementTypes.PARAMETER_SET);
+			visibleCommands.add(UMLElementTypes.PART_DECOMPOSITION);
+			visibleCommands.add(UMLElementTypes.PIN);
+			visibleCommands.add(UMLElementTypes.PORT);
+			visibleCommands.add(UMLElementTypes.PRIMITIVE_TYPE);
+			visibleCommands.add(UMLElementTypes.PROFILE);
+			// visibleCommands.add(UMLElementTypes.PROFILE_APPLICATION);
+			visibleCommands.add(UMLElementTypes.PROPERTY);
+			// visibleCommands.add(UMLElementTypes.PROTOCOL_CONFORMANCE);
+			visibleCommands.add(UMLElementTypes.PROTOCOL_STATE_MACHINE);
+			visibleCommands.add(UMLElementTypes.PROTOCOL_TRANSITION);
+			// visibleCommands.add(UMLElementTypes.PSEUDOSTATE);
+			visibleCommands.add(UMLElementTypes.QUALIFIER_VALUE);
+			visibleCommands.add(UMLElementTypes.RAISE_EXCEPTION_ACTION);
+			visibleCommands.add(UMLElementTypes.READ_EXTENT_ACTION);
+			visibleCommands.add(UMLElementTypes.READ_IS_CLASSIFIED_OBJECT_ACTION);
+			visibleCommands.add(UMLElementTypes.READ_LINK_ACTION);
+			visibleCommands.add(UMLElementTypes.READ_LINK_OBJECT_END_ACTION);
+			visibleCommands.add(UMLElementTypes.READ_LINK_OBJECT_END_QUALIFIER_ACTION);
+			visibleCommands.add(UMLElementTypes.READ_SELF_ACTION);
+			visibleCommands.add(UMLElementTypes.READ_STRUCTURAL_FEATURE_ACTION);
+			visibleCommands.add(UMLElementTypes.READ_VARIABLE_ACTION);
+			// visibleCommands.add(UMLElementTypes.REALIZATION);
+			visibleCommands.add(UMLElementTypes.RECEIVE_OPERATION_EVENT);
+			visibleCommands.add(UMLElementTypes.RECEIVE_SIGNAL_EVENT);
+			visibleCommands.add(UMLElementTypes.RECEPTION);
+			visibleCommands.add(UMLElementTypes.RECLASSIFY_OBJECT_ACTION);
+			visibleCommands.add(UMLElementTypes.REDEFINABLE_TEMPLATE_SIGNATURE);
+			visibleCommands.add(UMLElementTypes.REDUCE_ACTION);
+			visibleCommands.add(UMLElementTypes.REGION);
+			visibleCommands.add(UMLElementTypes.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION);
+			visibleCommands.add(UMLElementTypes.REMOVE_VARIABLE_VALUE_ACTION);
+			visibleCommands.add(UMLElementTypes.REPLY_ACTION);
+			visibleCommands.add(UMLElementTypes.SEND_OBJECT_ACTION);
+			visibleCommands.add(UMLElementTypes.SEND_OPERATION_EVENT);
+			visibleCommands.add(UMLElementTypes.SEND_SIGNAL_ACTION);
+			visibleCommands.add(UMLElementTypes.SEND_SIGNAL_EVENT);
+			visibleCommands.add(UMLElementTypes.SEQUENCE_NODE);
+			visibleCommands.add(UMLElementTypes.SIGNAL);
+			visibleCommands.add(UMLElementTypes.SIGNAL_EVENT);
+			visibleCommands.add(UMLElementTypes.SLOT);
+			visibleCommands.add(UMLElementTypes.START_CLASSIFIER_BEHAVIOR_ACTION);
+			visibleCommands.add(UMLElementTypes.START_OBJECT_BEHAVIOR_ACTION);
+			visibleCommands.add(UMLElementTypes.STATE);
+			visibleCommands.add(UMLElementTypes.STATE_INVARIANT);
+			visibleCommands.add(UMLElementTypes.STATE_MACHINE);
+			visibleCommands.add(UMLElementTypes.STEREOTYPE);
+			visibleCommands.add(UMLElementTypes.STRING_EXPRESSION);
+			visibleCommands.add(UMLElementTypes.STRUCTURED_ACTIVITY_NODE);
+			// visibleCommands.add(UMLElementTypes.SUBSTITUTION);
+			visibleCommands.add(UMLElementTypes.TEMPLATE_BINDING);
+			visibleCommands.add(UMLElementTypes.TEMPLATE_PARAMETER);
+			visibleCommands.add(UMLElementTypes.TEMPLATE_PARAMETER_SUBSTITUTION);
+			visibleCommands.add(UMLElementTypes.TEMPLATE_SIGNATURE);
+			visibleCommands.add(UMLElementTypes.TEST_IDENTITY_ACTION);
+			visibleCommands.add(UMLElementTypes.TIME_CONSTRAINT);
+			visibleCommands.add(UMLElementTypes.TIME_EVENT);
+			visibleCommands.add(UMLElementTypes.TIME_EXPRESSION);
+			visibleCommands.add(UMLElementTypes.TIME_INTERVAL);
+			visibleCommands.add(UMLElementTypes.TIME_OBSERVATION);
+			// visibleCommands.add(UMLElementTypes.TRANSITION);
+			visibleCommands.add(UMLElementTypes.TRIGGER);
+			visibleCommands.add(UMLElementTypes.UNMARSHALL_ACTION);
+			// visibleCommands.add(UMLElementTypes.USAGE);
+			visibleCommands.add(UMLElementTypes.USE_CASE);
+			visibleCommands.add(UMLElementTypes.VALUE_PIN);
+			visibleCommands.add(UMLElementTypes.VALUE_SPECIFICATION_ACTION);
+			visibleCommands.add(UMLElementTypes.VARIABLE);
+		}
+
+		return visibleCommands;
+	}
+}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/AbstractionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/AbstractionHandler.java
index 656e835f32c..d206236170b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/AbstractionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/AbstractionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Abstraction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class AbstractionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class AbstractionHandler extends CreateCommandHandler implements IHandler
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.ABSTRACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/AcceptCallActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/AcceptCallActionHandler.java
index 508e764b972..f1881973d61 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/AcceptCallActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/AcceptCallActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for AcceptCallAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class AcceptCallActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class AcceptCallActionHandler extends CreateCommandHandler implements IHa
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.ACCEPT_CALL_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/AcceptEventActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/AcceptEventActionHandler.java
index 9a5ce5aaff6..94649a21cc1 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/AcceptEventActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/AcceptEventActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for AcceptEventAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class AcceptEventActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class AcceptEventActionHandler extends CreateCommandHandler implements IH
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.ACCEPT_EVENT_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActionExecutionSpecificationHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActionExecutionSpecificationHandler.java
index d325c6d91ae..7fb777293a6 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActionExecutionSpecificationHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActionExecutionSpecificationHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ActionExecutionSpecification creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ActionExecutionSpecificationHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ActionExecutionSpecificationHandler extends CreateCommandHandler im
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.ACTION_EXECUTION_SPECIFICATION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActionHandler.java
index 5c0ae7e79a2..715a34a77e8 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Action creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ActionHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActionInputPinHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActionInputPinHandler.java
index 67818befbcd..69160f2cf1d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActionInputPinHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActionInputPinHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ActionInputPin creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ActionInputPinHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ActionInputPinHandler extends CreateCommandHandler implements IHand
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.ACTION_INPUT_PIN;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActivityEdgeHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActivityEdgeHandler.java
index 03af8da63fa..774b8bcb88c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActivityEdgeHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActivityEdgeHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ActivityEdge creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ActivityEdgeHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ActivityEdgeHandler extends CreateCommandHandler implements IHandle
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.ACTIVITY_EDGE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActivityFinalNodeHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActivityFinalNodeHandler.java
index a1312ac8745..4137a5075f1 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActivityFinalNodeHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActivityFinalNodeHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ActivityFinalNode creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ActivityFinalNodeHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ActivityFinalNodeHandler extends CreateCommandHandler implements IH
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.ACTIVITY_FINAL_NODE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActivityGroupHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActivityGroupHandler.java
index 2fb9837c7e8..3daa49b06f9 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActivityGroupHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActivityGroupHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ActivityGroup creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ActivityGroupHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ActivityGroupHandler extends CreateCommandHandler implements IHandl
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.ACTIVITY_GROUP;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActivityHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActivityHandler.java
index ef4a38edf6c..a754fb36625 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActivityHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActivityHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Activity creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ActivityHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ActivityHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.ACTIVITY;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActivityNodeHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActivityNodeHandler.java
index e410f7dc09c..bdbb75304a7 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActivityNodeHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActivityNodeHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ActivityNode creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ActivityNodeHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ActivityNodeHandler extends CreateCommandHandler implements IHandle
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.ACTIVITY_NODE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActivityParameterNodeHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActivityParameterNodeHandler.java
index 110951b37c7..f72745d4f9b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActivityParameterNodeHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActivityParameterNodeHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ActivityParameterNode creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ActivityParameterNodeHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ActivityParameterNodeHandler extends CreateCommandHandler implement
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.ACTIVITY_PARAMETER_NODE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActivityPartitionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActivityPartitionHandler.java
index 5b2b6c3f2e6..992636d1789 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActivityPartitionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActivityPartitionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ActivityPartition creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ActivityPartitionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ActivityPartitionHandler extends CreateCommandHandler implements IH
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.ACTIVITY_PARTITION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActorHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActorHandler.java
index 17bfc937d8e..fba5af5d8be 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActorHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ActorHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Actor creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ActorHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ActorHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.ACTOR;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/AddStructuralFeatureValueActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/AddStructuralFeatureValueActionHandler.java
index e2a488970f0..6dec3f2a069 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/AddStructuralFeatureValueActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/AddStructuralFeatureValueActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for AddStructuralFeatureValueAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class AddStructuralFeatureValueActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class AddStructuralFeatureValueActionHandler extends CreateCommandHandler
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.ADD_STRUCTURAL_FEATURE_VALUE_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/AddVariableValueActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/AddVariableValueActionHandler.java
index 3647609ccb9..9f477de74ac 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/AddVariableValueActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/AddVariableValueActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for AddVariableValueAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class AddVariableValueActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class AddVariableValueActionHandler extends CreateCommandHandler implemen
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.ADD_VARIABLE_VALUE_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/AnyReceiveEventHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/AnyReceiveEventHandler.java
index a3423bfad5d..ba3b9021769 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/AnyReceiveEventHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/AnyReceiveEventHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for AnyReceiveEvent creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class AnyReceiveEventHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class AnyReceiveEventHandler extends CreateCommandHandler implements IHan
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.ANY_RECEIVE_EVENT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ArtifactHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ArtifactHandler.java
index 85020e6502c..48fd27e7102 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ArtifactHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ArtifactHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Artifact creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ArtifactHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ArtifactHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.ARTIFACT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/AssociationClassHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/AssociationClassHandler.java
index d04c5507211..1025a92ce01 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/AssociationClassHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/AssociationClassHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for AssociationClass creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class AssociationClassHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class AssociationClassHandler extends CreateCommandHandler implements IHa
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.ASSOCIATION_CLASS;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/AssociationHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/AssociationHandler.java
index 369ee8ddafc..45691c17103 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/AssociationHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/AssociationHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Association creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class AssociationHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class AssociationHandler extends CreateCommandHandler implements IHandler
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.ASSOCIATION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/BehaviorExecutionSpecificationHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/BehaviorExecutionSpecificationHandler.java
index a9422ceae2d..5181a585e5e 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/BehaviorExecutionSpecificationHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/BehaviorExecutionSpecificationHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for BehaviorExecutionSpecification creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class BehaviorExecutionSpecificationHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class BehaviorExecutionSpecificationHandler extends CreateCommandHandler
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.BEHAVIOR_EXECUTION_SPECIFICATION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/BehaviorHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/BehaviorHandler.java
index b23942bb68d..0bc747b0967 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/BehaviorHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/BehaviorHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Behavior creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class BehaviorHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class BehaviorHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.BEHAVIOR;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/BehavioralFeatureHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/BehavioralFeatureHandler.java
index 019634d47c9..c7f81ed9e6c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/BehavioralFeatureHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/BehavioralFeatureHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for BehavioralFeature creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class BehavioralFeatureHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class BehavioralFeatureHandler extends CreateCommandHandler implements IH
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.BEHAVIORAL_FEATURE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/BehavioredClassifierHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/BehavioredClassifierHandler.java
index ae0f58f049e..fa708ca9520 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/BehavioredClassifierHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/BehavioredClassifierHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for BehavioredClassifier creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class BehavioredClassifierHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class BehavioredClassifierHandler extends CreateCommandHandler implements
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.BEHAVIORED_CLASSIFIER;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/BroadcastSignalActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/BroadcastSignalActionHandler.java
index c1a774b8228..dd6ba6c418b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/BroadcastSignalActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/BroadcastSignalActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for BroadcastSignalAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class BroadcastSignalActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class BroadcastSignalActionHandler extends CreateCommandHandler implement
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.BROADCAST_SIGNAL_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CallActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CallActionHandler.java
index 05597e87be5..a0917c2cd30 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CallActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CallActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for CallAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class CallActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class CallActionHandler extends CreateCommandHandler implements IHandler
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.CALL_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CallBehaviorActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CallBehaviorActionHandler.java
index aad7f7a040d..1a1e73675fb 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CallBehaviorActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CallBehaviorActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for CallBehaviorAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class CallBehaviorActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class CallBehaviorActionHandler extends CreateCommandHandler implements I
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.CALL_BEHAVIOR_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CallEventHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CallEventHandler.java
index 5b7e351d1f6..626d40642ff 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CallEventHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CallEventHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for CallEvent creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class CallEventHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class CallEventHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.CALL_EVENT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CallOperationActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CallOperationActionHandler.java
index 354852dfa5c..c70b3edd29c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CallOperationActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CallOperationActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for CallOperationAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class CallOperationActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class CallOperationActionHandler extends CreateCommandHandler implements
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.CALL_OPERATION_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CentralBufferNodeHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CentralBufferNodeHandler.java
index 862f84cc3b2..89c13ca5b67 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CentralBufferNodeHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CentralBufferNodeHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for CentralBufferNode creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class CentralBufferNodeHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class CentralBufferNodeHandler extends CreateCommandHandler implements IH
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.CENTRAL_BUFFER_NODE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ChangeEventHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ChangeEventHandler.java
index 9aea79c8c35..df3995d3119 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ChangeEventHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ChangeEventHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ChangeEvent creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ChangeEventHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ChangeEventHandler extends CreateCommandHandler implements IHandler
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.CHANGE_EVENT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ClassHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ClassHandler.java
index 961f902e85d..c0e728320c9 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ClassHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ClassHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Class creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ClassHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ClassHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.CLASS;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ClassifierHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ClassifierHandler.java
index 7d40b5c5b64..e2e84087709 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ClassifierHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ClassifierHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Classifier creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ClassifierHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ClassifierHandler extends CreateCommandHandler implements IHandler
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.CLASSIFIER;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ClassifierTemplateParameterHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ClassifierTemplateParameterHandler.java
index 05d4eb4c8cc..41ee58b7e78 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ClassifierTemplateParameterHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ClassifierTemplateParameterHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ClassifierTemplateParameter creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ClassifierTemplateParameterHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ClassifierTemplateParameterHandler extends CreateCommandHandler imp
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.CLASSIFIER_TEMPLATE_PARAMETER;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ClauseHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ClauseHandler.java
index 56494d6f10c..41b5ce80034 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ClauseHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ClauseHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Clause creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ClauseHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ClauseHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.CLAUSE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ClearAssociationActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ClearAssociationActionHandler.java
index 259632d7fdb..a5c0756c881 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ClearAssociationActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ClearAssociationActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ClearAssociationAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ClearAssociationActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ClearAssociationActionHandler extends CreateCommandHandler implemen
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.CLEAR_ASSOCIATION_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ClearStructuralFeatureActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ClearStructuralFeatureActionHandler.java
index 84435b0afe0..2166207e7aa 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ClearStructuralFeatureActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ClearStructuralFeatureActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ClearStructuralFeatureAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ClearStructuralFeatureActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ClearStructuralFeatureActionHandler extends CreateCommandHandler im
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.CLEAR_STRUCTURAL_FEATURE_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ClearVariableActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ClearVariableActionHandler.java
index 2ed19efd63c..81859d88014 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ClearVariableActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ClearVariableActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ClearVariableAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ClearVariableActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ClearVariableActionHandler extends CreateCommandHandler implements
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.CLEAR_VARIABLE_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CollaborationHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CollaborationHandler.java
index d4c082f7264..35c17c744fc 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CollaborationHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CollaborationHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Collaboration creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class CollaborationHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class CollaborationHandler extends CreateCommandHandler implements IHandl
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.COLLABORATION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CollaborationUseHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CollaborationUseHandler.java
index 5da647087a6..0ab58ecd1af 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CollaborationUseHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CollaborationUseHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for CollaborationUse creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class CollaborationUseHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class CollaborationUseHandler extends CreateCommandHandler implements IHa
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.COLLABORATION_USE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CombinedFragmentHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CombinedFragmentHandler.java
index 6dbca64562c..52b856a4eef 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CombinedFragmentHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CombinedFragmentHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for CombinedFragment creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class CombinedFragmentHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class CombinedFragmentHandler extends CreateCommandHandler implements IHa
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.COMBINED_FRAGMENT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CommentHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CommentHandler.java
index c90c84c96c3..9a08d214644 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CommentHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CommentHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Comment creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class CommentHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class CommentHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.COMMENT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CommunicationPathHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CommunicationPathHandler.java
index 9a2205db034..84a058cf297 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CommunicationPathHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CommunicationPathHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for CommunicationPath creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class CommunicationPathHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class CommunicationPathHandler extends CreateCommandHandler implements IH
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.COMMUNICATION_PATH;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ComponentHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ComponentHandler.java
index 3119f7d2e12..185827a7e44 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ComponentHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ComponentHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Component creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ComponentHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ComponentHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.COMPONENT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ComponentRealizationHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ComponentRealizationHandler.java
index 3069d953c63..7f2e8df3f96 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ComponentRealizationHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ComponentRealizationHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ComponentRealization creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ComponentRealizationHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ComponentRealizationHandler extends CreateCommandHandler implements
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.COMPONENT_REALIZATION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ConditionalNodeHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ConditionalNodeHandler.java
index f7d7c948722..d8596065260 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ConditionalNodeHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ConditionalNodeHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ConditionalNode creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ConditionalNodeHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ConditionalNodeHandler extends CreateCommandHandler implements IHan
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.CONDITIONAL_NODE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ConnectableElementHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ConnectableElementHandler.java
index 54911b56643..bd139143e94 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ConnectableElementHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ConnectableElementHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ConnectableElement creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ConnectableElementHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ConnectableElementHandler extends CreateCommandHandler implements I
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.CONNECTABLE_ELEMENT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ConnectableElementTemplateParameterHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ConnectableElementTemplateParameterHandler.java
index 82e5f313e09..9172c80cda9 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ConnectableElementTemplateParameterHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ConnectableElementTemplateParameterHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ConnectableElementTemplateParameter creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ConnectableElementTemplateParameterHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ConnectableElementTemplateParameterHandler extends CreateCommandHan
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ConnectionPointReferenceHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ConnectionPointReferenceHandler.java
index 850d0eec871..8afd5601756 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ConnectionPointReferenceHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ConnectionPointReferenceHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ConnectionPointReference creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ConnectionPointReferenceHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ConnectionPointReferenceHandler extends CreateCommandHandler implem
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.CONNECTION_POINT_REFERENCE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ConnectorEndHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ConnectorEndHandler.java
index 0e2e718398e..4d7e872a43f 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ConnectorEndHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ConnectorEndHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ConnectorEnd creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ConnectorEndHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ConnectorEndHandler extends CreateCommandHandler implements IHandle
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.CONNECTOR_END;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ConnectorHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ConnectorHandler.java
index bba1e834c80..0b91e41ef79 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ConnectorHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ConnectorHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Connector creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ConnectorHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ConnectorHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.CONNECTOR;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ConsiderIgnoreFragmentHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ConsiderIgnoreFragmentHandler.java
index 7cc652007c9..53649f8002b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ConsiderIgnoreFragmentHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ConsiderIgnoreFragmentHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ConsiderIgnoreFragment creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ConsiderIgnoreFragmentHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ConsiderIgnoreFragmentHandler extends CreateCommandHandler implemen
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.CONSIDER_IGNORE_FRAGMENT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ConstraintHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ConstraintHandler.java
index e646d843130..e72ce0cac44 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ConstraintHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ConstraintHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Constraint creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ConstraintHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ConstraintHandler extends CreateCommandHandler implements IHandler
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.CONSTRAINT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ContinuationHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ContinuationHandler.java
index 0a7da40fb0d..3c18f8c4803 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ContinuationHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ContinuationHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Continuation creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ContinuationHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ContinuationHandler extends CreateCommandHandler implements IHandle
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.CONTINUATION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ControlFlowHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ControlFlowHandler.java
index 0cc6defffcb..070f108bc43 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ControlFlowHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ControlFlowHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ControlFlow creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ControlFlowHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ControlFlowHandler extends CreateCommandHandler implements IHandler
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.CONTROL_FLOW;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ControlNodeHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ControlNodeHandler.java
index 791708f961d..97cf89a7c87 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ControlNodeHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ControlNodeHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ControlNode creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ControlNodeHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ControlNodeHandler extends CreateCommandHandler implements IHandler
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.CONTROL_NODE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CreateLinkActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CreateLinkActionHandler.java
index 132ad2d95d8..a2534ba4819 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CreateLinkActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CreateLinkActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for CreateLinkAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class CreateLinkActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class CreateLinkActionHandler extends CreateCommandHandler implements IHa
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.CREATE_LINK_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CreateLinkObjectActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CreateLinkObjectActionHandler.java
index 2be78c573fe..cbc416d0d47 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CreateLinkObjectActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CreateLinkObjectActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for CreateLinkObjectAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class CreateLinkObjectActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class CreateLinkObjectActionHandler extends CreateCommandHandler implemen
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.CREATE_LINK_OBJECT_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CreateObjectActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CreateObjectActionHandler.java
index fb68d8c7273..b8acf63ff05 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CreateObjectActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CreateObjectActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for CreateObjectAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class CreateObjectActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class CreateObjectActionHandler extends CreateCommandHandler implements I
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.CREATE_OBJECT_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CreationEventHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CreationEventHandler.java
index ae05a94d7ff..c4d8ddfc753 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CreationEventHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/CreationEventHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for CreationEvent creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class CreationEventHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class CreationEventHandler extends CreateCommandHandler implements IHandl
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.CREATION_EVENT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DataStoreNodeHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DataStoreNodeHandler.java
index 631933a80b6..ca6591bc392 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DataStoreNodeHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DataStoreNodeHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for DataStoreNode creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class DataStoreNodeHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class DataStoreNodeHandler extends CreateCommandHandler implements IHandl
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.DATA_STORE_NODE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DataTypeHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DataTypeHandler.java
index 26e75988673..fefaa07aab3 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DataTypeHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DataTypeHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for DataType creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class DataTypeHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class DataTypeHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.DATA_TYPE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DecisionNodeHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DecisionNodeHandler.java
index 9c748a015d2..0beac8765af 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DecisionNodeHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DecisionNodeHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for DecisionNode creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class DecisionNodeHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class DecisionNodeHandler extends CreateCommandHandler implements IHandle
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.DECISION_NODE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DependencyHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DependencyHandler.java
index b2e674e6872..a95d7ad0e85 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DependencyHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DependencyHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Dependency creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class DependencyHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class DependencyHandler extends CreateCommandHandler implements IHandler
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.DEPENDENCY;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DeployedArtifactHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DeployedArtifactHandler.java
index 960ec8005c3..a36ed2b99b5 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DeployedArtifactHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DeployedArtifactHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for DeployedArtifact creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class DeployedArtifactHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class DeployedArtifactHandler extends CreateCommandHandler implements IHa
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.DEPLOYED_ARTIFACT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DeploymentHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DeploymentHandler.java
index add79f4e171..8d43fadd2d3 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DeploymentHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DeploymentHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Deployment creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class DeploymentHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class DeploymentHandler extends CreateCommandHandler implements IHandler
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.DEPLOYMENT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DeploymentSpecificationHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DeploymentSpecificationHandler.java
index aa4568fa662..c49696d560a 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DeploymentSpecificationHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DeploymentSpecificationHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for DeploymentSpecification creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class DeploymentSpecificationHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class DeploymentSpecificationHandler extends CreateCommandHandler impleme
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.DEPLOYMENT_SPECIFICATION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DeploymentTargetHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DeploymentTargetHandler.java
index ce5dc030801..215502ea74b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DeploymentTargetHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DeploymentTargetHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for DeploymentTarget creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class DeploymentTargetHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class DeploymentTargetHandler extends CreateCommandHandler implements IHa
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.DEPLOYMENT_TARGET;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DestroyLinkActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DestroyLinkActionHandler.java
index b90e91cbf24..6bb4fabcccc 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DestroyLinkActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DestroyLinkActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for DestroyLinkAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class DestroyLinkActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class DestroyLinkActionHandler extends CreateCommandHandler implements IH
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.DESTROY_LINK_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DestroyObjectActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DestroyObjectActionHandler.java
index 8218bc79381..ee93ae8948a 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DestroyObjectActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DestroyObjectActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for DestroyObjectAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class DestroyObjectActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class DestroyObjectActionHandler extends CreateCommandHandler implements
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.DESTROY_OBJECT_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DestructionEventHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DestructionEventHandler.java
index 803b873e5b3..5af6109150c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DestructionEventHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DestructionEventHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for DestructionEvent creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class DestructionEventHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class DestructionEventHandler extends CreateCommandHandler implements IHa
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.DESTRUCTION_EVENT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DeviceHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DeviceHandler.java
index 32feccb7202..5b67f017c3d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DeviceHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DeviceHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Device creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class DeviceHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class DeviceHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.DEVICE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DirectedRelationshipHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DirectedRelationshipHandler.java
index 22453676707..7da5499b633 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DirectedRelationshipHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DirectedRelationshipHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for DirectedRelationship creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class DirectedRelationshipHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class DirectedRelationshipHandler extends CreateCommandHandler implements
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.DIRECTED_RELATIONSHIP;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DurationConstraintHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DurationConstraintHandler.java
index 3fd5e82f5a2..3606ffaafc5 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DurationConstraintHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DurationConstraintHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for DurationConstraint creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class DurationConstraintHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class DurationConstraintHandler extends CreateCommandHandler implements I
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.DURATION_CONSTRAINT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DurationHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DurationHandler.java
index 28d6c8d27be..8d4c022713d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DurationHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DurationHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Duration creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class DurationHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class DurationHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.DURATION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DurationIntervalHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DurationIntervalHandler.java
index 96dfcb1bdec..56e1e08b8c1 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DurationIntervalHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DurationIntervalHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for DurationInterval creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class DurationIntervalHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class DurationIntervalHandler extends CreateCommandHandler implements IHa
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.DURATION_INTERVAL;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DurationObservationHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DurationObservationHandler.java
index 9a7729c3fe3..6590a869b7b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DurationObservationHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/DurationObservationHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for DurationObservation creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class DurationObservationHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class DurationObservationHandler extends CreateCommandHandler implements
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.DURATION_OBSERVATION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ElementHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ElementHandler.java
index 665948bb3f7..edd6452f438 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ElementHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ElementHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Element creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ElementHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ElementHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.ELEMENT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ElementImportHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ElementImportHandler.java
index 05d0f8390a5..49089d96880 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ElementImportHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ElementImportHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ElementImport creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ElementImportHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ElementImportHandler extends CreateCommandHandler implements IHandl
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.ELEMENT_IMPORT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/EncapsulatedClassifierHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/EncapsulatedClassifierHandler.java
index f72d080abb9..9da48ce3fe3 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/EncapsulatedClassifierHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/EncapsulatedClassifierHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for EncapsulatedClassifier creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class EncapsulatedClassifierHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class EncapsulatedClassifierHandler extends CreateCommandHandler implemen
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.ENCAPSULATED_CLASSIFIER;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/EnumerationHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/EnumerationHandler.java
index 297734eb0c1..f0a994e2ce6 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/EnumerationHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/EnumerationHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Enumeration creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class EnumerationHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class EnumerationHandler extends CreateCommandHandler implements IHandler
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.ENUMERATION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/EnumerationLiteralHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/EnumerationLiteralHandler.java
index e5174daeebe..94129b11c1f 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/EnumerationLiteralHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/EnumerationLiteralHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for EnumerationLiteral creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class EnumerationLiteralHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class EnumerationLiteralHandler extends CreateCommandHandler implements I
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.ENUMERATION_LITERAL;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/EventHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/EventHandler.java
index dde58f89bf9..b1919f1c52c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/EventHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/EventHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Event creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class EventHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class EventHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.EVENT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExceptionHandlerHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExceptionHandlerHandler.java
index cb1ce835bca..f30a25efd70 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExceptionHandlerHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExceptionHandlerHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ExceptionHandler creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ExceptionHandlerHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ExceptionHandlerHandler extends CreateCommandHandler implements IHa
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.EXCEPTION_HANDLER;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExecutableNodeHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExecutableNodeHandler.java
index 4bd3a1513cd..dcc16c96733 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExecutableNodeHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExecutableNodeHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ExecutableNode creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ExecutableNodeHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ExecutableNodeHandler extends CreateCommandHandler implements IHand
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.EXECUTABLE_NODE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExecutionEnvironmentHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExecutionEnvironmentHandler.java
index 3a9cf236fe5..9b7260ac4db 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExecutionEnvironmentHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExecutionEnvironmentHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ExecutionEnvironment creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ExecutionEnvironmentHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ExecutionEnvironmentHandler extends CreateCommandHandler implements
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.EXECUTION_ENVIRONMENT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExecutionEventHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExecutionEventHandler.java
index 75d2ae2c16a..e95ae8dbf71 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExecutionEventHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExecutionEventHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ExecutionEvent creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ExecutionEventHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ExecutionEventHandler extends CreateCommandHandler implements IHand
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.EXECUTION_EVENT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExecutionOccurrenceSpecificationHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExecutionOccurrenceSpecificationHandler.java
index fa7e542e9c6..f8168aee332 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExecutionOccurrenceSpecificationHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExecutionOccurrenceSpecificationHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ExecutionOccurrenceSpecification creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ExecutionOccurrenceSpecificationHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ExecutionOccurrenceSpecificationHandler extends CreateCommandHandle
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.EXECUTION_OCCURRENCE_SPECIFICATION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExecutionSpecificationHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExecutionSpecificationHandler.java
index 5b079a54d63..5fb54116c57 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExecutionSpecificationHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExecutionSpecificationHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ExecutionSpecification creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ExecutionSpecificationHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ExecutionSpecificationHandler extends CreateCommandHandler implemen
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.EXECUTION_SPECIFICATION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExpansionNodeHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExpansionNodeHandler.java
index bf93912b254..a887923938c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExpansionNodeHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExpansionNodeHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ExpansionNode creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ExpansionNodeHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ExpansionNodeHandler extends CreateCommandHandler implements IHandl
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.EXPANSION_NODE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExpansionRegionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExpansionRegionHandler.java
index 58b0f07413d..af5b55e53fd 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExpansionRegionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExpansionRegionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ExpansionRegion creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ExpansionRegionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ExpansionRegionHandler extends CreateCommandHandler implements IHan
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.EXPANSION_REGION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExpressionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExpressionHandler.java
index 95d40e2f248..406501781aa 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExpressionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExpressionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Expression creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ExpressionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ExpressionHandler extends CreateCommandHandler implements IHandler
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.EXPRESSION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExtendHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExtendHandler.java
index fe88599001c..a07e1aea759 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExtendHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExtendHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Extend creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ExtendHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ExtendHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.EXTEND;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExtensionEndHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExtensionEndHandler.java
index 74d011c03df..723c8553354 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExtensionEndHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExtensionEndHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ExtensionEnd creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ExtensionEndHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ExtensionEndHandler extends CreateCommandHandler implements IHandle
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.EXTENSION_END;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExtensionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExtensionHandler.java
index 88fb20d35ca..7604a8a0e28 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExtensionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExtensionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Extension creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ExtensionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ExtensionHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.EXTENSION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExtensionPointHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExtensionPointHandler.java
index 46343aff2a6..35fd13640a0 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExtensionPointHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ExtensionPointHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ExtensionPoint creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ExtensionPointHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ExtensionPointHandler extends CreateCommandHandler implements IHand
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.EXTENSION_POINT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/FeatureHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/FeatureHandler.java
index f9853ffdd86..db247da8742 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/FeatureHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/FeatureHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Feature creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class FeatureHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class FeatureHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.FEATURE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/FinalNodeHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/FinalNodeHandler.java
index e4c5eb7e93e..0bc07f2e295 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/FinalNodeHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/FinalNodeHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for FinalNode creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class FinalNodeHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class FinalNodeHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.FINAL_NODE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/FinalStateHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/FinalStateHandler.java
index 4e67a2537d2..2fb282954ac 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/FinalStateHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/FinalStateHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for FinalState creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class FinalStateHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class FinalStateHandler extends CreateCommandHandler implements IHandler
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.FINAL_STATE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/FlowFinalNodeHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/FlowFinalNodeHandler.java
index 7d4a68544e9..06b19ae7336 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/FlowFinalNodeHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/FlowFinalNodeHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for FlowFinalNode creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class FlowFinalNodeHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class FlowFinalNodeHandler extends CreateCommandHandler implements IHandl
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.FLOW_FINAL_NODE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ForkNodeHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ForkNodeHandler.java
index 8497dc1480f..273d0224720 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ForkNodeHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ForkNodeHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ForkNode creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ForkNodeHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ForkNodeHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.FORK_NODE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/FunctionBehaviorHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/FunctionBehaviorHandler.java
index 3e58197cbaa..f908a589ea1 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/FunctionBehaviorHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/FunctionBehaviorHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for FunctionBehavior creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class FunctionBehaviorHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class FunctionBehaviorHandler extends CreateCommandHandler implements IHa
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.FUNCTION_BEHAVIOR;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/GateHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/GateHandler.java
index 34416925dd2..482893c89cb 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/GateHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/GateHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Gate creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class GateHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class GateHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.GATE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/GeneralOrderingHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/GeneralOrderingHandler.java
index c14343f47b2..b36b9abcda0 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/GeneralOrderingHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/GeneralOrderingHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for GeneralOrdering creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class GeneralOrderingHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class GeneralOrderingHandler extends CreateCommandHandler implements IHan
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.GENERAL_ORDERING;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/GeneralizationHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/GeneralizationHandler.java
index 8e335fcc0c0..3b6a6c6ea06 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/GeneralizationHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/GeneralizationHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Generalization creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class GeneralizationHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class GeneralizationHandler extends CreateCommandHandler implements IHand
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.GENERALIZATION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/GeneralizationSetHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/GeneralizationSetHandler.java
index 54eccf40915..18451f82fb7 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/GeneralizationSetHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/GeneralizationSetHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for GeneralizationSet creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class GeneralizationSetHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class GeneralizationSetHandler extends CreateCommandHandler implements IH
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.GENERALIZATION_SET;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ImageHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ImageHandler.java
index 5c82587e05b..27cf9362f1b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ImageHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ImageHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Image creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ImageHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ImageHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.IMAGE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/IncludeHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/IncludeHandler.java
index e951e9dd99a..ca152f745f5 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/IncludeHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/IncludeHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Include creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class IncludeHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class IncludeHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.INCLUDE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InformationFlowHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InformationFlowHandler.java
index 1ba06d3d045..695d215c024 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InformationFlowHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InformationFlowHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for InformationFlow creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class InformationFlowHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class InformationFlowHandler extends CreateCommandHandler implements IHan
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.INFORMATION_FLOW;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InformationItemHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InformationItemHandler.java
index 175cc2c1379..4dafabceec5 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InformationItemHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InformationItemHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for InformationItem creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class InformationItemHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class InformationItemHandler extends CreateCommandHandler implements IHan
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.INFORMATION_ITEM;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InitialNodeHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InitialNodeHandler.java
index 910934cb414..58da41246d5 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InitialNodeHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InitialNodeHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for InitialNode creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class InitialNodeHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class InitialNodeHandler extends CreateCommandHandler implements IHandler
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.INITIAL_NODE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InputPinHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InputPinHandler.java
index a7b0cc571fb..42038462177 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InputPinHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InputPinHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for InputPin creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class InputPinHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class InputPinHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.INPUT_PIN;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InstanceSpecificationHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InstanceSpecificationHandler.java
index 89c8e1b970b..667080c52e7 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InstanceSpecificationHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InstanceSpecificationHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for InstanceSpecification creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class InstanceSpecificationHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class InstanceSpecificationHandler extends CreateCommandHandler implement
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.INSTANCE_SPECIFICATION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InstanceValueHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InstanceValueHandler.java
index 666e4b7eb7a..b4a29736865 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InstanceValueHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InstanceValueHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for InstanceValue creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class InstanceValueHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class InstanceValueHandler extends CreateCommandHandler implements IHandl
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.INSTANCE_VALUE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InteractionConstraintHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InteractionConstraintHandler.java
index 641f1d54c81..ba7d79df528 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InteractionConstraintHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InteractionConstraintHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for InteractionConstraint creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class InteractionConstraintHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class InteractionConstraintHandler extends CreateCommandHandler implement
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.INTERACTION_CONSTRAINT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InteractionFragmentHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InteractionFragmentHandler.java
index 58cad3c60b4..c24b7bdba0e 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InteractionFragmentHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InteractionFragmentHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for InteractionFragment creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class InteractionFragmentHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class InteractionFragmentHandler extends CreateCommandHandler implements
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.INTERACTION_FRAGMENT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InteractionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InteractionHandler.java
index f855930c6c3..0e9d9fabd59 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InteractionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InteractionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Interaction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class InteractionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class InteractionHandler extends CreateCommandHandler implements IHandler
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.INTERACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InteractionOperandHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InteractionOperandHandler.java
index 80877908b85..ff78c1ee010 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InteractionOperandHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InteractionOperandHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for InteractionOperand creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class InteractionOperandHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class InteractionOperandHandler extends CreateCommandHandler implements I
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.INTERACTION_OPERAND;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InteractionUseHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InteractionUseHandler.java
index 5373f3128a1..bf3043c2fa0 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InteractionUseHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InteractionUseHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for InteractionUse creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class InteractionUseHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class InteractionUseHandler extends CreateCommandHandler implements IHand
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.INTERACTION_USE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InterfaceHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InterfaceHandler.java
index dcfbe16ba57..9e22f6a6019 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InterfaceHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InterfaceHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Interface creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class InterfaceHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class InterfaceHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.INTERFACE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InterfaceRealizationHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InterfaceRealizationHandler.java
index 14fd79f3619..df5a79dc183 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InterfaceRealizationHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InterfaceRealizationHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for InterfaceRealization creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class InterfaceRealizationHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class InterfaceRealizationHandler extends CreateCommandHandler implements
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.INTERFACE_REALIZATION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InterruptibleActivityRegionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InterruptibleActivityRegionHandler.java
index 6104c6daea5..70c1f9a99a2 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InterruptibleActivityRegionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InterruptibleActivityRegionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for InterruptibleActivityRegion creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class InterruptibleActivityRegionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class InterruptibleActivityRegionHandler extends CreateCommandHandler imp
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.INTERRUPTIBLE_ACTIVITY_REGION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/IntervalConstraintHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/IntervalConstraintHandler.java
index 102d2af567d..22461284f4d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/IntervalConstraintHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/IntervalConstraintHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for IntervalConstraint creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class IntervalConstraintHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class IntervalConstraintHandler extends CreateCommandHandler implements I
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.INTERVAL_CONSTRAINT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/IntervalHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/IntervalHandler.java
index 7097686dbac..e8b1b29b9a0 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/IntervalHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/IntervalHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Interval creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class IntervalHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class IntervalHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.INTERVAL;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InvocationActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InvocationActionHandler.java
index 6961cf59f9f..f6cb484eb48 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InvocationActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/InvocationActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for InvocationAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class InvocationActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class InvocationActionHandler extends CreateCommandHandler implements IHa
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.INVOCATION_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/JoinNodeHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/JoinNodeHandler.java
index 5e6256dcf67..a5384f16589 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/JoinNodeHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/JoinNodeHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for JoinNode creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class JoinNodeHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class JoinNodeHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.JOIN_NODE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LifelineHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LifelineHandler.java
index 8b03a749a5a..1e0e36a1a28 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LifelineHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LifelineHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Lifeline creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class LifelineHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class LifelineHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.LIFELINE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LinkActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LinkActionHandler.java
index 2a1e9b5b0a0..e5d81ece7b0 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LinkActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LinkActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for LinkAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class LinkActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class LinkActionHandler extends CreateCommandHandler implements IHandler
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.LINK_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LinkEndCreationDataHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LinkEndCreationDataHandler.java
index c8f5dde1915..55478e585a1 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LinkEndCreationDataHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LinkEndCreationDataHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for LinkEndCreationData creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class LinkEndCreationDataHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class LinkEndCreationDataHandler extends CreateCommandHandler implements
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.LINK_END_CREATION_DATA;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LinkEndDataHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LinkEndDataHandler.java
index 8a29c219ba1..c2dac33ff8c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LinkEndDataHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LinkEndDataHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for LinkEndData creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class LinkEndDataHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class LinkEndDataHandler extends CreateCommandHandler implements IHandler
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.LINK_END_DATA;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LinkEndDestructionDataHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LinkEndDestructionDataHandler.java
index 7428fcaf489..7e194ba405d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LinkEndDestructionDataHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LinkEndDestructionDataHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for LinkEndDestructionData creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class LinkEndDestructionDataHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class LinkEndDestructionDataHandler extends CreateCommandHandler implemen
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.LINK_END_DESTRUCTION_DATA;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LiteralBooleanHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LiteralBooleanHandler.java
index 940c7a09ecf..2774eddeab0 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LiteralBooleanHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LiteralBooleanHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for LiteralBoolean creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class LiteralBooleanHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class LiteralBooleanHandler extends CreateCommandHandler implements IHand
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.LITERAL_BOOLEAN;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LiteralIntegerHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LiteralIntegerHandler.java
index 8eba430ea79..2838845b0b0 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LiteralIntegerHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LiteralIntegerHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for LiteralInteger creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class LiteralIntegerHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class LiteralIntegerHandler extends CreateCommandHandler implements IHand
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.LITERAL_INTEGER;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LiteralNullHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LiteralNullHandler.java
index deb7e37085b..0ce286cbf0d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LiteralNullHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LiteralNullHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for LiteralNull creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class LiteralNullHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class LiteralNullHandler extends CreateCommandHandler implements IHandler
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.LITERAL_NULL;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LiteralSpecificationHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LiteralSpecificationHandler.java
index 3eee20d33b3..dac6ff8475c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LiteralSpecificationHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LiteralSpecificationHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for LiteralSpecification creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class LiteralSpecificationHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class LiteralSpecificationHandler extends CreateCommandHandler implements
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.LITERAL_SPECIFICATION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LiteralStringHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LiteralStringHandler.java
index c6a1d77c08e..f6ee59f9b4e 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LiteralStringHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LiteralStringHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for LiteralString creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class LiteralStringHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class LiteralStringHandler extends CreateCommandHandler implements IHandl
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.LITERAL_STRING;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LiteralUnlimitedNaturalHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LiteralUnlimitedNaturalHandler.java
index 9707882a44a..6d59abfd745 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LiteralUnlimitedNaturalHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LiteralUnlimitedNaturalHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for LiteralUnlimitedNatural creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class LiteralUnlimitedNaturalHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class LiteralUnlimitedNaturalHandler extends CreateCommandHandler impleme
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.LITERAL_UNLIMITED_NATURAL;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LoopNodeHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LoopNodeHandler.java
index f2b984d9e31..c1a32d17ce9 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LoopNodeHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/LoopNodeHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for LoopNode creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class LoopNodeHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class LoopNodeHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.LOOP_NODE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ManifestationHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ManifestationHandler.java
index 3549270f3da..538148dde55 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ManifestationHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ManifestationHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Manifestation creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ManifestationHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ManifestationHandler extends CreateCommandHandler implements IHandl
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.MANIFESTATION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/MergeNodeHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/MergeNodeHandler.java
index 4f251a3b0d9..2addd1c5cb6 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/MergeNodeHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/MergeNodeHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for MergeNode creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class MergeNodeHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class MergeNodeHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.MERGE_NODE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/MessageEndHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/MessageEndHandler.java
index 174341ebfda..6e7a57ca837 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/MessageEndHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/MessageEndHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for MessageEnd creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class MessageEndHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class MessageEndHandler extends CreateCommandHandler implements IHandler
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.MESSAGE_END;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/MessageEventHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/MessageEventHandler.java
index 32b93f541e8..13d047add0f 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/MessageEventHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/MessageEventHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for MessageEvent creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class MessageEventHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class MessageEventHandler extends CreateCommandHandler implements IHandle
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.MESSAGE_EVENT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/MessageHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/MessageHandler.java
index 30f333e933a..1d80566ad61 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/MessageHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/MessageHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Message creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class MessageHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class MessageHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.MESSAGE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/MessageOccurrenceSpecificationHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/MessageOccurrenceSpecificationHandler.java
index 11452f4eac7..352a0505c92 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/MessageOccurrenceSpecificationHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/MessageOccurrenceSpecificationHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for MessageOccurrenceSpecification creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class MessageOccurrenceSpecificationHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class MessageOccurrenceSpecificationHandler extends CreateCommandHandler
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.MESSAGE_OCCURRENCE_SPECIFICATION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ModelHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ModelHandler.java
index 4391fa845c5..42a49217e5c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ModelHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ModelHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Model creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ModelHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ModelHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.MODEL;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/MultiplicityElementHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/MultiplicityElementHandler.java
index 9b56a01f10f..b98c3b23a5c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/MultiplicityElementHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/MultiplicityElementHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for MultiplicityElement creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class MultiplicityElementHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class MultiplicityElementHandler extends CreateCommandHandler implements
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.MULTIPLICITY_ELEMENT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/NamedElementHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/NamedElementHandler.java
index 00c8a5803c5..b91e141bcd3 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/NamedElementHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/NamedElementHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for NamedElement creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class NamedElementHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class NamedElementHandler extends CreateCommandHandler implements IHandle
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.NAMED_ELEMENT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/NamespaceHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/NamespaceHandler.java
index e37b65fadb9..5175efd075d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/NamespaceHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/NamespaceHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Namespace creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class NamespaceHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class NamespaceHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.NAMESPACE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/NodeHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/NodeHandler.java
index 551b224c9d8..72c3dc6be9e 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/NodeHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/NodeHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Node creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class NodeHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class NodeHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.NODE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ObjectFlowHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ObjectFlowHandler.java
index 9e49ab32c06..2c2b9be944d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ObjectFlowHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ObjectFlowHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ObjectFlow creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ObjectFlowHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ObjectFlowHandler extends CreateCommandHandler implements IHandler
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.OBJECT_FLOW;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ObjectNodeHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ObjectNodeHandler.java
index e463e7332a3..58c6bcadb68 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ObjectNodeHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ObjectNodeHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ObjectNode creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ObjectNodeHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ObjectNodeHandler extends CreateCommandHandler implements IHandler
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.OBJECT_NODE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ObservationHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ObservationHandler.java
index ae3728908b3..9314169773f 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ObservationHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ObservationHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Observation creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ObservationHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ObservationHandler extends CreateCommandHandler implements IHandler
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.OBSERVATION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/OccurrenceSpecificationHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/OccurrenceSpecificationHandler.java
index dd4df4ac226..d982ffd60fd 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/OccurrenceSpecificationHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/OccurrenceSpecificationHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for OccurrenceSpecification creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class OccurrenceSpecificationHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class OccurrenceSpecificationHandler extends CreateCommandHandler impleme
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.OCCURRENCE_SPECIFICATION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/OpaqueActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/OpaqueActionHandler.java
index 9f78502a498..fc3e906d747 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/OpaqueActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/OpaqueActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for OpaqueAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class OpaqueActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class OpaqueActionHandler extends CreateCommandHandler implements IHandle
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.OPAQUE_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/OpaqueBehaviorHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/OpaqueBehaviorHandler.java
index 113e6531197..e8f051b0b02 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/OpaqueBehaviorHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/OpaqueBehaviorHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for OpaqueBehavior creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class OpaqueBehaviorHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class OpaqueBehaviorHandler extends CreateCommandHandler implements IHand
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.OPAQUE_BEHAVIOR;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/OpaqueExpressionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/OpaqueExpressionHandler.java
index 6be638db322..da80e7be9d1 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/OpaqueExpressionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/OpaqueExpressionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for OpaqueExpression creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class OpaqueExpressionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class OpaqueExpressionHandler extends CreateCommandHandler implements IHa
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.OPAQUE_EXPRESSION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/OperationHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/OperationHandler.java
index 13b2e6eb763..c6ff66af891 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/OperationHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/OperationHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Operation creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class OperationHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class OperationHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.OPERATION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/OperationTemplateParameterHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/OperationTemplateParameterHandler.java
index 3b1bacee5fb..4af7721a10d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/OperationTemplateParameterHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/OperationTemplateParameterHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for OperationTemplateParameter creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class OperationTemplateParameterHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class OperationTemplateParameterHandler extends CreateCommandHandler impl
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.OPERATION_TEMPLATE_PARAMETER;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/OutputPinHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/OutputPinHandler.java
index 19db01d844b..239b3bb58d3 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/OutputPinHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/OutputPinHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for OutputPin creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class OutputPinHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class OutputPinHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.OUTPUT_PIN;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PackageHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PackageHandler.java
index 2ffc756792e..52ca05d3061 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PackageHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PackageHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Package creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class PackageHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class PackageHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.PACKAGE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PackageImportHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PackageImportHandler.java
index dc3afdccd81..a33f031350c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PackageImportHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PackageImportHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for PackageImport creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class PackageImportHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class PackageImportHandler extends CreateCommandHandler implements IHandl
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.PACKAGE_IMPORT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PackageMergeHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PackageMergeHandler.java
index 82aee68e18f..b41e63803f9 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PackageMergeHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PackageMergeHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for PackageMerge creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class PackageMergeHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class PackageMergeHandler extends CreateCommandHandler implements IHandle
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.PACKAGE_MERGE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PackageableElementHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PackageableElementHandler.java
index 002e7ccb433..38c4cf3391c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PackageableElementHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PackageableElementHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for PackageableElement creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class PackageableElementHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class PackageableElementHandler extends CreateCommandHandler implements I
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.PACKAGEABLE_ELEMENT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ParameterHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ParameterHandler.java
index de3354dc163..1c18ebe2836 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ParameterHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ParameterHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Parameter creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ParameterHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ParameterHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.PARAMETER;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ParameterSetHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ParameterSetHandler.java
index e59a9232c6d..ac468507f13 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ParameterSetHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ParameterSetHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ParameterSet creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ParameterSetHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ParameterSetHandler extends CreateCommandHandler implements IHandle
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.PARAMETER_SET;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ParameterableElementHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ParameterableElementHandler.java
index e82761717e7..583ed7fcf1c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ParameterableElementHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ParameterableElementHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ParameterableElement creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ParameterableElementHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ParameterableElementHandler extends CreateCommandHandler implements
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.PARAMETERABLE_ELEMENT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PartDecompositionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PartDecompositionHandler.java
index a1954274a86..ca802bc60ec 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PartDecompositionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PartDecompositionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for PartDecomposition creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class PartDecompositionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class PartDecompositionHandler extends CreateCommandHandler implements IH
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.PART_DECOMPOSITION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PinHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PinHandler.java
index d1c7594b141..431f9894c2d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PinHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PinHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Pin creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class PinHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class PinHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.PIN;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PortHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PortHandler.java
index be085efd69c..11abb6200ae 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PortHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PortHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Port creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class PortHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class PortHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.PORT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PrimitiveTypeHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PrimitiveTypeHandler.java
index 017fe4b7396..301e2343edb 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PrimitiveTypeHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PrimitiveTypeHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for PrimitiveType creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class PrimitiveTypeHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class PrimitiveTypeHandler extends CreateCommandHandler implements IHandl
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.PRIMITIVE_TYPE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ProfileApplicationHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ProfileApplicationHandler.java
index 4b2fd0e6f76..326d570bcf7 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ProfileApplicationHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ProfileApplicationHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ProfileApplication creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ProfileApplicationHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ProfileApplicationHandler extends CreateCommandHandler implements I
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.PROFILE_APPLICATION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ProfileHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ProfileHandler.java
index 96204d9074b..0fa2722edc5 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ProfileHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ProfileHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Profile creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ProfileHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ProfileHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.PROFILE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PropertyHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PropertyHandler.java
index 048d291489f..53a67dfc198 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PropertyHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PropertyHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Property creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class PropertyHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class PropertyHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.PROPERTY;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ProtocolConformanceHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ProtocolConformanceHandler.java
index fb63fef8d0f..353fd0a1705 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ProtocolConformanceHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ProtocolConformanceHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ProtocolConformance creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ProtocolConformanceHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ProtocolConformanceHandler extends CreateCommandHandler implements
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.PROTOCOL_CONFORMANCE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ProtocolStateMachineHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ProtocolStateMachineHandler.java
index 41fbfabf740..74229d5f070 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ProtocolStateMachineHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ProtocolStateMachineHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ProtocolStateMachine creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ProtocolStateMachineHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ProtocolStateMachineHandler extends CreateCommandHandler implements
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.PROTOCOL_STATE_MACHINE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ProtocolTransitionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ProtocolTransitionHandler.java
index 1a60e60824a..d232f077bae 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ProtocolTransitionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ProtocolTransitionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ProtocolTransition creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ProtocolTransitionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ProtocolTransitionHandler extends CreateCommandHandler implements I
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.PROTOCOL_TRANSITION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PseudostateHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PseudostateHandler.java
index 4df9ddf2383..ad9fff7df01 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PseudostateHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/PseudostateHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Pseudostate creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class PseudostateHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class PseudostateHandler extends CreateCommandHandler implements IHandler
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.PSEUDOSTATE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/QualifierValueHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/QualifierValueHandler.java
index b8a8fc84b0d..a63a8dcf362 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/QualifierValueHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/QualifierValueHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for QualifierValue creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class QualifierValueHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class QualifierValueHandler extends CreateCommandHandler implements IHand
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.QUALIFIER_VALUE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/RaiseExceptionActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/RaiseExceptionActionHandler.java
index f3f624ed3aa..b673b340d87 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/RaiseExceptionActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/RaiseExceptionActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for RaiseExceptionAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class RaiseExceptionActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class RaiseExceptionActionHandler extends CreateCommandHandler implements
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.RAISE_EXCEPTION_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReadExtentActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReadExtentActionHandler.java
index 4dc663acf1e..55c20d0b090 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReadExtentActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReadExtentActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ReadExtentAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ReadExtentActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ReadExtentActionHandler extends CreateCommandHandler implements IHa
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.READ_EXTENT_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReadIsClassifiedObjectActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReadIsClassifiedObjectActionHandler.java
index 10009d44354..ff92eb4381a 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReadIsClassifiedObjectActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReadIsClassifiedObjectActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ReadIsClassifiedObjectAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ReadIsClassifiedObjectActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ReadIsClassifiedObjectActionHandler extends CreateCommandHandler im
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.READ_IS_CLASSIFIED_OBJECT_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReadLinkActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReadLinkActionHandler.java
index 4e43996bc9d..9c35fba12e3 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReadLinkActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReadLinkActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ReadLinkAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ReadLinkActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ReadLinkActionHandler extends CreateCommandHandler implements IHand
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.READ_LINK_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReadLinkObjectEndActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReadLinkObjectEndActionHandler.java
index 65c044dc5a3..07194ab3ab4 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReadLinkObjectEndActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReadLinkObjectEndActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ReadLinkObjectEndAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ReadLinkObjectEndActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ReadLinkObjectEndActionHandler extends CreateCommandHandler impleme
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.READ_LINK_OBJECT_END_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReadLinkObjectEndQualifierActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReadLinkObjectEndQualifierActionHandler.java
index 2f10e4e7ae7..4e84b0284a3 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReadLinkObjectEndQualifierActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReadLinkObjectEndQualifierActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ReadLinkObjectEndQualifierAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ReadLinkObjectEndQualifierActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ReadLinkObjectEndQualifierActionHandler extends CreateCommandHandle
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.READ_LINK_OBJECT_END_QUALIFIER_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReadSelfActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReadSelfActionHandler.java
index 07292b8c50e..ad1c0eb04eb 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReadSelfActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReadSelfActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ReadSelfAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ReadSelfActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ReadSelfActionHandler extends CreateCommandHandler implements IHand
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.READ_SELF_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReadStructuralFeatureActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReadStructuralFeatureActionHandler.java
index 7528c23c94f..6982eb5640c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReadStructuralFeatureActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReadStructuralFeatureActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ReadStructuralFeatureAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ReadStructuralFeatureActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ReadStructuralFeatureActionHandler extends CreateCommandHandler imp
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.READ_STRUCTURAL_FEATURE_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReadVariableActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReadVariableActionHandler.java
index 33ba9d2c232..c765db2e2de 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReadVariableActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReadVariableActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ReadVariableAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ReadVariableActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ReadVariableActionHandler extends CreateCommandHandler implements I
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.READ_VARIABLE_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/RealizationHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/RealizationHandler.java
index 120468df646..88e2a480ab8 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/RealizationHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/RealizationHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Realization creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class RealizationHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class RealizationHandler extends CreateCommandHandler implements IHandler
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.REALIZATION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReceiveOperationEventHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReceiveOperationEventHandler.java
index 7803360a5e1..2d227a097b2 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReceiveOperationEventHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReceiveOperationEventHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ReceiveOperationEvent creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ReceiveOperationEventHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ReceiveOperationEventHandler extends CreateCommandHandler implement
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.RECEIVE_OPERATION_EVENT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReceiveSignalEventHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReceiveSignalEventHandler.java
index 85353561cb4..407f6f2c5be 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReceiveSignalEventHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReceiveSignalEventHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ReceiveSignalEvent creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ReceiveSignalEventHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ReceiveSignalEventHandler extends CreateCommandHandler implements I
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.RECEIVE_SIGNAL_EVENT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReceptionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReceptionHandler.java
index a8e143390c2..a3ff1fdaf59 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReceptionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReceptionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Reception creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ReceptionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ReceptionHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.RECEPTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReclassifyObjectActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReclassifyObjectActionHandler.java
index 4e7ddc25ea0..8b418db596d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReclassifyObjectActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReclassifyObjectActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ReclassifyObjectAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ReclassifyObjectActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ReclassifyObjectActionHandler extends CreateCommandHandler implemen
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.RECLASSIFY_OBJECT_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/RedefinableElementHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/RedefinableElementHandler.java
index 1d2a6620297..302764d321c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/RedefinableElementHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/RedefinableElementHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for RedefinableElement creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class RedefinableElementHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class RedefinableElementHandler extends CreateCommandHandler implements I
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.REDEFINABLE_ELEMENT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/RedefinableTemplateSignatureHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/RedefinableTemplateSignatureHandler.java
index 2c9cb04759a..09ce2a65a88 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/RedefinableTemplateSignatureHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/RedefinableTemplateSignatureHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for RedefinableTemplateSignature creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class RedefinableTemplateSignatureHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class RedefinableTemplateSignatureHandler extends CreateCommandHandler im
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.REDEFINABLE_TEMPLATE_SIGNATURE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReduceActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReduceActionHandler.java
index 1a263c0a4af..f1829aa8959 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReduceActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReduceActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ReduceAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ReduceActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ReduceActionHandler extends CreateCommandHandler implements IHandle
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.REDUCE_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/RegionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/RegionHandler.java
index 23b6f6e044a..30248ce37ba 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/RegionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/RegionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Region creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class RegionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class RegionHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.REGION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/RelationshipHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/RelationshipHandler.java
index 64ee2741e7a..d731b5a8d19 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/RelationshipHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/RelationshipHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Relationship creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class RelationshipHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class RelationshipHandler extends CreateCommandHandler implements IHandle
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.RELATIONSHIP;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/RemoveStructuralFeatureValueActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/RemoveStructuralFeatureValueActionHandler.java
index 6c2128c7a1f..c9991ff8052 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/RemoveStructuralFeatureValueActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/RemoveStructuralFeatureValueActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for RemoveStructuralFeatureValueAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class RemoveStructuralFeatureValueActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class RemoveStructuralFeatureValueActionHandler extends CreateCommandHand
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/RemoveVariableValueActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/RemoveVariableValueActionHandler.java
index 10e1c2cf67a..404bfc889af 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/RemoveVariableValueActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/RemoveVariableValueActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for RemoveVariableValueAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class RemoveVariableValueActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class RemoveVariableValueActionHandler extends CreateCommandHandler imple
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.REMOVE_VARIABLE_VALUE_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReplyActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReplyActionHandler.java
index 661b79d7600..fd681fd120e 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReplyActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ReplyActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ReplyAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ReplyActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ReplyActionHandler extends CreateCommandHandler implements IHandler
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.REPLY_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/SendObjectActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/SendObjectActionHandler.java
index 6515ace5412..7aa1d9576c0 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/SendObjectActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/SendObjectActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for SendObjectAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class SendObjectActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class SendObjectActionHandler extends CreateCommandHandler implements IHa
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.SEND_OBJECT_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/SendOperationEventHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/SendOperationEventHandler.java
index d744249c6b6..eee121927dc 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/SendOperationEventHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/SendOperationEventHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for SendOperationEvent creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class SendOperationEventHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class SendOperationEventHandler extends CreateCommandHandler implements I
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.SEND_OPERATION_EVENT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/SendSignalActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/SendSignalActionHandler.java
index 167fe82b88f..e98bc5a30b8 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/SendSignalActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/SendSignalActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for SendSignalAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class SendSignalActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class SendSignalActionHandler extends CreateCommandHandler implements IHa
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.SEND_SIGNAL_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/SendSignalEventHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/SendSignalEventHandler.java
index aa2fb088ab6..8fba1b0b89f 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/SendSignalEventHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/SendSignalEventHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for SendSignalEvent creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class SendSignalEventHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class SendSignalEventHandler extends CreateCommandHandler implements IHan
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.SEND_SIGNAL_EVENT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/SequenceNodeHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/SequenceNodeHandler.java
index 24231150b64..278ede7d4f7 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/SequenceNodeHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/SequenceNodeHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for SequenceNode creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class SequenceNodeHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class SequenceNodeHandler extends CreateCommandHandler implements IHandle
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.SEQUENCE_NODE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/SignalEventHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/SignalEventHandler.java
index 5bef8860505..f7af7536f59 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/SignalEventHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/SignalEventHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for SignalEvent creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class SignalEventHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class SignalEventHandler extends CreateCommandHandler implements IHandler
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.SIGNAL_EVENT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/SignalHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/SignalHandler.java
index 1f199ffe9e9..0d067bf8827 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/SignalHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/SignalHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Signal creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class SignalHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class SignalHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.SIGNAL;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/SlotHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/SlotHandler.java
index 1ce1f9a0983..5fe24da7ec8 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/SlotHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/SlotHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Slot creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class SlotHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class SlotHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.SLOT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StartClassifierBehaviorActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StartClassifierBehaviorActionHandler.java
index 58160cf9fb6..65fa3b76944 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StartClassifierBehaviorActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StartClassifierBehaviorActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for StartClassifierBehaviorAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class StartClassifierBehaviorActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class StartClassifierBehaviorActionHandler extends CreateCommandHandler i
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.START_CLASSIFIER_BEHAVIOR_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StartObjectBehaviorActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StartObjectBehaviorActionHandler.java
index 75759ff30bc..f17727542ab 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StartObjectBehaviorActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StartObjectBehaviorActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for StartObjectBehaviorAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class StartObjectBehaviorActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class StartObjectBehaviorActionHandler extends CreateCommandHandler imple
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.START_OBJECT_BEHAVIOR_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StateHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StateHandler.java
index 46211e6bc30..0809ba3ed7d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StateHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StateHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for State creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class StateHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class StateHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.STATE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StateInvariantHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StateInvariantHandler.java
index 452648a996e..a3964f3d2bc 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StateInvariantHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StateInvariantHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for StateInvariant creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class StateInvariantHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class StateInvariantHandler extends CreateCommandHandler implements IHand
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.STATE_INVARIANT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StateMachineHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StateMachineHandler.java
index 3bfd3b057f3..d1db0e9e258 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StateMachineHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StateMachineHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for StateMachine creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class StateMachineHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class StateMachineHandler extends CreateCommandHandler implements IHandle
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.STATE_MACHINE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StereotypeHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StereotypeHandler.java
index 1a5980d6a26..2313cb093de 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StereotypeHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StereotypeHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Stereotype creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class StereotypeHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class StereotypeHandler extends CreateCommandHandler implements IHandler
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.STEREOTYPE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StringExpressionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StringExpressionHandler.java
index 3f36e0ac8b7..491a5da37f9 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StringExpressionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StringExpressionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for StringExpression creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class StringExpressionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class StringExpressionHandler extends CreateCommandHandler implements IHa
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.STRING_EXPRESSION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StructuralFeatureActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StructuralFeatureActionHandler.java
index aadfe1177a0..87637608e26 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StructuralFeatureActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StructuralFeatureActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for StructuralFeatureAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class StructuralFeatureActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class StructuralFeatureActionHandler extends CreateCommandHandler impleme
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.STRUCTURAL_FEATURE_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StructuralFeatureHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StructuralFeatureHandler.java
index 798e130a948..114f6161bf5 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StructuralFeatureHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StructuralFeatureHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for StructuralFeature creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class StructuralFeatureHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class StructuralFeatureHandler extends CreateCommandHandler implements IH
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.STRUCTURAL_FEATURE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StructuredActivityNodeHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StructuredActivityNodeHandler.java
index 21825662ca4..ba55862c8de 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StructuredActivityNodeHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StructuredActivityNodeHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for StructuredActivityNode creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class StructuredActivityNodeHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class StructuredActivityNodeHandler extends CreateCommandHandler implemen
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.STRUCTURED_ACTIVITY_NODE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StructuredClassifierHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StructuredClassifierHandler.java
index 2ba77e31256..bba6a44c696 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StructuredClassifierHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/StructuredClassifierHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for StructuredClassifier creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class StructuredClassifierHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class StructuredClassifierHandler extends CreateCommandHandler implements
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.STRUCTURED_CLASSIFIER;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/SubstitutionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/SubstitutionHandler.java
index ea269718587..6211c8191e3 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/SubstitutionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/SubstitutionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Substitution creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class SubstitutionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class SubstitutionHandler extends CreateCommandHandler implements IHandle
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.SUBSTITUTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TemplateBindingHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TemplateBindingHandler.java
index e7c6f98edeb..98a7aa4e0cc 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TemplateBindingHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TemplateBindingHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for TemplateBinding creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class TemplateBindingHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class TemplateBindingHandler extends CreateCommandHandler implements IHan
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.TEMPLATE_BINDING;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TemplateParameterHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TemplateParameterHandler.java
index 594e506420b..89a78780159 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TemplateParameterHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TemplateParameterHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for TemplateParameter creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class TemplateParameterHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class TemplateParameterHandler extends CreateCommandHandler implements IH
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.TEMPLATE_PARAMETER;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TemplateParameterSubstitutionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TemplateParameterSubstitutionHandler.java
index f18ce932abc..39caee48b75 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TemplateParameterSubstitutionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TemplateParameterSubstitutionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for TemplateParameterSubstitution creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class TemplateParameterSubstitutionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class TemplateParameterSubstitutionHandler extends CreateCommandHandler i
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.TEMPLATE_PARAMETER_SUBSTITUTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TemplateSignatureHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TemplateSignatureHandler.java
index effdc128ce8..090896d4d86 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TemplateSignatureHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TemplateSignatureHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for TemplateSignature creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class TemplateSignatureHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class TemplateSignatureHandler extends CreateCommandHandler implements IH
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.TEMPLATE_SIGNATURE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TemplateableElementHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TemplateableElementHandler.java
index 57332105170..ac7b58c1e01 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TemplateableElementHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TemplateableElementHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for TemplateableElement creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class TemplateableElementHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class TemplateableElementHandler extends CreateCommandHandler implements
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.TEMPLATEABLE_ELEMENT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TestIdentityActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TestIdentityActionHandler.java
index 8784c8c0aa9..fee546b257e 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TestIdentityActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TestIdentityActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for TestIdentityAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class TestIdentityActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class TestIdentityActionHandler extends CreateCommandHandler implements I
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.TEST_IDENTITY_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TimeConstraintHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TimeConstraintHandler.java
index 1c35d71f1eb..1a70b7ebca4 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TimeConstraintHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TimeConstraintHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for TimeConstraint creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class TimeConstraintHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class TimeConstraintHandler extends CreateCommandHandler implements IHand
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.TIME_CONSTRAINT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TimeEventHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TimeEventHandler.java
index 06226bc892e..37249956dab 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TimeEventHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TimeEventHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for TimeEvent creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class TimeEventHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class TimeEventHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.TIME_EVENT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TimeExpressionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TimeExpressionHandler.java
index 1e5cd57c827..aa23e3284a0 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TimeExpressionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TimeExpressionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for TimeExpression creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class TimeExpressionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class TimeExpressionHandler extends CreateCommandHandler implements IHand
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.TIME_EXPRESSION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TimeIntervalHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TimeIntervalHandler.java
index c6a58e7438c..081aa4be8c2 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TimeIntervalHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TimeIntervalHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for TimeInterval creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class TimeIntervalHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class TimeIntervalHandler extends CreateCommandHandler implements IHandle
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.TIME_INTERVAL;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TimeObservationHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TimeObservationHandler.java
index 2c41d100fd6..0da5c857f88 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TimeObservationHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TimeObservationHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for TimeObservation creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class TimeObservationHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class TimeObservationHandler extends CreateCommandHandler implements IHan
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.TIME_OBSERVATION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TransitionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TransitionHandler.java
index 94f574f7921..746a572390b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TransitionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TransitionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Transition creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class TransitionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class TransitionHandler extends CreateCommandHandler implements IHandler
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.TRANSITION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TriggerHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TriggerHandler.java
index 64373d49bd6..bcfd73d04ae 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TriggerHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TriggerHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Trigger creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class TriggerHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class TriggerHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.TRIGGER;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TypeHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TypeHandler.java
index 94d52adcf77..040329090b9 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TypeHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TypeHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Type creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class TypeHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class TypeHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.TYPE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TypedElementHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TypedElementHandler.java
index f162a05e08b..27d70479fb0 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TypedElementHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/TypedElementHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for TypedElement creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class TypedElementHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class TypedElementHandler extends CreateCommandHandler implements IHandle
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.TYPED_ELEMENT;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/UnmarshallActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/UnmarshallActionHandler.java
index 68e30858327..7dd516073b6 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/UnmarshallActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/UnmarshallActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for UnmarshallAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class UnmarshallActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class UnmarshallActionHandler extends CreateCommandHandler implements IHa
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.UNMARSHALL_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/UsageHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/UsageHandler.java
index 85ebe65ab3e..0eb15749ecd 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/UsageHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/UsageHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Usage creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class UsageHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class UsageHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.USAGE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/UseCaseHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/UseCaseHandler.java
index 6b4cda83703..103096f56ab 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/UseCaseHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/UseCaseHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for UseCase creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class UseCaseHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class UseCaseHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.USE_CASE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ValuePinHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ValuePinHandler.java
index c24e7069b93..4c6a5285ec0 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ValuePinHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ValuePinHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ValuePin creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ValuePinHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ValuePinHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.VALUE_PIN;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ValueSpecificationActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ValueSpecificationActionHandler.java
index 5086f269be2..0e3332b85e4 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ValueSpecificationActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ValueSpecificationActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ValueSpecificationAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ValueSpecificationActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ValueSpecificationActionHandler extends CreateCommandHandler implem
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.VALUE_SPECIFICATION_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ValueSpecificationHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ValueSpecificationHandler.java
index 60b7bc4debf..dbac96b0527 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ValueSpecificationHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/ValueSpecificationHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for ValueSpecification creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class ValueSpecificationHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class ValueSpecificationHandler extends CreateCommandHandler implements I
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.VALUE_SPECIFICATION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/VariableActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/VariableActionHandler.java
index 599a303b858..7f8a300f1ee 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/VariableActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/VariableActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for VariableAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class VariableActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class VariableActionHandler extends CreateCommandHandler implements IHand
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.VARIABLE_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/VariableHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/VariableHandler.java
index db604fa6d9e..03f633ee9ab 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/VariableHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/VariableHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Variable creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class VariableHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class VariableHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.VARIABLE;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/VertexHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/VertexHandler.java
index ad99d893076..f5ea148dace 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/VertexHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/VertexHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for Vertex creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class VertexHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class VertexHandler extends CreateCommandHandler implements IHandler {
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.VERTEX;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/WriteLinkActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/WriteLinkActionHandler.java
index 78478c2da71..e764dba430b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/WriteLinkActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/WriteLinkActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for WriteLinkAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class WriteLinkActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class WriteLinkActionHandler extends CreateCommandHandler implements IHan
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.WRITE_LINK_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/WriteStructuralFeatureActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/WriteStructuralFeatureActionHandler.java
index cb85ec2ecd9..66c73227644 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/WriteStructuralFeatureActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/WriteStructuralFeatureActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for WriteStructuralFeatureAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class WriteStructuralFeatureActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class WriteStructuralFeatureActionHandler extends CreateCommandHandler im
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.WRITE_STRUCTURAL_FEATURE_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/WriteVariableActionHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/WriteVariableActionHandler.java
index 4ecb604f100..69dd9044da6 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/WriteVariableActionHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src-gen/org/eclipse/papyrus/uml/modelexplorer/handler/WriteVariableActionHandler.java
@@ -8,8 +8,9 @@ import org.eclipse.papyrus.uml.modelexplorer.handler.CreateCommandHandler;
 /**
  * <pre>
  * Command handler for WriteVariableAction creation
- *
+ * 
  * </pre>
+ * 
  * @generated
  */
 public class WriteVariableActionHandler extends CreateCommandHandler implements IHandler {
@@ -17,14 +18,14 @@ public class WriteVariableActionHandler extends CreateCommandHandler implements
 	/**
 	 * <pre>
 	 * @see org.eclipse.papyrus.uml.service.creation.handler.CreateHandler#getElementTypeToCreate()
-	 *
+	 * 
 	 * @return the IElementType this handler is supposed to create
-	 *
+	 * 
 	 * </pre>
+	 * 
 	 * @generated
 	 */
 	protected IElementType getElementTypeToCreate() {
 		return UMLElementTypes.WRITE_VARIABLE_ACTION;
 	}
 }
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/handler/AbstractCommandHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/handler/AbstractCommandHandler.java
index 2c1b7870e89..1c13d7b5634 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/handler/AbstractCommandHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/handler/AbstractCommandHandler.java
@@ -29,7 +29,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.papyrus.core.services.ServiceException;

 import org.eclipse.papyrus.core.utils.BusinessModelResolver;

 import org.eclipse.papyrus.core.utils.ServiceUtilsForActionHandlers;

-import org.eclipse.papyrus.modelexplorer.Activator;

+import org.eclipse.papyrus.uml.modelexplorer.Activator;

 import org.eclipse.ui.PlatformUI;

 

 /**

diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/handler/CreateCommandHandler.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/handler/CreateCommandHandler.java
index bdb11ca655c..24708e3d8dc 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/handler/CreateCommandHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/handler/CreateCommandHandler.java
@@ -22,6 +22,7 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.modelexplorer.filter.CommandFilter;

 

 /**

  * Default handler for Create command used in the ModelExplorer contextual ("Create new child") menu.

diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/xmlElementHandlers.xml b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/xmlElementHandlers.xml
index b02bcca3bb4..bffb5cfefcf 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/xmlElementHandlers.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer/xmlElementHandlers.xml
@@ -578,6 +578,13 @@
 		defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.GateHandler">
 	</command>
 	
+	<!-- Creation command for GeneralOrdering -->
+	<command categoryId="org.eclipse.papyrus.editor.category"
+		id="org.eclipse.papyrus.uml.modelexplorer.GeneralOrderingCreateCommand"
+		name="Create a new GeneralOrdering" description="Create a new GeneralOrdering"
+		defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.GeneralOrderingHandler">
+	</command>
+	
 	<!-- Creation command for Generalization -->
 	<command categoryId="org.eclipse.papyrus.editor.category"
 		id="org.eclipse.papyrus.uml.modelexplorer.GeneralizationCreateCommand"
@@ -592,13 +599,6 @@
 		defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.GeneralizationSetHandler">
 	</command>
 	
-	<!-- Creation command for GeneralOrdering -->
-	<command categoryId="org.eclipse.papyrus.editor.category"
-		id="org.eclipse.papyrus.uml.modelexplorer.GeneralOrderingCreateCommand"
-		name="Create a new GeneralOrdering" description="Create a new GeneralOrdering"
-		defaultHandler="org.eclipse.papyrus.uml.modelexplorer.handler.GeneralOrderingHandler">
-	</command>
-	
 	<!-- Creation command for Image -->
 	<command categoryId="org.eclipse.papyrus.editor.category"
 		id="org.eclipse.papyrus.uml.modelexplorer.ImageCreateCommand"
@@ -1403,9 +1403,8 @@
 <!-- UI Menu declaration for creation commands -->
 <extension point="org.eclipse.ui.menus">
 
-	<menuContribution locationURI="popup:org.eclipse.papyrus.modelexplorer.popupmenu.createchild"
-		allPopups="false">
-	
+	<menuContribution locationURI="popup:org.eclipse.papyrus.modelexplorer.popupmenu.createchild" allPopups="false">
+
 		<!-- Creation menu action for Abstraction -->
 		<command commandId="org.eclipse.papyrus.uml.modelexplorer.AbstractionCreateCommand"
 			label="Create a new Abstraction" tooltip="Create a new Abstraction" style="push"		
@@ -1980,6 +1979,13 @@
 			<visibleWhen checkEnabled="true"/>
 		</command>
 		
+		<!-- Creation menu action for GeneralOrdering -->
+		<command commandId="org.eclipse.papyrus.uml.modelexplorer.GeneralOrderingCreateCommand"
+			label="Create a new GeneralOrdering" tooltip="Create a new GeneralOrdering" style="push"		
+			icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/GeneralOrdering.gif" >
+			<visibleWhen checkEnabled="true"/>
+		</command>
+		
 		<!-- Creation menu action for Generalization -->
 		<command commandId="org.eclipse.papyrus.uml.modelexplorer.GeneralizationCreateCommand"
 			label="Create a new Generalization" tooltip="Create a new Generalization" style="push"		
@@ -1994,13 +2000,6 @@
 			<visibleWhen checkEnabled="true"/>
 		</command>
 		
-		<!-- Creation menu action for GeneralOrdering -->
-		<command commandId="org.eclipse.papyrus.uml.modelexplorer.GeneralOrderingCreateCommand"
-			label="Create a new GeneralOrdering" tooltip="Create a new GeneralOrdering" style="push"		
-			icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/GeneralOrdering.gif" >
-			<visibleWhen checkEnabled="true"/>
-		</command>
-		
 		<!-- Creation menu action for Image -->
 		<command commandId="org.eclipse.papyrus.uml.modelexplorer.ImageCreateCommand"
 			label="Create a new Image" tooltip="Create a new Image" style="push"		
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen b/plugins/uml/org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen
index c219940d7f9..b9fec6ecbc7 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/model/ElementTypeModelForUML.domaincontextcodegen
@@ -1,748 +1,781 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<domaincontextcodegen:DomainContext xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:domaincontextcodegen="http://www.eclipse.org/papyrus/2010/domaincontextcodegen" typeProjectName="org.eclipse.papyrus.uml.service.types" handlerProjectName="org.eclipse.papyrus.uml.modelexplorer" IClientContextID="org.eclipse.papyrus.service.creation.TypeContext" elementTypeIDPrefix="org.eclipse.papyrus.uml" elementTypeNamePrefix="UML" matcherPatch="org.eclipse.papyrus.service.edit.matcher.NoContextEnablementMatcher" defaultHelperPath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" generatedSourceFolder="src-gen">

+<domaincontextcodegen:DomainContext xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:domaincontextcodegen="http://www.eclipse.org/papyrus/2010/domaincontextcodegen" typeProjectName="org.eclipse.papyrus.uml.service.types" handlerProjectName="org.eclipse.papyrus.uml.modelexplorer" IClientContextID="org.eclipse.papyrus.service.creation.TypeContext" elementTypeIDPrefix="org.eclipse.papyrus.uml" elementTypeNamePrefix="UML" defaultHelperPath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" generatedSourceFolder="src-gen">

   <metamodel href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#/"/>

   <elementTypes>

-    <types specificName="ABSTRACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Abstraction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Abstraction"/>

     </types>

-    <types specificName="ACCEPT_CALL_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="AcceptCallAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AcceptCallAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//AcceptCallAction"/>

     </types>

-    <types specificName="ACCEPT_EVENT_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="AcceptEventAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AcceptEventAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//AcceptEventAction"/>

     </types>

-    <types specificName="ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Action" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Action.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Action"/>

     </types>

-    <types specificName="ACTION_EXECUTION_SPECIFICATION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ActionExecutionSpecification" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ActionExecutionSpecification.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ActionExecutionSpecification"/>

     </types>

-    <types specificName="ACTION_INPUT_PIN" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ActionInputPin" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ActionInputPin.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ActionInputPin"/>

     </types>

-    <types specificName="ACTIVITY" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Activity" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Activity"/>

     </types>

-    <types specificName="ACTIVITY_EDGE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ActivityEdge" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ActivityEdge.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ActivityEdge"/>

     </types>

-    <types specificName="ACTIVITY_FINAL_NODE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ActivityFinalNode" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ActivityFinalNode.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ActivityFinalNode"/>

     </types>

-    <types specificName="ACTIVITY_GROUP" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ActivityGroup" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ActivityGroup.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ActivityGroup"/>

     </types>

-    <types specificName="ACTIVITY_NODE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ActivityNode" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ActivityNode.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ActivityNode"/>

     </types>

-    <types specificName="ACTIVITY_PARAMETER_NODE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ActivityParameterNode" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ActivityParameterNode.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ActivityParameterNode"/>

     </types>

-    <types specificName="ACTIVITY_PARTITION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ActivityPartition" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ActivityPartition.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ActivityPartition"/>

     </types>

-    <types specificName="ACTOR" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Actor" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Actor.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Actor"/>

     </types>

-    <types specificName="ADD_STRUCTURAL_FEATURE_VALUE_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="AddStructuralFeatureValueAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AddStructuralFeatureValueAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//AddStructuralFeatureValueAction"/>

     </types>

-    <types specificName="ADD_VARIABLE_VALUE_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="AddVariableValueAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AddVariableValueAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//AddVariableValueAction"/>

     </types>

-    <types specificName="ANY_RECEIVE_EVENT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="AnyReceiveEvent" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AnyReceiveEvent.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//AnyReceiveEvent"/>

     </types>

-    <types specificName="ARTIFACT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Artifact" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Artifact.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Artifact"/>

     </types>

-    <types specificName="ASSOCIATION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Association" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Association"/>

     </types>

-    <types specificName="ASSOCIATION_CLASS" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="AssociationClass" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AssociationClass.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//AssociationClass"/>

     </types>

-    <types specificName="BEHAVIOR" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Behavior" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Behavior.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Behavior"/>

     </types>

-    <types specificName="BEHAVIORAL_FEATURE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="BehaviorExecutionSpecification" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/BehaviorExecutionSpecification.gif">

+      <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//BehaviorExecutionSpecification"/>

+    </types>

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="BehavioralFeature" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/BehavioralFeature.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//BehavioralFeature"/>

     </types>

-    <types specificName="BEHAVIORED_CLASSIFIER" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="BehavioredClassifier" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/BehavioredClassifier.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//BehavioredClassifier"/>

     </types>

-    <types specificName="BEHAVIOR_EXECUTION_SPECIFICATION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-      <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//BehaviorExecutionSpecification"/>

-    </types>

-    <types specificName="BROADCAST_SIGNAL_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="BroadcastSignalAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/BroadcastSignalAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//BroadcastSignalAction"/>

     </types>

-    <types specificName="CALL_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="CallAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//CallAction"/>

     </types>

-    <types specificName="CALL_BEHAVIOR_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="CallBehaviorAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallBehaviorAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//CallBehaviorAction"/>

     </types>

-    <types specificName="CALL_EVENT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="CallEvent" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallEvent.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//CallEvent"/>

     </types>

-    <types specificName="CALL_OPERATION_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="CallOperationAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//CallOperationAction"/>

     </types>

-    <types specificName="CENTRAL_BUFFER_NODE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="CentralBufferNode" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CentralBufferNode.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//CentralBufferNode"/>

     </types>

-    <types specificName="CHANGE_EVENT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ChangeEvent" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ChangeEvent.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ChangeEvent"/>

     </types>

-    <types specificName="CLASS" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Class" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Class"/>

     </types>

-    <types specificName="CLASSIFIER" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Classifier" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Classifier.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Classifier"/>

     </types>

-    <types specificName="CLASSIFIER_TEMPLATE_PARAMETER" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ClassifierTemplateParameter" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ClassifierTemplateParameter.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ClassifierTemplateParameter"/>

     </types>

-    <types specificName="CLAUSE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Clause" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Clause.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Clause"/>

     </types>

-    <types specificName="CLEAR_ASSOCIATION_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ClearAssociationAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ClearAssociationAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ClearAssociationAction"/>

     </types>

-    <types specificName="CLEAR_STRUCTURAL_FEATURE_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ClearStructuralFeatureAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ClearStructuralFeatureAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ClearStructuralFeatureAction"/>

     </types>

-    <types specificName="CLEAR_VARIABLE_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ClearVariableAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ClearVariableAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ClearVariableAction"/>

     </types>

-    <types specificName="COLLABORATION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Collaboration" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Collaboration.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Collaboration"/>

     </types>

-    <types specificName="COLLABORATION_USE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="CollaborationUse" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CollaborationUse.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//CollaborationUse"/>

     </types>

-    <types specificName="COMBINED_FRAGMENT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="CombinedFragment" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CombinedFragment.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//CombinedFragment"/>

     </types>

-    <types specificName="COMMENT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Comment" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Comment"/>

     </types>

-    <types specificName="COMMUNICATION_PATH" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="CommunicationPath" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CommunicationPath.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//CommunicationPath"/>

     </types>

-    <types specificName="COMPONENT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Component" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Component.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Component"/>

     </types>

-    <types specificName="COMPONENT_REALIZATION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ComponentRealization" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ComponentRealization.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ComponentRealization"/>

     </types>

-    <types specificName="CONDITIONAL_NODE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ConditionalNode" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ConditionalNode.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ConditionalNode"/>

     </types>

-    <types specificName="CONNECTABLE_ELEMENT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ConnectableElement" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ConnectableElement.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ConnectableElement"/>

     </types>

-    <types specificName="CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ConnectableElementTemplateParameter" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ConnectableElementTemplateParameter.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ConnectableElementTemplateParameter"/>

     </types>

-    <types specificName="CONNECTION_POINT_REFERENCE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ConnectionPointReference" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ConnectionPointReference.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ConnectionPointReference"/>

     </types>

-    <types specificName="CONNECTOR" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Connector" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Connector"/>

     </types>

-    <types specificName="CONNECTOR_END" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ConnectorEnd" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ConnectorEnd.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ConnectorEnd"/>

     </types>

-    <types specificName="CONSIDER_IGNORE_FRAGMENT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ConsiderIgnoreFragment" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ConsiderIgnoreFragment.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ConsiderIgnoreFragment"/>

     </types>

-    <types specificName="CONSTRAINT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Constraint" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Constraint"/>

     </types>

-    <types specificName="CONTINUATION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Continuation" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Continuation.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Continuation"/>

     </types>

-    <types specificName="CONTROL_FLOW" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ControlFlow" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ControlFlow.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ControlFlow"/>

     </types>

-    <types specificName="CONTROL_NODE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ControlNode" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ControlNode.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ControlNode"/>

     </types>

-    <types specificName="CREATE_LINK_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="CreateLinkAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CreateLinkAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//CreateLinkAction"/>

     </types>

-    <types specificName="CREATE_LINK_OBJECT_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="CreateLinkObjectAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CreateLinkObjectAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//CreateLinkObjectAction"/>

     </types>

-    <types specificName="CREATE_OBJECT_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="CreateObjectAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CreateObjectAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//CreateObjectAction"/>

     </types>

-    <types specificName="CREATION_EVENT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="CreationEvent" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CreationEvent.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//CreationEvent"/>

     </types>

-    <types specificName="DATA_STORE_NODE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="DataStoreNode" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DataStoreNode.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//DataStoreNode"/>

     </types>

-    <types specificName="DATA_TYPE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="DataType" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DataType.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//DataType"/>

     </types>

-    <types specificName="DECISION_NODE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="DecisionNode" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DecisionNode.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//DecisionNode"/>

     </types>

-    <types specificName="DEPENDENCY" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DependencyEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Dependency" helper="org.eclipse.papyrus.uml.service.types.helper.DependencyEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Dependency"/>

     </types>

-    <types specificName="DEPLOYED_ARTIFACT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="DeployedArtifact" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DeployedArtifact.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//DeployedArtifact"/>

     </types>

-    <types specificName="DEPLOYMENT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Deployment" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Deployment.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Deployment"/>

     </types>

-    <types specificName="DEPLOYMENT_SPECIFICATION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="DeploymentSpecification" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DeploymentSpecification.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//DeploymentSpecification"/>

     </types>

-    <types specificName="DEPLOYMENT_TARGET" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="DeploymentTarget" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DeploymentTarget.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//DeploymentTarget"/>

     </types>

-    <types specificName="DESTROY_LINK_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="DestroyLinkAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DestroyLinkAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//DestroyLinkAction"/>

     </types>

-    <types specificName="DESTROY_OBJECT_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="DestroyObjectAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DestroyObjectAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//DestroyObjectAction"/>

     </types>

-    <types specificName="DESTRUCTION_EVENT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="DestructionEvent" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DestructionEvent.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//DestructionEvent"/>

     </types>

-    <types specificName="DEVICE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Device" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Device.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Device"/>

     </types>

-    <types specificName="DIRECTED_RELATIONSHIP" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="DirectedRelationship" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DirectedRelationship.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//DirectedRelationship"/>

     </types>

-    <types specificName="DURATION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Duration" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Duration.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Duration"/>

     </types>

-    <types specificName="DURATION_CONSTRAINT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="DurationConstraint" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationConstraint.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//DurationConstraint"/>

     </types>

-    <types specificName="DURATION_INTERVAL" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="DurationInterval" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationInterval.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//DurationInterval"/>

     </types>

-    <types specificName="DURATION_OBSERVATION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="DurationObservation" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//DurationObservation"/>

     </types>

-    <types specificName="ELEMENT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Element" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Element.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Element"/>

     </types>

-    <types specificName="ELEMENT_IMPORT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ElementImport" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ElementImport.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ElementImport"/>

     </types>

-    <types specificName="ENCAPSULATED_CLASSIFIER" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="EncapsulatedClassifier" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/EncapsulatedClassifier.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//EncapsulatedClassifier"/>

     </types>

-    <types specificName="ENUMERATION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Enumeration" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Enumeration.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Enumeration"/>

     </types>

-    <types specificName="ENUMERATION_LITERAL" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="EnumerationLiteral" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/EnumerationLiteral.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//EnumerationLiteral"/>

     </types>

-    <types specificName="EVENT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Event" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Event.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Event"/>

     </types>

-    <types specificName="EXCEPTION_HANDLER" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ExceptionHandler" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExceptionHandler.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ExceptionHandler"/>

     </types>

-    <types specificName="EXECUTABLE_NODE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ExecutableNode" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExecutableNode.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ExecutableNode"/>

     </types>

-    <types specificName="EXECUTION_ENVIRONMENT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ExecutionEnvironment" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExecutionEnvironment.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ExecutionEnvironment"/>

     </types>

-    <types specificName="EXECUTION_EVENT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ExecutionEvent" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExecutionEvent.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ExecutionEvent"/>

     </types>

-    <types specificName="EXECUTION_OCCURRENCE_SPECIFICATION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ExecutionOccurrenceSpecification" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExecutionOccurrenceSpecification.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ExecutionOccurrenceSpecification"/>

     </types>

-    <types specificName="EXECUTION_SPECIFICATION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ExecutionSpecification" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExecutionSpecification.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ExecutionSpecification"/>

     </types>

-    <types specificName="EXPANSION_NODE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ExpansionNode" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExpansionNode.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ExpansionNode"/>

     </types>

-    <types specificName="EXPANSION_REGION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ExpansionRegion" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExpansionRegion.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ExpansionRegion"/>

     </types>

-    <types specificName="EXPRESSION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Expression" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Expression.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Expression"/>

     </types>

-    <types specificName="EXTEND" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Extend" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Extend.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Extend"/>

     </types>

-    <types specificName="EXTENSION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Extension" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Extension.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Extension"/>

     </types>

-    <types specificName="EXTENSION_END" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ExtensionEnd" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExtensionEnd.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ExtensionEnd"/>

     </types>

-    <types specificName="EXTENSION_POINT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ExtensionPoint" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExtensionPoint.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ExtensionPoint"/>

     </types>

-    <types specificName="FEATURE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Feature" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Feature.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Feature"/>

     </types>

-    <types specificName="FINAL_NODE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="FinalNode" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FinalNode.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//FinalNode"/>

     </types>

-    <types specificName="FINAL_STATE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="FinalState" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FinalState.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//FinalState"/>

     </types>

-    <types specificName="FLOW_FINAL_NODE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="FlowFinalNode" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FlowFinalNode.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//FlowFinalNode"/>

     </types>

-    <types specificName="FORK_NODE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ForkNode" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ForkNode.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ForkNode"/>

     </types>

-    <types specificName="FUNCTION_BEHAVIOR" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="FunctionBehavior" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FunctionBehavior.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//FunctionBehavior"/>

     </types>

-    <types specificName="GATE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Gate" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Gate.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Gate"/>

     </types>

-    <types specificName="GENERALIZATION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.GeneralizationEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="GeneralOrdering" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/GeneralOrdering.gif">

+      <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//GeneralOrdering"/>

+    </types>

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Generalization" helper="org.eclipse.papyrus.uml.service.types.helper.GeneralizationEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Generalization"/>

     </types>

-    <types specificName="GENERALIZATION_SET" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="GeneralizationSet" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/GeneralizationSet.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//GeneralizationSet"/>

     </types>

-    <types specificName="GENERAL_ORDERING" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-      <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//GeneralOrdering"/>

-    </types>

-    <types specificName="IMAGE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Image" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Image.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Image"/>

     </types>

-    <types specificName="INCLUDE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Include" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Include.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Include"/>

     </types>

-    <types specificName="INFORMATION_FLOW" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="InformationFlow" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationFlow.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//InformationFlow"/>

     </types>

-    <types specificName="INFORMATION_ITEM" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="InformationItem" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationItem.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//InformationItem"/>

     </types>

-    <types specificName="INITIAL_NODE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="InitialNode" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InitialNode.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//InitialNode"/>

     </types>

-    <types specificName="INPUT_PIN" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="InputPin" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InputPin.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//InputPin"/>

     </types>

-    <types specificName="INSTANCE_SPECIFICATION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="InstanceSpecification" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InstanceSpecification.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//InstanceSpecification"/>

     </types>

-    <types specificName="INSTANCE_VALUE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="InstanceValue" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InstanceValue.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//InstanceValue"/>

     </types>

-    <types specificName="INTERACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Interaction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interaction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Interaction"/>

     </types>

-    <types specificName="INTERACTION_CONSTRAINT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="InteractionConstraint" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InteractionConstraint.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//InteractionConstraint"/>

     </types>

-    <types specificName="INTERACTION_FRAGMENT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="InteractionFragment" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InteractionFragment.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//InteractionFragment"/>

     </types>

-    <types specificName="INTERACTION_OPERAND" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="InteractionOperand" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InteractionOperand.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//InteractionOperand"/>

     </types>

-    <types specificName="INTERACTION_USE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="InteractionUse" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InteractionUse.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//InteractionUse"/>

     </types>

-    <types specificName="INTERFACE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Interface" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Interface"/>

     </types>

-    <types specificName="INTERFACE_REALIZATION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.InterfaceRealizationEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="InterfaceRealization" helper="org.eclipse.papyrus.uml.service.types.helper.InterfaceRealizationEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InterfaceRealization.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//InterfaceRealization"/>

     </types>

-    <types specificName="INTERRUPTIBLE_ACTIVITY_REGION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="InterruptibleActivityRegion" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InterruptibleActivityRegion.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//InterruptibleActivityRegion"/>

     </types>

-    <types specificName="INTERVAL" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Interval" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interval.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Interval"/>

     </types>

-    <types specificName="INTERVAL_CONSTRAINT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="IntervalConstraint" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/IntervalConstraint.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//IntervalConstraint"/>

     </types>

-    <types specificName="INVOCATION_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="InvocationAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InvocationAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//InvocationAction"/>

     </types>

-    <types specificName="JOIN_NODE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="JoinNode" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/JoinNode.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//JoinNode"/>

     </types>

-    <types specificName="LIFELINE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Lifeline" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Lifeline.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Lifeline"/>

     </types>

-    <types specificName="LINK_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="LinkAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/LinkAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//LinkAction"/>

     </types>

-    <types specificName="LINK_END_CREATION_DATA" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="LinkEndCreationData" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/LinkEndCreationData.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//LinkEndCreationData"/>

     </types>

-    <types specificName="LINK_END_DATA" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="LinkEndData" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/LinkEndData.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//LinkEndData"/>

     </types>

-    <types specificName="LINK_END_DESTRUCTION_DATA" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="LinkEndDestructionData" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/LinkEndDestructionData.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//LinkEndDestructionData"/>

     </types>

-    <types specificName="LITERAL_BOOLEAN" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="LiteralBoolean" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/LiteralBoolean.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//LiteralBoolean"/>

     </types>

-    <types specificName="LITERAL_INTEGER" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="LiteralInteger" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/LiteralInteger.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//LiteralInteger"/>

     </types>

-    <types specificName="LITERAL_NULL" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="LiteralNull" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/LiteralNull.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//LiteralNull"/>

     </types>

-    <types specificName="LITERAL_SPECIFICATION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="LiteralSpecification" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/LiteralSpecification.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//LiteralSpecification"/>

     </types>

-    <types specificName="LITERAL_STRING" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="LiteralString" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/LiteralString.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//LiteralString"/>

     </types>

-    <types specificName="LITERAL_UNLIMITED_NATURAL" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="LiteralUnlimitedNatural" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/LiteralUnlimitedNatural.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//LiteralUnlimitedNatural"/>

     </types>

-    <types specificName="LOOP_NODE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="LoopNode" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/LoopNode.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//LoopNode"/>

     </types>

-    <types specificName="MANIFESTATION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Manifestation" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Manifestation.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Manifestation"/>

     </types>

-    <types specificName="MERGE_NODE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="MergeNode" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/MergeNode.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//MergeNode"/>

     </types>

-    <types specificName="MESSAGE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.MessageEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Message" helper="org.eclipse.papyrus.uml.service.types.helper.MessageEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Message"/>

     </types>

-    <types specificName="MESSAGE_END" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="MessageEnd" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/MessageEnd.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//MessageEnd"/>

     </types>

-    <types specificName="MESSAGE_EVENT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="MessageEvent" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/MessageEvent.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//MessageEvent"/>

     </types>

-    <types specificName="MESSAGE_OCCURRENCE_SPECIFICATION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="MessageOccurrenceSpecification" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/MessageOccurrenceSpecification.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//MessageOccurrenceSpecification"/>

     </types>

-    <types specificName="MODEL" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Model" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Model.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Model"/>

     </types>

-    <types specificName="MULTIPLICITY_ELEMENT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="MultiplicityElement" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/MultiplicityElement.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//MultiplicityElement"/>

     </types>

-    <types specificName="NAMED_ELEMENT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="NamedElement" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/NamedElement.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//NamedElement"/>

     </types>

-    <types specificName="NAMESPACE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Namespace" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Namespace.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Namespace"/>

     </types>

-    <types specificName="NODE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Node" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Node.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Node"/>

     </types>

-    <types specificName="OBJECT_FLOW" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ObjectFlow" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ObjectFlow.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ObjectFlow"/>

     </types>

-    <types specificName="OBJECT_NODE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ObjectNode" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ObjectNode.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ObjectNode"/>

     </types>

-    <types specificName="OBSERVATION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Observation" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Observation.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Observation"/>

     </types>

-    <types specificName="OCCURRENCE_SPECIFICATION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="OccurrenceSpecification" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OccurrenceSpecification.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//OccurrenceSpecification"/>

     </types>

-    <types specificName="OPAQUE_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="OpaqueAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OpaqueAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//OpaqueAction"/>

     </types>

-    <types specificName="OPAQUE_BEHAVIOR" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="OpaqueBehavior" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OpaqueBehavior.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//OpaqueBehavior"/>

     </types>

-    <types specificName="OPAQUE_EXPRESSION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="OpaqueExpression" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OpaqueExpression.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//OpaqueExpression"/>

     </types>

-    <types specificName="OPERATION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Operation" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Operation"/>

     </types>

-    <types specificName="OPERATION_TEMPLATE_PARAMETER" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="OperationTemplateParameter" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OperationTemplateParameter.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//OperationTemplateParameter"/>

     </types>

-    <types specificName="OUTPUT_PIN" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="OutputPin" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OutputPin.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//OutputPin"/>

     </types>

-    <types specificName="PACKAGE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Package" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Package"/>

     </types>

-    <types specificName="PACKAGEABLE_ELEMENT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-      <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//PackageableElement"/>

-    </types>

-    <types specificName="PACKAGE_IMPORT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="PackageImport" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PackageImport.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//PackageImport"/>

     </types>

-    <types specificName="PACKAGE_MERGE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="PackageMerge" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PackageMerge.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//PackageMerge"/>

     </types>

-    <types specificName="PARAMETER" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-      <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Parameter"/>

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="PackageableElement" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PackageableElement.gif">

+      <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//PackageableElement"/>

     </types>

-    <types specificName="PARAMETERABLE_ELEMENT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-      <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ParameterableElement"/>

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Parameter" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Parameter.gif">

+      <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Parameter"/>

     </types>

-    <types specificName="PARAMETER_SET" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ParameterSet" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ParameterSet.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ParameterSet"/>

     </types>

-    <types specificName="PART_DECOMPOSITION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ParameterableElement" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ParameterableElement.gif">

+      <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ParameterableElement"/>

+    </types>

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="PartDecomposition" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PartDecomposition.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//PartDecomposition"/>

     </types>

-    <types specificName="PIN" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Pin" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pin.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Pin"/>

     </types>

-    <types specificName="PORT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.PortEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Port" helper="org.eclipse.papyrus.uml.service.types.helper.PortEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Port"/>

     </types>

-    <types specificName="PRIMITIVE_TYPE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="PrimitiveType" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PrimitiveType.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//PrimitiveType"/>

     </types>

-    <types specificName="PROFILE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Profile" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Profile.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Profile"/>

     </types>

-    <types specificName="PROFILE_APPLICATION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ProfileApplication" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProfileApplication.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ProfileApplication"/>

     </types>

-    <types specificName="PROPERTY" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Property" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Property"/>

     </types>

-    <types specificName="PROTOCOL_CONFORMANCE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ProtocolConformance" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProtocolConformance.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ProtocolConformance"/>

     </types>

-    <types specificName="PROTOCOL_STATE_MACHINE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ProtocolStateMachine" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProtocolStateMachine.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ProtocolStateMachine"/>

     </types>

-    <types specificName="PROTOCOL_TRANSITION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ProtocolTransition" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProtocolTransition.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ProtocolTransition"/>

     </types>

-    <types specificName="PSEUDOSTATE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Pseudostate" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Pseudostate"/>

     </types>

-    <types specificName="QUALIFIER_VALUE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="QualifierValue" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/QualifierValue.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//QualifierValue"/>

     </types>

-    <types specificName="RAISE_EXCEPTION_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="RaiseExceptionAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/RaiseExceptionAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//RaiseExceptionAction"/>

     </types>

-    <types specificName="READ_EXTENT_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ReadExtentAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReadExtentAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ReadExtentAction"/>

     </types>

-    <types specificName="READ_IS_CLASSIFIED_OBJECT_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ReadIsClassifiedObjectAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReadIsClassifiedObjectAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ReadIsClassifiedObjectAction"/>

     </types>

-    <types specificName="READ_LINK_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ReadLinkAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReadLinkAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ReadLinkAction"/>

     </types>

-    <types specificName="READ_LINK_OBJECT_END_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ReadLinkObjectEndAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReadLinkObjectEndAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ReadLinkObjectEndAction"/>

     </types>

-    <types specificName="READ_LINK_OBJECT_END_QUALIFIER_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ReadLinkObjectEndQualifierAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReadLinkObjectEndQualifierAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ReadLinkObjectEndQualifierAction"/>

     </types>

-    <types specificName="READ_SELF_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ReadSelfAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReadSelfAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ReadSelfAction"/>

     </types>

-    <types specificName="READ_STRUCTURAL_FEATURE_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ReadStructuralFeatureAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReadStructuralFeatureAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ReadStructuralFeatureAction"/>

     </types>

-    <types specificName="READ_VARIABLE_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ReadVariableAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReadVariableAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ReadVariableAction"/>

     </types>

-    <types specificName="REALIZATION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Realization" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Realization.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Realization"/>

     </types>

-    <types specificName="RECEIVE_OPERATION_EVENT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ReceiveOperationEvent" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReceiveOperationEvent.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ReceiveOperationEvent"/>

     </types>

-    <types specificName="RECEIVE_SIGNAL_EVENT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ReceiveSignalEvent" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReceiveSignalEvent.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ReceiveSignalEvent"/>

     </types>

-    <types specificName="RECEPTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Reception" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Reception.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Reception"/>

     </types>

-    <types specificName="RECLASSIFY_OBJECT_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ReclassifyObjectAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReclassifyObjectAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ReclassifyObjectAction"/>

     </types>

-    <types specificName="REDEFINABLE_ELEMENT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="RedefinableElement" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/RedefinableElement.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//RedefinableElement"/>

     </types>

-    <types specificName="REDEFINABLE_TEMPLATE_SIGNATURE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="RedefinableTemplateSignature" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/RedefinableTemplateSignature.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//RedefinableTemplateSignature"/>

     </types>

-    <types specificName="REDUCE_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ReduceAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReduceAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ReduceAction"/>

     </types>

-    <types specificName="REGION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Region" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Region.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Region"/>

     </types>

-    <types specificName="RELATIONSHIP" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Relationship" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Relationship.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Relationship"/>

     </types>

-    <types specificName="REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="RemoveStructuralFeatureValueAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/RemoveStructuralFeatureValueAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//RemoveStructuralFeatureValueAction"/>

     </types>

-    <types specificName="REMOVE_VARIABLE_VALUE_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="RemoveVariableValueAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/RemoveVariableValueAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//RemoveVariableValueAction"/>

     </types>

-    <types specificName="REPLY_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ReplyAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReplyAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ReplyAction"/>

     </types>

-    <types specificName="SEND_OBJECT_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="SendObjectAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/SendObjectAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//SendObjectAction"/>

     </types>

-    <types specificName="SEND_OPERATION_EVENT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="SendOperationEvent" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/SendOperationEvent.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//SendOperationEvent"/>

     </types>

-    <types specificName="SEND_SIGNAL_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="SendSignalAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/SendSignalAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//SendSignalAction"/>

     </types>

-    <types specificName="SEND_SIGNAL_EVENT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="SendSignalEvent" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/SendSignalEvent.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//SendSignalEvent"/>

     </types>

-    <types specificName="SEQUENCE_NODE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="SequenceNode" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/SequenceNode.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//SequenceNode"/>

     </types>

-    <types specificName="SIGNAL" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Signal" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Signal.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Signal"/>

     </types>

-    <types specificName="SIGNAL_EVENT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="SignalEvent" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/SignalEvent.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//SignalEvent"/>

     </types>

-    <types specificName="SLOT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Slot" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Slot.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Slot"/>

     </types>

-    <types specificName="START_CLASSIFIER_BEHAVIOR_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="StartClassifierBehaviorAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StartClassifierBehaviorAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//StartClassifierBehaviorAction"/>

     </types>

-    <types specificName="START_OBJECT_BEHAVIOR_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="StartObjectBehaviorAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StartObjectBehaviorAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//StartObjectBehaviorAction"/>

     </types>

-    <types specificName="STATE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="State" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/State.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//State"/>

     </types>

-    <types specificName="STATE_INVARIANT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="StateInvariant" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StateInvariant.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//StateInvariant"/>

     </types>

-    <types specificName="STATE_MACHINE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="StateMachine" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StateMachine.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//StateMachine"/>

     </types>

-    <types specificName="STEREOTYPE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Stereotype" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Stereotype.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Stereotype"/>

     </types>

-    <types specificName="STRING_EXPRESSION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="StringExpression" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StringExpression.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//StringExpression"/>

     </types>

-    <types specificName="STRUCTURAL_FEATURE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="StructuralFeature" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StructuralFeature.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//StructuralFeature"/>

     </types>

-    <types specificName="STRUCTURAL_FEATURE_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="StructuralFeatureAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StructuralFeatureAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//StructuralFeatureAction"/>

     </types>

-    <types specificName="STRUCTURED_ACTIVITY_NODE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="StructuredActivityNode" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StructuredActivityNode.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//StructuredActivityNode"/>

     </types>

-    <types specificName="STRUCTURED_CLASSIFIER" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="StructuredClassifier" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StructuredClassifier.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//StructuredClassifier"/>

     </types>

-    <types specificName="SUBSTITUTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Substitution" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Substitution"/>

     </types>

-    <types specificName="TEMPLATEABLE_ELEMENT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-      <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//TemplateableElement"/>

-    </types>

-    <types specificName="TEMPLATE_BINDING" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="TemplateBinding" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TemplateBinding.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//TemplateBinding"/>

     </types>

-    <types specificName="TEMPLATE_PARAMETER" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="TemplateParameter" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TemplateParameter.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//TemplateParameter"/>

     </types>

-    <types specificName="TEMPLATE_PARAMETER_SUBSTITUTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="TemplateParameterSubstitution" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TemplateParameterSubstitution.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//TemplateParameterSubstitution"/>

     </types>

-    <types specificName="TEMPLATE_SIGNATURE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="TemplateSignature" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TemplateSignature.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//TemplateSignature"/>

     </types>

-    <types specificName="TEST_IDENTITY_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="TemplateableElement" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TemplateableElement.gif">

+      <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//TemplateableElement"/>

+    </types>

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="TestIdentityAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TestIdentityAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//TestIdentityAction"/>

     </types>

-    <types specificName="TIME_CONSTRAINT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="TimeConstraint" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeConstraint.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//TimeConstraint"/>

     </types>

-    <types specificName="TIME_EVENT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="TimeEvent" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeEvent.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//TimeEvent"/>

     </types>

-    <types specificName="TIME_EXPRESSION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="TimeExpression" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeExpression.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//TimeExpression"/>

     </types>

-    <types specificName="TIME_INTERVAL" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="TimeInterval" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeInterval.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//TimeInterval"/>

     </types>

-    <types specificName="TIME_OBSERVATION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="TimeObservation" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//TimeObservation"/>

     </types>

-    <types specificName="TRANSITION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Transition" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Transition.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Transition"/>

     </types>

-    <types specificName="TRIGGER" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Trigger" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Trigger.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Trigger"/>

     </types>

-    <types specificName="TYPE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Type" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Type.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Type"/>

     </types>

-    <types specificName="TYPED_ELEMENT" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="TypedElement" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TypedElement.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//TypedElement"/>

     </types>

-    <types specificName="UNMARSHALL_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="UnmarshallAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/UnmarshallAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//UnmarshallAction"/>

     </types>

-    <types specificName="USAGE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.UsageEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Usage" helper="org.eclipse.papyrus.uml.service.types.helper.UsageEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Usage"/>

     </types>

-    <types specificName="USE_CASE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="UseCase" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/UseCase.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//UseCase"/>

     </types>

-    <types specificName="VALUE_PIN" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ValuePin" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ValuePin.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ValuePin"/>

     </types>

-    <types specificName="VALUE_SPECIFICATION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ValueSpecification" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ValueSpecification.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ValueSpecification"/>

     </types>

-    <types specificName="VALUE_SPECIFICATION_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="ValueSpecificationAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ValueSpecificationAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//ValueSpecificationAction"/>

     </types>

-    <types specificName="VARIABLE" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Variable" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Variable.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Variable"/>

     </types>

-    <types specificName="VARIABLE_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="VariableAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/VariableAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//VariableAction"/>

     </types>

-    <types specificName="VERTEX" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="Vertex" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Vertex.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//Vertex"/>

     </types>

-    <types specificName="WRITE_LINK_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="WriteLinkAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/WriteLinkAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//WriteLinkAction"/>

     </types>

-    <types specificName="WRITE_STRUCTURAL_FEATURE_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="WriteStructuralFeatureAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/WriteStructuralFeatureAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//WriteStructuralFeatureAction"/>

     </types>

-    <types specificName="WRITE_VARIABLE_ACTION" edithelper_EditHelperAdvicePath="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+    <types xsi:type="domaincontextcodegen:MetaClassType" name="WriteVariableAction" helper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/WriteVariableAction.gif">

       <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.ecore#//WriteVariableAction"/>

     </types>

   </elementTypes>

-  <genHandlers handlerPackage="org.eclipse.papyrus.uml.modelexplorer.handler" superClass="CreateCommandHandler" superClassPackage="org.eclipse.papyrus.uml.modelexplorer.handler" elementTypeEnumerator="UMLElementTypes" elementTypeEnumeratorPackage="org.eclipse.papyrus.uml.service.types.element"/>

+  <advices adviceID="org.eclipse.papyrus.uml.advice.Classifier" ref="//@elementTypes/@types.32" advicePath="org.eclipse.papyrus.uml.service.types.helper.advice.ClassifierHelperAdvice" inheritance="all"/>

+  <advices adviceID="org.eclipse.papyrus.uml.advice.Collaboration" ref="//@elementTypes/@types.38" advicePath="org.eclipse.papyrus.uml.service.types.helper.advice.CollaborationHelperAdvice"/>

+  <advices adviceID="org.eclipse.papyrus.uml.advice.CollaborationUse" ref="//@elementTypes/@types.39" advicePath="org.eclipse.papyrus.uml.service.types.helper.advice.CollaborationUseHelperAdvice"/>

+  <advices adviceID="org.eclipse.papyrus.uml.advice.ConnectorEnd" ref="//@elementTypes/@types.50" advicePath="org.eclipse.papyrus.uml.service.types.helper.advice.ConnectorEndHelperAdvice"/>

+  <advices adviceID="org.eclipse.papyrus.uml.advice.DestructionEvent" ref="//@elementTypes/@types.70" advicePath="org.eclipse.papyrus.uml.service.types.helper.advice.DestructionEventHelperAdvice" inheritance="all"/>

+  <advices adviceID="org.eclipse.papyrus.uml.advice.ElementUnapplyStereotype" ref="//@elementTypes/@types.77" advicePath="org.eclipse.papyrus.uml.service.types.helper.advice.ElementUnapplyStereotypeHelperAdvice" inheritance="all"/>

+  <advices adviceID="org.eclipse.papyrus.uml.advice.ExecutionSpecification" ref="//@elementTypes/@types.88" advicePath="org.eclipse.papyrus.uml.service.types.helper.advice.ExecutionSpecificationHelperAdvice" inheritance="all"/>

+  <advices adviceID="org.eclipse.papyrus.uml.advice.Generalization" ref="//@elementTypes/@types.104" advicePath="org.eclipse.papyrus.uml.service.types.helper.advice.GeneralizationHelperAdvice"/>

+  <advices adviceID="org.eclipse.papyrus.uml.advice.Lifeline" ref="//@elementTypes/@types.126" advicePath="org.eclipse.papyrus.uml.service.types.helper.advice.LifelineHelperAdvice" inheritance="all"/>

+  <advices adviceID="org.eclipse.papyrus.uml.advice.Message" ref="//@elementTypes/@types.140" advicePath="org.eclipse.papyrus.uml.service.types.helper.advice.MessageHelperAdvice" inheritance="all"/>

+  <advices adviceID="org.eclipse.papyrus.uml.advice.MessageEnd" ref="//@elementTypes/@types.141" advicePath="org.eclipse.papyrus.uml.service.types.helper.advice.MessageEndHelperAdvice" inheritance="all"/>

+  <advices adviceID="org.eclipse.papyrus.uml.advice.NameElementInitializer" ref="//@elementTypes/@types.146" advicePath="org.eclipse.papyrus.uml.service.types.helper.advice.NamedElementInitializerHelperAdvice" inheritance="all"/>

+  <advices adviceID="org.eclipse.papyrus.uml.advice.OccurrenceSpecification" ref="//@elementTypes/@types.152" advicePath="org.eclipse.papyrus.uml.service.types.helper.advice.OccurrenceSpecificationHelperAdvice" inheritance="all"/>

+  <advices adviceID="org.eclipse.papyrus.uml.advice.PartDecomposition" ref="//@elementTypes/@types.166" advicePath="org.eclipse.papyrus.uml.service.types.helper.advice.PartDecompositionHelperAdvice"/>

+  <advices adviceID="org.eclipse.papyrus.uml.advice.Property" ref="//@elementTypes/@types.172" advicePath="org.eclipse.papyrus.uml.service.types.helper.advice.PropertyHelperAdvice" inheritance="all"/>

+  <bindings clientContextID="org.eclipse.papyrus.service.edit.TypeContext">

+    <bindings xsi:type="domaincontextcodegen:ElementTypeBinding" pattern="org.eclipse.papyrus.uml.*"/>

+    <bindings xsi:type="domaincontextcodegen:AdviceBinding" ref="//@advices.0"/>

+    <bindings xsi:type="domaincontextcodegen:AdviceBinding" ref="//@advices.1"/>

+    <bindings xsi:type="domaincontextcodegen:AdviceBinding" ref="//@advices.2"/>

+    <bindings xsi:type="domaincontextcodegen:AdviceBinding" ref="//@advices.3"/>

+    <bindings xsi:type="domaincontextcodegen:AdviceBinding" ref="//@advices.4"/>

+    <bindings xsi:type="domaincontextcodegen:AdviceBinding" ref="//@advices.5"/>

+    <bindings xsi:type="domaincontextcodegen:AdviceBinding" ref="//@advices.6"/>

+    <bindings xsi:type="domaincontextcodegen:AdviceBinding" ref="//@advices.7"/>

+    <bindings xsi:type="domaincontextcodegen:AdviceBinding" ref="//@advices.8"/>

+    <bindings xsi:type="domaincontextcodegen:AdviceBinding" ref="//@advices.9"/>

+    <bindings xsi:type="domaincontextcodegen:AdviceBinding" ref="//@advices.10"/>

+    <bindings xsi:type="domaincontextcodegen:AdviceBinding" ref="//@advices.11"/>

+    <bindings xsi:type="domaincontextcodegen:AdviceBinding" ref="//@advices.12"/>

+    <bindings xsi:type="domaincontextcodegen:AdviceBinding" ref="//@advices.13"/>

+    <bindings xsi:type="domaincontextcodegen:AdviceBinding" ref="//@advices.14"/>

+  </bindings>

+  <genHandlers handlerPackage="org.eclipse.papyrus.uml.modelexplorer.handler" superClass="CreateCommandHandler" superClassPackage="org.eclipse.papyrus.uml.modelexplorer.handler" elementTypeEnumerator="UMLElementTypes" elementTypeEnumeratorPackage="org.eclipse.papyrus.uml.service.types.element" visibleCreateChildHandlers="//@elementTypes/@types.1 //@elementTypes/@types.2 //@elementTypes/@types.4 //@elementTypes/@types.5 //@elementTypes/@types.6 //@elementTypes/@types.8 //@elementTypes/@types.11 //@elementTypes/@types.12 //@elementTypes/@types.13 //@elementTypes/@types.14 //@elementTypes/@types.15 //@elementTypes/@types.16 //@elementTypes/@types.17 //@elementTypes/@types.21 //@elementTypes/@types.24 //@elementTypes/@types.26 //@elementTypes/@types.27 //@elementTypes/@types.28 //@elementTypes/@types.29 //@elementTypes/@types.30 //@elementTypes/@types.31 //@elementTypes/@types.33 //@elementTypes/@types.34 //@elementTypes/@types.35 //@elementTypes/@types.36 //@elementTypes/@types.37 //@elementTypes/@types.38 //@elementTypes/@types.39 //@elementTypes/@types.40 //@elementTypes/@types.41 //@elementTypes/@types.43 //@elementTypes/@types.45 //@elementTypes/@types.47 //@elementTypes/@types.51 //@elementTypes/@types.52 //@elementTypes/@types.53 //@elementTypes/@types.54 //@elementTypes/@types.56 //@elementTypes/@types.57 //@elementTypes/@types.58 //@elementTypes/@types.59 //@elementTypes/@types.60 //@elementTypes/@types.61 //@elementTypes/@types.62 //@elementTypes/@types.66 //@elementTypes/@types.68 //@elementTypes/@types.69 //@elementTypes/@types.70 //@elementTypes/@types.71 //@elementTypes/@types.73 //@elementTypes/@types.74 //@elementTypes/@types.75 //@elementTypes/@types.76 //@elementTypes/@types.78 //@elementTypes/@types.80 //@elementTypes/@types.81 //@elementTypes/@types.83 //@elementTypes/@types.85 //@elementTypes/@types.86 //@elementTypes/@types.87 //@elementTypes/@types.89 //@elementTypes/@types.90 //@elementTypes/@types.91 //@elementTypes/@types.95 //@elementTypes/@types.98 //@elementTypes/@types.99 //@elementTypes/@types.100 //@elementTypes/@types.101 //@elementTypes/@types.102 //@elementTypes/@types.103 //@elementTypes/@types.106 //@elementTypes/@types.109 //@elementTypes/@types.110 //@elementTypes/@types.111 //@elementTypes/@types.112 //@elementTypes/@types.113 //@elementTypes/@types.114 //@elementTypes/@types.115 //@elementTypes/@types.117 //@elementTypes/@types.118 //@elementTypes/@types.119 //@elementTypes/@types.121 //@elementTypes/@types.122 //@elementTypes/@types.123 //@elementTypes/@types.125 //@elementTypes/@types.126 //@elementTypes/@types.128 //@elementTypes/@types.129 //@elementTypes/@types.130 //@elementTypes/@types.131 //@elementTypes/@types.132 //@elementTypes/@types.133 //@elementTypes/@types.135 //@elementTypes/@types.136 //@elementTypes/@types.137 //@elementTypes/@types.139 //@elementTypes/@types.144 //@elementTypes/@types.148 //@elementTypes/@types.149 //@elementTypes/@types.152 //@elementTypes/@types.153 //@elementTypes/@types.154 //@elementTypes/@types.155 //@elementTypes/@types.156 //@elementTypes/@types.157 //@elementTypes/@types.158 //@elementTypes/@types.159 //@elementTypes/@types.160 //@elementTypes/@types.163 //@elementTypes/@types.164 //@elementTypes/@types.166 //@elementTypes/@types.167 //@elementTypes/@types.168 //@elementTypes/@types.169 //@elementTypes/@types.170 //@elementTypes/@types.172 //@elementTypes/@types.174 //@elementTypes/@types.175 //@elementTypes/@types.177 //@elementTypes/@types.178 //@elementTypes/@types.179 //@elementTypes/@types.180 //@elementTypes/@types.181 //@elementTypes/@types.182 //@elementTypes/@types.183 //@elementTypes/@types.184 //@elementTypes/@types.185 //@elementTypes/@types.186 //@elementTypes/@types.188 //@elementTypes/@types.189 //@elementTypes/@types.190 //@elementTypes/@types.191 //@elementTypes/@types.193 //@elementTypes/@types.194 //@elementTypes/@types.195 //@elementTypes/@types.197 //@elementTypes/@types.198 //@elementTypes/@types.199 //@elementTypes/@types.200 //@elementTypes/@types.201 //@elementTypes/@types.202 //@elementTypes/@types.203 //@elementTypes/@types.204 //@elementTypes/@types.205 //@elementTypes/@types.206 //@elementTypes/@types.207 //@elementTypes/@types.208 //@elementTypes/@types.209 //@elementTypes/@types.210 //@elementTypes/@types.211 //@elementTypes/@types.212 //@elementTypes/@types.213 //@elementTypes/@types.214 //@elementTypes/@types.217 //@elementTypes/@types.220 //@elementTypes/@types.221 //@elementTypes/@types.222 //@elementTypes/@types.223 //@elementTypes/@types.225 //@elementTypes/@types.226 //@elementTypes/@types.227 //@elementTypes/@types.228 //@elementTypes/@types.229 //@elementTypes/@types.230 //@elementTypes/@types.232 //@elementTypes/@types.235 //@elementTypes/@types.237 //@elementTypes/@types.238 //@elementTypes/@types.240 //@elementTypes/@types.241" createChildMenuLocationURI="popup:org.eclipse.papyrus.modelexplorer.popupmenu.createchild"/>

 </domaincontextcodegen:DomainContext>

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/plugin.xml b/plugins/uml/org.eclipse.papyrus.uml.service.types/plugin.xml
index 2233487a423..3f02f759471 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/plugin.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/plugin.xml
@@ -1,1868 +1,2117 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-

-<!-- UML ElementType declarations -->

-<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">

-

-	<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">

-	

-	<!-- Declaration of IElementTypes -->

-	

-	<!-- IElementTypes for Abstraction -->

-	<metamodelType eclass="Abstraction" id="org.eclipse.papyrus.uml.Abstraction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Abstraction">

-		<param name="semanticHint" value="UML::Abstraction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for AcceptCallAction -->

-	<metamodelType eclass="AcceptCallAction" id="org.eclipse.papyrus.uml.AcceptCallAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::AcceptCallAction">

-		<param name="semanticHint" value="UML::AcceptCallAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for AcceptEventAction -->

-	<metamodelType eclass="AcceptEventAction" id="org.eclipse.papyrus.uml.AcceptEventAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::AcceptEventAction">

-		<param name="semanticHint" value="UML::AcceptEventAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Action -->

-	<metamodelType eclass="Action" id="org.eclipse.papyrus.uml.Action"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Action">

-		<param name="semanticHint" value="UML::Action"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ActionExecutionSpecification -->

-	<metamodelType eclass="ActionExecutionSpecification" id="org.eclipse.papyrus.uml.ActionExecutionSpecification"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ActionExecutionSpecification">

-		<param name="semanticHint" value="UML::ActionExecutionSpecification"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ActionInputPin -->

-	<metamodelType eclass="ActionInputPin" id="org.eclipse.papyrus.uml.ActionInputPin"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ActionInputPin">

-		<param name="semanticHint" value="UML::ActionInputPin"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Activity -->

-	<metamodelType eclass="Activity" id="org.eclipse.papyrus.uml.Activity"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Activity">

-		<param name="semanticHint" value="UML::Activity"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ActivityEdge -->

-	<metamodelType eclass="ActivityEdge" id="org.eclipse.papyrus.uml.ActivityEdge"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ActivityEdge">

-		<param name="semanticHint" value="UML::ActivityEdge"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ActivityFinalNode -->

-	<metamodelType eclass="ActivityFinalNode" id="org.eclipse.papyrus.uml.ActivityFinalNode"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ActivityFinalNode">

-		<param name="semanticHint" value="UML::ActivityFinalNode"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ActivityGroup -->

-	<metamodelType eclass="ActivityGroup" id="org.eclipse.papyrus.uml.ActivityGroup"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ActivityGroup">

-		<param name="semanticHint" value="UML::ActivityGroup"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ActivityNode -->

-	<metamodelType eclass="ActivityNode" id="org.eclipse.papyrus.uml.ActivityNode"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ActivityNode">

-		<param name="semanticHint" value="UML::ActivityNode"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ActivityParameterNode -->

-	<metamodelType eclass="ActivityParameterNode" id="org.eclipse.papyrus.uml.ActivityParameterNode"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ActivityParameterNode">

-		<param name="semanticHint" value="UML::ActivityParameterNode"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ActivityPartition -->

-	<metamodelType eclass="ActivityPartition" id="org.eclipse.papyrus.uml.ActivityPartition"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ActivityPartition">

-		<param name="semanticHint" value="UML::ActivityPartition"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Actor -->

-	<metamodelType eclass="Actor" id="org.eclipse.papyrus.uml.Actor"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Actor">

-		<param name="semanticHint" value="UML::Actor"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for AddStructuralFeatureValueAction -->

-	<metamodelType eclass="AddStructuralFeatureValueAction" id="org.eclipse.papyrus.uml.AddStructuralFeatureValueAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::AddStructuralFeatureValueAction">

-		<param name="semanticHint" value="UML::AddStructuralFeatureValueAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for AddVariableValueAction -->

-	<metamodelType eclass="AddVariableValueAction" id="org.eclipse.papyrus.uml.AddVariableValueAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::AddVariableValueAction">

-		<param name="semanticHint" value="UML::AddVariableValueAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for AnyReceiveEvent -->

-	<metamodelType eclass="AnyReceiveEvent" id="org.eclipse.papyrus.uml.AnyReceiveEvent"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::AnyReceiveEvent">

-		<param name="semanticHint" value="UML::AnyReceiveEvent"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Artifact -->

-	<metamodelType eclass="Artifact" id="org.eclipse.papyrus.uml.Artifact"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Artifact">

-		<param name="semanticHint" value="UML::Artifact"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Association -->

-	<metamodelType eclass="Association" id="org.eclipse.papyrus.uml.Association"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Association">

-		<param name="semanticHint" value="UML::Association"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for AssociationClass -->

-	<metamodelType eclass="AssociationClass" id="org.eclipse.papyrus.uml.AssociationClass"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::AssociationClass">

-		<param name="semanticHint" value="UML::AssociationClass"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Behavior -->

-	<metamodelType eclass="Behavior" id="org.eclipse.papyrus.uml.Behavior"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Behavior">

-		<param name="semanticHint" value="UML::Behavior"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for BehavioralFeature -->

-	<metamodelType eclass="BehavioralFeature" id="org.eclipse.papyrus.uml.BehavioralFeature"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::BehavioralFeature">

-		<param name="semanticHint" value="UML::BehavioralFeature"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for BehavioredClassifier -->

-	<metamodelType eclass="BehavioredClassifier" id="org.eclipse.papyrus.uml.BehavioredClassifier"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::BehavioredClassifier">

-		<param name="semanticHint" value="UML::BehavioredClassifier"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for BehaviorExecutionSpecification -->

-	<metamodelType eclass="BehaviorExecutionSpecification" id="org.eclipse.papyrus.uml.BehaviorExecutionSpecification"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::BehaviorExecutionSpecification">

-		<param name="semanticHint" value="UML::BehaviorExecutionSpecification"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for BroadcastSignalAction -->

-	<metamodelType eclass="BroadcastSignalAction" id="org.eclipse.papyrus.uml.BroadcastSignalAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::BroadcastSignalAction">

-		<param name="semanticHint" value="UML::BroadcastSignalAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for CallAction -->

-	<metamodelType eclass="CallAction" id="org.eclipse.papyrus.uml.CallAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::CallAction">

-		<param name="semanticHint" value="UML::CallAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for CallBehaviorAction -->

-	<metamodelType eclass="CallBehaviorAction" id="org.eclipse.papyrus.uml.CallBehaviorAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::CallBehaviorAction">

-		<param name="semanticHint" value="UML::CallBehaviorAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for CallEvent -->

-	<metamodelType eclass="CallEvent" id="org.eclipse.papyrus.uml.CallEvent"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::CallEvent">

-		<param name="semanticHint" value="UML::CallEvent"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for CallOperationAction -->

-	<metamodelType eclass="CallOperationAction" id="org.eclipse.papyrus.uml.CallOperationAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::CallOperationAction">

-		<param name="semanticHint" value="UML::CallOperationAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for CentralBufferNode -->

-	<metamodelType eclass="CentralBufferNode" id="org.eclipse.papyrus.uml.CentralBufferNode"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::CentralBufferNode">

-		<param name="semanticHint" value="UML::CentralBufferNode"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ChangeEvent -->

-	<metamodelType eclass="ChangeEvent" id="org.eclipse.papyrus.uml.ChangeEvent"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ChangeEvent">

-		<param name="semanticHint" value="UML::ChangeEvent"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Class -->

-	<metamodelType eclass="Class" id="org.eclipse.papyrus.uml.Class"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Class">

-		<param name="semanticHint" value="UML::Class"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Classifier -->

-	<metamodelType eclass="Classifier" id="org.eclipse.papyrus.uml.Classifier"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Classifier">

-		<param name="semanticHint" value="UML::Classifier"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ClassifierTemplateParameter -->

-	<metamodelType eclass="ClassifierTemplateParameter" id="org.eclipse.papyrus.uml.ClassifierTemplateParameter"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ClassifierTemplateParameter">

-		<param name="semanticHint" value="UML::ClassifierTemplateParameter"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Clause -->

-	<metamodelType eclass="Clause" id="org.eclipse.papyrus.uml.Clause"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Clause">

-		<param name="semanticHint" value="UML::Clause"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ClearAssociationAction -->

-	<metamodelType eclass="ClearAssociationAction" id="org.eclipse.papyrus.uml.ClearAssociationAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ClearAssociationAction">

-		<param name="semanticHint" value="UML::ClearAssociationAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ClearStructuralFeatureAction -->

-	<metamodelType eclass="ClearStructuralFeatureAction" id="org.eclipse.papyrus.uml.ClearStructuralFeatureAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ClearStructuralFeatureAction">

-		<param name="semanticHint" value="UML::ClearStructuralFeatureAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ClearVariableAction -->

-	<metamodelType eclass="ClearVariableAction" id="org.eclipse.papyrus.uml.ClearVariableAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ClearVariableAction">

-		<param name="semanticHint" value="UML::ClearVariableAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Collaboration -->

-	<metamodelType eclass="Collaboration" id="org.eclipse.papyrus.uml.Collaboration"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Collaboration">

-		<param name="semanticHint" value="UML::Collaboration"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for CollaborationUse -->

-	<metamodelType eclass="CollaborationUse" id="org.eclipse.papyrus.uml.CollaborationUse"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::CollaborationUse">

-		<param name="semanticHint" value="UML::CollaborationUse"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for CombinedFragment -->

-	<metamodelType eclass="CombinedFragment" id="org.eclipse.papyrus.uml.CombinedFragment"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::CombinedFragment">

-		<param name="semanticHint" value="UML::CombinedFragment"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Comment -->

-	<metamodelType eclass="Comment" id="org.eclipse.papyrus.uml.Comment"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Comment">

-		<param name="semanticHint" value="UML::Comment"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for CommunicationPath -->

-	<metamodelType eclass="CommunicationPath" id="org.eclipse.papyrus.uml.CommunicationPath"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::CommunicationPath">

-		<param name="semanticHint" value="UML::CommunicationPath"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Component -->

-	<metamodelType eclass="Component" id="org.eclipse.papyrus.uml.Component"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Component">

-		<param name="semanticHint" value="UML::Component"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ComponentRealization -->

-	<metamodelType eclass="ComponentRealization" id="org.eclipse.papyrus.uml.ComponentRealization"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ComponentRealization">

-		<param name="semanticHint" value="UML::ComponentRealization"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ConditionalNode -->

-	<metamodelType eclass="ConditionalNode" id="org.eclipse.papyrus.uml.ConditionalNode"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ConditionalNode">

-		<param name="semanticHint" value="UML::ConditionalNode"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ConnectableElement -->

-	<metamodelType eclass="ConnectableElement" id="org.eclipse.papyrus.uml.ConnectableElement"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ConnectableElement">

-		<param name="semanticHint" value="UML::ConnectableElement"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ConnectableElementTemplateParameter -->

-	<metamodelType eclass="ConnectableElementTemplateParameter" id="org.eclipse.papyrus.uml.ConnectableElementTemplateParameter"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ConnectableElementTemplateParameter">

-		<param name="semanticHint" value="UML::ConnectableElementTemplateParameter"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ConnectionPointReference -->

-	<metamodelType eclass="ConnectionPointReference" id="org.eclipse.papyrus.uml.ConnectionPointReference"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ConnectionPointReference">

-		<param name="semanticHint" value="UML::ConnectionPointReference"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Connector -->

-	<metamodelType eclass="Connector" id="org.eclipse.papyrus.uml.Connector"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Connector">

-		<param name="semanticHint" value="UML::Connector"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ConnectorEnd -->

-	<metamodelType eclass="ConnectorEnd" id="org.eclipse.papyrus.uml.ConnectorEnd"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ConnectorEnd">

-		<param name="semanticHint" value="UML::ConnectorEnd"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ConsiderIgnoreFragment -->

-	<metamodelType eclass="ConsiderIgnoreFragment" id="org.eclipse.papyrus.uml.ConsiderIgnoreFragment"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ConsiderIgnoreFragment">

-		<param name="semanticHint" value="UML::ConsiderIgnoreFragment"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Constraint -->

-	<metamodelType eclass="Constraint" id="org.eclipse.papyrus.uml.Constraint"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Constraint">

-		<param name="semanticHint" value="UML::Constraint"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Continuation -->

-	<metamodelType eclass="Continuation" id="org.eclipse.papyrus.uml.Continuation"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Continuation">

-		<param name="semanticHint" value="UML::Continuation"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ControlFlow -->

-	<metamodelType eclass="ControlFlow" id="org.eclipse.papyrus.uml.ControlFlow"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ControlFlow">

-		<param name="semanticHint" value="UML::ControlFlow"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ControlNode -->

-	<metamodelType eclass="ControlNode" id="org.eclipse.papyrus.uml.ControlNode"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ControlNode">

-		<param name="semanticHint" value="UML::ControlNode"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for CreateLinkAction -->

-	<metamodelType eclass="CreateLinkAction" id="org.eclipse.papyrus.uml.CreateLinkAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::CreateLinkAction">

-		<param name="semanticHint" value="UML::CreateLinkAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for CreateLinkObjectAction -->

-	<metamodelType eclass="CreateLinkObjectAction" id="org.eclipse.papyrus.uml.CreateLinkObjectAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::CreateLinkObjectAction">

-		<param name="semanticHint" value="UML::CreateLinkObjectAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for CreateObjectAction -->

-	<metamodelType eclass="CreateObjectAction" id="org.eclipse.papyrus.uml.CreateObjectAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::CreateObjectAction">

-		<param name="semanticHint" value="UML::CreateObjectAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for CreationEvent -->

-	<metamodelType eclass="CreationEvent" id="org.eclipse.papyrus.uml.CreationEvent"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::CreationEvent">

-		<param name="semanticHint" value="UML::CreationEvent"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for DataStoreNode -->

-	<metamodelType eclass="DataStoreNode" id="org.eclipse.papyrus.uml.DataStoreNode"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::DataStoreNode">

-		<param name="semanticHint" value="UML::DataStoreNode"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for DataType -->

-	<metamodelType eclass="DataType" id="org.eclipse.papyrus.uml.DataType"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::DataType">

-		<param name="semanticHint" value="UML::DataType"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for DecisionNode -->

-	<metamodelType eclass="DecisionNode" id="org.eclipse.papyrus.uml.DecisionNode"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::DecisionNode">

-		<param name="semanticHint" value="UML::DecisionNode"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Dependency -->

-	<metamodelType eclass="Dependency" id="org.eclipse.papyrus.uml.Dependency"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DependencyEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Dependency">

-		<param name="semanticHint" value="UML::Dependency"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for DeployedArtifact -->

-	<metamodelType eclass="DeployedArtifact" id="org.eclipse.papyrus.uml.DeployedArtifact"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::DeployedArtifact">

-		<param name="semanticHint" value="UML::DeployedArtifact"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Deployment -->

-	<metamodelType eclass="Deployment" id="org.eclipse.papyrus.uml.Deployment"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Deployment">

-		<param name="semanticHint" value="UML::Deployment"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for DeploymentSpecification -->

-	<metamodelType eclass="DeploymentSpecification" id="org.eclipse.papyrus.uml.DeploymentSpecification"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::DeploymentSpecification">

-		<param name="semanticHint" value="UML::DeploymentSpecification"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for DeploymentTarget -->

-	<metamodelType eclass="DeploymentTarget" id="org.eclipse.papyrus.uml.DeploymentTarget"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::DeploymentTarget">

-		<param name="semanticHint" value="UML::DeploymentTarget"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for DestroyLinkAction -->

-	<metamodelType eclass="DestroyLinkAction" id="org.eclipse.papyrus.uml.DestroyLinkAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::DestroyLinkAction">

-		<param name="semanticHint" value="UML::DestroyLinkAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for DestroyObjectAction -->

-	<metamodelType eclass="DestroyObjectAction" id="org.eclipse.papyrus.uml.DestroyObjectAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::DestroyObjectAction">

-		<param name="semanticHint" value="UML::DestroyObjectAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for DestructionEvent -->

-	<metamodelType eclass="DestructionEvent" id="org.eclipse.papyrus.uml.DestructionEvent"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::DestructionEvent">

-		<param name="semanticHint" value="UML::DestructionEvent"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Device -->

-	<metamodelType eclass="Device" id="org.eclipse.papyrus.uml.Device"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Device">

-		<param name="semanticHint" value="UML::Device"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for DirectedRelationship -->

-	<metamodelType eclass="DirectedRelationship" id="org.eclipse.papyrus.uml.DirectedRelationship"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::DirectedRelationship">

-		<param name="semanticHint" value="UML::DirectedRelationship"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Duration -->

-	<metamodelType eclass="Duration" id="org.eclipse.papyrus.uml.Duration"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Duration">

-		<param name="semanticHint" value="UML::Duration"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for DurationConstraint -->

-	<metamodelType eclass="DurationConstraint" id="org.eclipse.papyrus.uml.DurationConstraint"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::DurationConstraint">

-		<param name="semanticHint" value="UML::DurationConstraint"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for DurationInterval -->

-	<metamodelType eclass="DurationInterval" id="org.eclipse.papyrus.uml.DurationInterval"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::DurationInterval">

-		<param name="semanticHint" value="UML::DurationInterval"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for DurationObservation -->

-	<metamodelType eclass="DurationObservation" id="org.eclipse.papyrus.uml.DurationObservation"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::DurationObservation">

-		<param name="semanticHint" value="UML::DurationObservation"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Element -->

-	<metamodelType eclass="Element" id="org.eclipse.papyrus.uml.Element"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Element">

-		<param name="semanticHint" value="UML::Element"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ElementImport -->

-	<metamodelType eclass="ElementImport" id="org.eclipse.papyrus.uml.ElementImport"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ElementImport">

-		<param name="semanticHint" value="UML::ElementImport"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for EncapsulatedClassifier -->

-	<metamodelType eclass="EncapsulatedClassifier" id="org.eclipse.papyrus.uml.EncapsulatedClassifier"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::EncapsulatedClassifier">

-		<param name="semanticHint" value="UML::EncapsulatedClassifier"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Enumeration -->

-	<metamodelType eclass="Enumeration" id="org.eclipse.papyrus.uml.Enumeration"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Enumeration">

-		<param name="semanticHint" value="UML::Enumeration"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for EnumerationLiteral -->

-	<metamodelType eclass="EnumerationLiteral" id="org.eclipse.papyrus.uml.EnumerationLiteral"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::EnumerationLiteral">

-		<param name="semanticHint" value="UML::EnumerationLiteral"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Event -->

-	<metamodelType eclass="Event" id="org.eclipse.papyrus.uml.Event"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Event">

-		<param name="semanticHint" value="UML::Event"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ExceptionHandler -->

-	<metamodelType eclass="ExceptionHandler" id="org.eclipse.papyrus.uml.ExceptionHandler"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ExceptionHandler">

-		<param name="semanticHint" value="UML::ExceptionHandler"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ExecutableNode -->

-	<metamodelType eclass="ExecutableNode" id="org.eclipse.papyrus.uml.ExecutableNode"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ExecutableNode">

-		<param name="semanticHint" value="UML::ExecutableNode"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ExecutionEnvironment -->

-	<metamodelType eclass="ExecutionEnvironment" id="org.eclipse.papyrus.uml.ExecutionEnvironment"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ExecutionEnvironment">

-		<param name="semanticHint" value="UML::ExecutionEnvironment"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ExecutionEvent -->

-	<metamodelType eclass="ExecutionEvent" id="org.eclipse.papyrus.uml.ExecutionEvent"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ExecutionEvent">

-		<param name="semanticHint" value="UML::ExecutionEvent"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ExecutionOccurrenceSpecification -->

-	<metamodelType eclass="ExecutionOccurrenceSpecification" id="org.eclipse.papyrus.uml.ExecutionOccurrenceSpecification"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ExecutionOccurrenceSpecification">

-		<param name="semanticHint" value="UML::ExecutionOccurrenceSpecification"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ExecutionSpecification -->

-	<metamodelType eclass="ExecutionSpecification" id="org.eclipse.papyrus.uml.ExecutionSpecification"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ExecutionSpecification">

-		<param name="semanticHint" value="UML::ExecutionSpecification"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ExpansionNode -->

-	<metamodelType eclass="ExpansionNode" id="org.eclipse.papyrus.uml.ExpansionNode"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ExpansionNode">

-		<param name="semanticHint" value="UML::ExpansionNode"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ExpansionRegion -->

-	<metamodelType eclass="ExpansionRegion" id="org.eclipse.papyrus.uml.ExpansionRegion"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ExpansionRegion">

-		<param name="semanticHint" value="UML::ExpansionRegion"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Expression -->

-	<metamodelType eclass="Expression" id="org.eclipse.papyrus.uml.Expression"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Expression">

-		<param name="semanticHint" value="UML::Expression"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Extend -->

-	<metamodelType eclass="Extend" id="org.eclipse.papyrus.uml.Extend"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Extend">

-		<param name="semanticHint" value="UML::Extend"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Extension -->

-	<metamodelType eclass="Extension" id="org.eclipse.papyrus.uml.Extension"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Extension">

-		<param name="semanticHint" value="UML::Extension"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ExtensionEnd -->

-	<metamodelType eclass="ExtensionEnd" id="org.eclipse.papyrus.uml.ExtensionEnd"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ExtensionEnd">

-		<param name="semanticHint" value="UML::ExtensionEnd"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ExtensionPoint -->

-	<metamodelType eclass="ExtensionPoint" id="org.eclipse.papyrus.uml.ExtensionPoint"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ExtensionPoint">

-		<param name="semanticHint" value="UML::ExtensionPoint"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Feature -->

-	<metamodelType eclass="Feature" id="org.eclipse.papyrus.uml.Feature"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Feature">

-		<param name="semanticHint" value="UML::Feature"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for FinalNode -->

-	<metamodelType eclass="FinalNode" id="org.eclipse.papyrus.uml.FinalNode"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::FinalNode">

-		<param name="semanticHint" value="UML::FinalNode"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for FinalState -->

-	<metamodelType eclass="FinalState" id="org.eclipse.papyrus.uml.FinalState"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::FinalState">

-		<param name="semanticHint" value="UML::FinalState"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for FlowFinalNode -->

-	<metamodelType eclass="FlowFinalNode" id="org.eclipse.papyrus.uml.FlowFinalNode"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::FlowFinalNode">

-		<param name="semanticHint" value="UML::FlowFinalNode"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ForkNode -->

-	<metamodelType eclass="ForkNode" id="org.eclipse.papyrus.uml.ForkNode"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ForkNode">

-		<param name="semanticHint" value="UML::ForkNode"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for FunctionBehavior -->

-	<metamodelType eclass="FunctionBehavior" id="org.eclipse.papyrus.uml.FunctionBehavior"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::FunctionBehavior">

-		<param name="semanticHint" value="UML::FunctionBehavior"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Gate -->

-	<metamodelType eclass="Gate" id="org.eclipse.papyrus.uml.Gate"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Gate">

-		<param name="semanticHint" value="UML::Gate"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Generalization -->

-	<metamodelType eclass="Generalization" id="org.eclipse.papyrus.uml.Generalization"

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+
+<!-- UML ElementTypes declarations -->
+<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
+
+	<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
+	
+	<!-- Declaration of IElementTypes -->
+	
+	<!-- IMetamodelType for Abstraction -->
+	<metamodelType id="org.eclipse.papyrus.uml.Abstraction" name="UML::Abstraction"
+		eclass="Abstraction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Abstraction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for AcceptCallAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.AcceptCallAction" name="UML::AcceptCallAction"
+		eclass="AcceptCallAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::AcceptCallAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for AcceptEventAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.AcceptEventAction" name="UML::AcceptEventAction"
+		eclass="AcceptEventAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::AcceptEventAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Action -->
+	<metamodelType id="org.eclipse.papyrus.uml.Action" name="UML::Action"
+		eclass="Action" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Action"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ActionExecutionSpecification -->
+	<metamodelType id="org.eclipse.papyrus.uml.ActionExecutionSpecification" name="UML::ActionExecutionSpecification"
+		eclass="ActionExecutionSpecification" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ActionExecutionSpecification"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ActionInputPin -->
+	<metamodelType id="org.eclipse.papyrus.uml.ActionInputPin" name="UML::ActionInputPin"
+		eclass="ActionInputPin" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ActionInputPin"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Activity -->
+	<metamodelType id="org.eclipse.papyrus.uml.Activity" name="UML::Activity"
+		eclass="Activity" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Activity"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ActivityEdge -->
+	<metamodelType id="org.eclipse.papyrus.uml.ActivityEdge" name="UML::ActivityEdge"
+		eclass="ActivityEdge" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ActivityEdge"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ActivityFinalNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.ActivityFinalNode" name="UML::ActivityFinalNode"
+		eclass="ActivityFinalNode" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ActivityFinalNode"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ActivityGroup -->
+	<metamodelType id="org.eclipse.papyrus.uml.ActivityGroup" name="UML::ActivityGroup"
+		eclass="ActivityGroup" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ActivityGroup"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ActivityNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.ActivityNode" name="UML::ActivityNode"
+		eclass="ActivityNode" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ActivityNode"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ActivityParameterNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.ActivityParameterNode" name="UML::ActivityParameterNode"
+		eclass="ActivityParameterNode" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ActivityParameterNode"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ActivityPartition -->
+	<metamodelType id="org.eclipse.papyrus.uml.ActivityPartition" name="UML::ActivityPartition"
+		eclass="ActivityPartition" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ActivityPartition"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Actor -->
+	<metamodelType id="org.eclipse.papyrus.uml.Actor" name="UML::Actor"
+		eclass="Actor" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Actor"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for AddStructuralFeatureValueAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.AddStructuralFeatureValueAction" name="UML::AddStructuralFeatureValueAction"
+		eclass="AddStructuralFeatureValueAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::AddStructuralFeatureValueAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for AddVariableValueAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.AddVariableValueAction" name="UML::AddVariableValueAction"
+		eclass="AddVariableValueAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::AddVariableValueAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for AnyReceiveEvent -->
+	<metamodelType id="org.eclipse.papyrus.uml.AnyReceiveEvent" name="UML::AnyReceiveEvent"
+		eclass="AnyReceiveEvent" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::AnyReceiveEvent"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Artifact -->
+	<metamodelType id="org.eclipse.papyrus.uml.Artifact" name="UML::Artifact"
+		eclass="Artifact" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Artifact"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Association -->
+	<metamodelType id="org.eclipse.papyrus.uml.Association" name="UML::Association"
+		eclass="Association" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Association"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for AssociationClass -->
+	<metamodelType id="org.eclipse.papyrus.uml.AssociationClass" name="UML::AssociationClass"
+		eclass="AssociationClass" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::AssociationClass"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Behavior -->
+	<metamodelType id="org.eclipse.papyrus.uml.Behavior" name="UML::Behavior"
+		eclass="Behavior" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Behavior"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for BehaviorExecutionSpecification -->
+	<metamodelType id="org.eclipse.papyrus.uml.BehaviorExecutionSpecification" name="UML::BehaviorExecutionSpecification"
+		eclass="BehaviorExecutionSpecification" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::BehaviorExecutionSpecification"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for BehavioralFeature -->
+	<metamodelType id="org.eclipse.papyrus.uml.BehavioralFeature" name="UML::BehavioralFeature"
+		eclass="BehavioralFeature" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::BehavioralFeature"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for BehavioredClassifier -->
+	<metamodelType id="org.eclipse.papyrus.uml.BehavioredClassifier" name="UML::BehavioredClassifier"
+		eclass="BehavioredClassifier" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::BehavioredClassifier"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for BroadcastSignalAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.BroadcastSignalAction" name="UML::BroadcastSignalAction"
+		eclass="BroadcastSignalAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::BroadcastSignalAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for CallAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.CallAction" name="UML::CallAction"
+		eclass="CallAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::CallAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for CallBehaviorAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.CallBehaviorAction" name="UML::CallBehaviorAction"
+		eclass="CallBehaviorAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::CallBehaviorAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for CallEvent -->
+	<metamodelType id="org.eclipse.papyrus.uml.CallEvent" name="UML::CallEvent"
+		eclass="CallEvent" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::CallEvent"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for CallOperationAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.CallOperationAction" name="UML::CallOperationAction"
+		eclass="CallOperationAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::CallOperationAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for CentralBufferNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.CentralBufferNode" name="UML::CentralBufferNode"
+		eclass="CentralBufferNode" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::CentralBufferNode"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ChangeEvent -->
+	<metamodelType id="org.eclipse.papyrus.uml.ChangeEvent" name="UML::ChangeEvent"
+		eclass="ChangeEvent" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ChangeEvent"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Class -->
+	<metamodelType id="org.eclipse.papyrus.uml.Class" name="UML::Class"
+		eclass="Class" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Class"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Classifier -->
+	<metamodelType id="org.eclipse.papyrus.uml.Classifier" name="UML::Classifier"
+		eclass="Classifier" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Classifier"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ClassifierTemplateParameter -->
+	<metamodelType id="org.eclipse.papyrus.uml.ClassifierTemplateParameter" name="UML::ClassifierTemplateParameter"
+		eclass="ClassifierTemplateParameter" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ClassifierTemplateParameter"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Clause -->
+	<metamodelType id="org.eclipse.papyrus.uml.Clause" name="UML::Clause"
+		eclass="Clause" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Clause"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ClearAssociationAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.ClearAssociationAction" name="UML::ClearAssociationAction"
+		eclass="ClearAssociationAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ClearAssociationAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ClearStructuralFeatureAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.ClearStructuralFeatureAction" name="UML::ClearStructuralFeatureAction"
+		eclass="ClearStructuralFeatureAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ClearStructuralFeatureAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ClearVariableAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.ClearVariableAction" name="UML::ClearVariableAction"
+		eclass="ClearVariableAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ClearVariableAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Collaboration -->
+	<metamodelType id="org.eclipse.papyrus.uml.Collaboration" name="UML::Collaboration"
+		eclass="Collaboration" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Collaboration"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for CollaborationUse -->
+	<metamodelType id="org.eclipse.papyrus.uml.CollaborationUse" name="UML::CollaborationUse"
+		eclass="CollaborationUse" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::CollaborationUse"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for CombinedFragment -->
+	<metamodelType id="org.eclipse.papyrus.uml.CombinedFragment" name="UML::CombinedFragment"
+		eclass="CombinedFragment" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::CombinedFragment"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Comment -->
+	<metamodelType id="org.eclipse.papyrus.uml.Comment" name="UML::Comment"
+		eclass="Comment" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Comment"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for CommunicationPath -->
+	<metamodelType id="org.eclipse.papyrus.uml.CommunicationPath" name="UML::CommunicationPath"
+		eclass="CommunicationPath" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::CommunicationPath"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Component -->
+	<metamodelType id="org.eclipse.papyrus.uml.Component" name="UML::Component"
+		eclass="Component" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Component"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ComponentRealization -->
+	<metamodelType id="org.eclipse.papyrus.uml.ComponentRealization" name="UML::ComponentRealization"
+		eclass="ComponentRealization" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ComponentRealization"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ConditionalNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.ConditionalNode" name="UML::ConditionalNode"
+		eclass="ConditionalNode" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ConditionalNode"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ConnectableElement -->
+	<metamodelType id="org.eclipse.papyrus.uml.ConnectableElement" name="UML::ConnectableElement"
+		eclass="ConnectableElement" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ConnectableElement"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ConnectableElementTemplateParameter -->
+	<metamodelType id="org.eclipse.papyrus.uml.ConnectableElementTemplateParameter" name="UML::ConnectableElementTemplateParameter"
+		eclass="ConnectableElementTemplateParameter" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ConnectableElementTemplateParameter"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ConnectionPointReference -->
+	<metamodelType id="org.eclipse.papyrus.uml.ConnectionPointReference" name="UML::ConnectionPointReference"
+		eclass="ConnectionPointReference" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ConnectionPointReference"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Connector -->
+	<metamodelType id="org.eclipse.papyrus.uml.Connector" name="UML::Connector"
+		eclass="Connector" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Connector"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ConnectorEnd -->
+	<metamodelType id="org.eclipse.papyrus.uml.ConnectorEnd" name="UML::ConnectorEnd"
+		eclass="ConnectorEnd" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ConnectorEnd"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ConsiderIgnoreFragment -->
+	<metamodelType id="org.eclipse.papyrus.uml.ConsiderIgnoreFragment" name="UML::ConsiderIgnoreFragment"
+		eclass="ConsiderIgnoreFragment" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ConsiderIgnoreFragment"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Constraint -->
+	<metamodelType id="org.eclipse.papyrus.uml.Constraint" name="UML::Constraint"
+		eclass="Constraint" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Constraint"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Continuation -->
+	<metamodelType id="org.eclipse.papyrus.uml.Continuation" name="UML::Continuation"
+		eclass="Continuation" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Continuation"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ControlFlow -->
+	<metamodelType id="org.eclipse.papyrus.uml.ControlFlow" name="UML::ControlFlow"
+		eclass="ControlFlow" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ControlFlow"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ControlNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.ControlNode" name="UML::ControlNode"
+		eclass="ControlNode" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ControlNode"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for CreateLinkAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.CreateLinkAction" name="UML::CreateLinkAction"
+		eclass="CreateLinkAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::CreateLinkAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for CreateLinkObjectAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.CreateLinkObjectAction" name="UML::CreateLinkObjectAction"
+		eclass="CreateLinkObjectAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::CreateLinkObjectAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for CreateObjectAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.CreateObjectAction" name="UML::CreateObjectAction"
+		eclass="CreateObjectAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::CreateObjectAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for CreationEvent -->
+	<metamodelType id="org.eclipse.papyrus.uml.CreationEvent" name="UML::CreationEvent"
+		eclass="CreationEvent" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::CreationEvent"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for DataStoreNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.DataStoreNode" name="UML::DataStoreNode"
+		eclass="DataStoreNode" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::DataStoreNode"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for DataType -->
+	<metamodelType id="org.eclipse.papyrus.uml.DataType" name="UML::DataType"
+		eclass="DataType" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::DataType"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for DecisionNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.DecisionNode" name="UML::DecisionNode"
+		eclass="DecisionNode" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::DecisionNode"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Dependency -->
+	<metamodelType id="org.eclipse.papyrus.uml.Dependency" name="UML::Dependency"
+		eclass="Dependency" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DependencyEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Dependency"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for DeployedArtifact -->
+	<metamodelType id="org.eclipse.papyrus.uml.DeployedArtifact" name="UML::DeployedArtifact"
+		eclass="DeployedArtifact" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::DeployedArtifact"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Deployment -->
+	<metamodelType id="org.eclipse.papyrus.uml.Deployment" name="UML::Deployment"
+		eclass="Deployment" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Deployment"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for DeploymentSpecification -->
+	<metamodelType id="org.eclipse.papyrus.uml.DeploymentSpecification" name="UML::DeploymentSpecification"
+		eclass="DeploymentSpecification" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::DeploymentSpecification"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for DeploymentTarget -->
+	<metamodelType id="org.eclipse.papyrus.uml.DeploymentTarget" name="UML::DeploymentTarget"
+		eclass="DeploymentTarget" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::DeploymentTarget"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for DestroyLinkAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.DestroyLinkAction" name="UML::DestroyLinkAction"
+		eclass="DestroyLinkAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::DestroyLinkAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for DestroyObjectAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.DestroyObjectAction" name="UML::DestroyObjectAction"
+		eclass="DestroyObjectAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::DestroyObjectAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for DestructionEvent -->
+	<metamodelType id="org.eclipse.papyrus.uml.DestructionEvent" name="UML::DestructionEvent"
+		eclass="DestructionEvent" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::DestructionEvent"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Device -->
+	<metamodelType id="org.eclipse.papyrus.uml.Device" name="UML::Device"
+		eclass="Device" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Device"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for DirectedRelationship -->
+	<metamodelType id="org.eclipse.papyrus.uml.DirectedRelationship" name="UML::DirectedRelationship"
+		eclass="DirectedRelationship" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::DirectedRelationship"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Duration -->
+	<metamodelType id="org.eclipse.papyrus.uml.Duration" name="UML::Duration"
+		eclass="Duration" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Duration"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for DurationConstraint -->
+	<metamodelType id="org.eclipse.papyrus.uml.DurationConstraint" name="UML::DurationConstraint"
+		eclass="DurationConstraint" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::DurationConstraint"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for DurationInterval -->
+	<metamodelType id="org.eclipse.papyrus.uml.DurationInterval" name="UML::DurationInterval"
+		eclass="DurationInterval" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::DurationInterval"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for DurationObservation -->
+	<metamodelType id="org.eclipse.papyrus.uml.DurationObservation" name="UML::DurationObservation"
+		eclass="DurationObservation" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::DurationObservation"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Element -->
+	<metamodelType id="org.eclipse.papyrus.uml.Element" name="UML::Element"
+		eclass="Element" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Element"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ElementImport -->
+	<metamodelType id="org.eclipse.papyrus.uml.ElementImport" name="UML::ElementImport"
+		eclass="ElementImport" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ElementImport"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for EncapsulatedClassifier -->
+	<metamodelType id="org.eclipse.papyrus.uml.EncapsulatedClassifier" name="UML::EncapsulatedClassifier"
+		eclass="EncapsulatedClassifier" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::EncapsulatedClassifier"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Enumeration -->
+	<metamodelType id="org.eclipse.papyrus.uml.Enumeration" name="UML::Enumeration"
+		eclass="Enumeration" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Enumeration"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for EnumerationLiteral -->
+	<metamodelType id="org.eclipse.papyrus.uml.EnumerationLiteral" name="UML::EnumerationLiteral"
+		eclass="EnumerationLiteral" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::EnumerationLiteral"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Event -->
+	<metamodelType id="org.eclipse.papyrus.uml.Event" name="UML::Event"
+		eclass="Event" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Event"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ExceptionHandler -->
+	<metamodelType id="org.eclipse.papyrus.uml.ExceptionHandler" name="UML::ExceptionHandler"
+		eclass="ExceptionHandler" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ExceptionHandler"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ExecutableNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.ExecutableNode" name="UML::ExecutableNode"
+		eclass="ExecutableNode" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ExecutableNode"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ExecutionEnvironment -->
+	<metamodelType id="org.eclipse.papyrus.uml.ExecutionEnvironment" name="UML::ExecutionEnvironment"
+		eclass="ExecutionEnvironment" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ExecutionEnvironment"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ExecutionEvent -->
+	<metamodelType id="org.eclipse.papyrus.uml.ExecutionEvent" name="UML::ExecutionEvent"
+		eclass="ExecutionEvent" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ExecutionEvent"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ExecutionOccurrenceSpecification -->
+	<metamodelType id="org.eclipse.papyrus.uml.ExecutionOccurrenceSpecification" name="UML::ExecutionOccurrenceSpecification"
+		eclass="ExecutionOccurrenceSpecification" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ExecutionOccurrenceSpecification"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ExecutionSpecification -->
+	<metamodelType id="org.eclipse.papyrus.uml.ExecutionSpecification" name="UML::ExecutionSpecification"
+		eclass="ExecutionSpecification" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ExecutionSpecification"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ExpansionNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.ExpansionNode" name="UML::ExpansionNode"
+		eclass="ExpansionNode" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ExpansionNode"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ExpansionRegion -->
+	<metamodelType id="org.eclipse.papyrus.uml.ExpansionRegion" name="UML::ExpansionRegion"
+		eclass="ExpansionRegion" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ExpansionRegion"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Expression -->
+	<metamodelType id="org.eclipse.papyrus.uml.Expression" name="UML::Expression"
+		eclass="Expression" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Expression"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Extend -->
+	<metamodelType id="org.eclipse.papyrus.uml.Extend" name="UML::Extend"
+		eclass="Extend" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Extend"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Extension -->
+	<metamodelType id="org.eclipse.papyrus.uml.Extension" name="UML::Extension"
+		eclass="Extension" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Extension"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ExtensionEnd -->
+	<metamodelType id="org.eclipse.papyrus.uml.ExtensionEnd" name="UML::ExtensionEnd"
+		eclass="ExtensionEnd" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ExtensionEnd"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ExtensionPoint -->
+	<metamodelType id="org.eclipse.papyrus.uml.ExtensionPoint" name="UML::ExtensionPoint"
+		eclass="ExtensionPoint" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ExtensionPoint"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Feature -->
+	<metamodelType id="org.eclipse.papyrus.uml.Feature" name="UML::Feature"
+		eclass="Feature" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Feature"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for FinalNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.FinalNode" name="UML::FinalNode"
+		eclass="FinalNode" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::FinalNode"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for FinalState -->
+	<metamodelType id="org.eclipse.papyrus.uml.FinalState" name="UML::FinalState"
+		eclass="FinalState" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::FinalState"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for FlowFinalNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.FlowFinalNode" name="UML::FlowFinalNode"
+		eclass="FlowFinalNode" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::FlowFinalNode"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ForkNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.ForkNode" name="UML::ForkNode"
+		eclass="ForkNode" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ForkNode"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for FunctionBehavior -->
+	<metamodelType id="org.eclipse.papyrus.uml.FunctionBehavior" name="UML::FunctionBehavior"
+		eclass="FunctionBehavior" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::FunctionBehavior"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Gate -->
+	<metamodelType id="org.eclipse.papyrus.uml.Gate" name="UML::Gate"
+		eclass="Gate" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Gate"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for GeneralOrdering -->
+	<metamodelType id="org.eclipse.papyrus.uml.GeneralOrdering" name="UML::GeneralOrdering"
+		eclass="GeneralOrdering" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::GeneralOrdering"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Generalization -->
+	<metamodelType id="org.eclipse.papyrus.uml.Generalization" name="UML::Generalization"
+		eclass="Generalization" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.GeneralizationEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Generalization">

-		<param name="semanticHint" value="UML::Generalization"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for GeneralizationSet -->

-	<metamodelType eclass="GeneralizationSet" id="org.eclipse.papyrus.uml.GeneralizationSet"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::GeneralizationSet">

-		<param name="semanticHint" value="UML::GeneralizationSet"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for GeneralOrdering -->

-	<metamodelType eclass="GeneralOrdering" id="org.eclipse.papyrus.uml.GeneralOrdering"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::GeneralOrdering">

-		<param name="semanticHint" value="UML::GeneralOrdering"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Image -->

-	<metamodelType eclass="Image" id="org.eclipse.papyrus.uml.Image"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Image">

-		<param name="semanticHint" value="UML::Image"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Include -->

-	<metamodelType eclass="Include" id="org.eclipse.papyrus.uml.Include"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Include">

-		<param name="semanticHint" value="UML::Include"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for InformationFlow -->

-	<metamodelType eclass="InformationFlow" id="org.eclipse.papyrus.uml.InformationFlow"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::InformationFlow">

-		<param name="semanticHint" value="UML::InformationFlow"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for InformationItem -->

-	<metamodelType eclass="InformationItem" id="org.eclipse.papyrus.uml.InformationItem"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::InformationItem">

-		<param name="semanticHint" value="UML::InformationItem"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for InitialNode -->

-	<metamodelType eclass="InitialNode" id="org.eclipse.papyrus.uml.InitialNode"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::InitialNode">

-		<param name="semanticHint" value="UML::InitialNode"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for InputPin -->

-	<metamodelType eclass="InputPin" id="org.eclipse.papyrus.uml.InputPin"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::InputPin">

-		<param name="semanticHint" value="UML::InputPin"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for InstanceSpecification -->

-	<metamodelType eclass="InstanceSpecification" id="org.eclipse.papyrus.uml.InstanceSpecification"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::InstanceSpecification">

-		<param name="semanticHint" value="UML::InstanceSpecification"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for InstanceValue -->

-	<metamodelType eclass="InstanceValue" id="org.eclipse.papyrus.uml.InstanceValue"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::InstanceValue">

-		<param name="semanticHint" value="UML::InstanceValue"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Interaction -->

-	<metamodelType eclass="Interaction" id="org.eclipse.papyrus.uml.Interaction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Interaction">

-		<param name="semanticHint" value="UML::Interaction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for InteractionConstraint -->

-	<metamodelType eclass="InteractionConstraint" id="org.eclipse.papyrus.uml.InteractionConstraint"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::InteractionConstraint">

-		<param name="semanticHint" value="UML::InteractionConstraint"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for InteractionFragment -->

-	<metamodelType eclass="InteractionFragment" id="org.eclipse.papyrus.uml.InteractionFragment"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::InteractionFragment">

-		<param name="semanticHint" value="UML::InteractionFragment"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for InteractionOperand -->

-	<metamodelType eclass="InteractionOperand" id="org.eclipse.papyrus.uml.InteractionOperand"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::InteractionOperand">

-		<param name="semanticHint" value="UML::InteractionOperand"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for InteractionUse -->

-	<metamodelType eclass="InteractionUse" id="org.eclipse.papyrus.uml.InteractionUse"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::InteractionUse">

-		<param name="semanticHint" value="UML::InteractionUse"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Interface -->

-	<metamodelType eclass="Interface" id="org.eclipse.papyrus.uml.Interface"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Interface">

-		<param name="semanticHint" value="UML::Interface"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for InterfaceRealization -->

-	<metamodelType eclass="InterfaceRealization" id="org.eclipse.papyrus.uml.InterfaceRealization"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.InterfaceRealizationEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::InterfaceRealization">

-		<param name="semanticHint" value="UML::InterfaceRealization"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for InterruptibleActivityRegion -->

-	<metamodelType eclass="InterruptibleActivityRegion" id="org.eclipse.papyrus.uml.InterruptibleActivityRegion"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::InterruptibleActivityRegion">

-		<param name="semanticHint" value="UML::InterruptibleActivityRegion"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Interval -->

-	<metamodelType eclass="Interval" id="org.eclipse.papyrus.uml.Interval"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Interval">

-		<param name="semanticHint" value="UML::Interval"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for IntervalConstraint -->

-	<metamodelType eclass="IntervalConstraint" id="org.eclipse.papyrus.uml.IntervalConstraint"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::IntervalConstraint">

-		<param name="semanticHint" value="UML::IntervalConstraint"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for InvocationAction -->

-	<metamodelType eclass="InvocationAction" id="org.eclipse.papyrus.uml.InvocationAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::InvocationAction">

-		<param name="semanticHint" value="UML::InvocationAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for JoinNode -->

-	<metamodelType eclass="JoinNode" id="org.eclipse.papyrus.uml.JoinNode"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::JoinNode">

-		<param name="semanticHint" value="UML::JoinNode"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Lifeline -->

-	<metamodelType eclass="Lifeline" id="org.eclipse.papyrus.uml.Lifeline"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Lifeline">

-		<param name="semanticHint" value="UML::Lifeline"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for LinkAction -->

-	<metamodelType eclass="LinkAction" id="org.eclipse.papyrus.uml.LinkAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::LinkAction">

-		<param name="semanticHint" value="UML::LinkAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for LinkEndCreationData -->

-	<metamodelType eclass="LinkEndCreationData" id="org.eclipse.papyrus.uml.LinkEndCreationData"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::LinkEndCreationData">

-		<param name="semanticHint" value="UML::LinkEndCreationData"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for LinkEndData -->

-	<metamodelType eclass="LinkEndData" id="org.eclipse.papyrus.uml.LinkEndData"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::LinkEndData">

-		<param name="semanticHint" value="UML::LinkEndData"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for LinkEndDestructionData -->

-	<metamodelType eclass="LinkEndDestructionData" id="org.eclipse.papyrus.uml.LinkEndDestructionData"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::LinkEndDestructionData">

-		<param name="semanticHint" value="UML::LinkEndDestructionData"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for LiteralBoolean -->

-	<metamodelType eclass="LiteralBoolean" id="org.eclipse.papyrus.uml.LiteralBoolean"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::LiteralBoolean">

-		<param name="semanticHint" value="UML::LiteralBoolean"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for LiteralInteger -->

-	<metamodelType eclass="LiteralInteger" id="org.eclipse.papyrus.uml.LiteralInteger"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::LiteralInteger">

-		<param name="semanticHint" value="UML::LiteralInteger"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for LiteralNull -->

-	<metamodelType eclass="LiteralNull" id="org.eclipse.papyrus.uml.LiteralNull"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::LiteralNull">

-		<param name="semanticHint" value="UML::LiteralNull"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for LiteralSpecification -->

-	<metamodelType eclass="LiteralSpecification" id="org.eclipse.papyrus.uml.LiteralSpecification"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::LiteralSpecification">

-		<param name="semanticHint" value="UML::LiteralSpecification"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for LiteralString -->

-	<metamodelType eclass="LiteralString" id="org.eclipse.papyrus.uml.LiteralString"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::LiteralString">

-		<param name="semanticHint" value="UML::LiteralString"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for LiteralUnlimitedNatural -->

-	<metamodelType eclass="LiteralUnlimitedNatural" id="org.eclipse.papyrus.uml.LiteralUnlimitedNatural"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::LiteralUnlimitedNatural">

-		<param name="semanticHint" value="UML::LiteralUnlimitedNatural"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for LoopNode -->

-	<metamodelType eclass="LoopNode" id="org.eclipse.papyrus.uml.LoopNode"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::LoopNode">

-		<param name="semanticHint" value="UML::LoopNode"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Manifestation -->

-	<metamodelType eclass="Manifestation" id="org.eclipse.papyrus.uml.Manifestation"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Manifestation">

-		<param name="semanticHint" value="UML::Manifestation"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for MergeNode -->

-	<metamodelType eclass="MergeNode" id="org.eclipse.papyrus.uml.MergeNode"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::MergeNode">

-		<param name="semanticHint" value="UML::MergeNode"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Message -->

-	<metamodelType eclass="Message" id="org.eclipse.papyrus.uml.Message"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.MessageEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Message">

-		<param name="semanticHint" value="UML::Message"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for MessageEnd -->

-	<metamodelType eclass="MessageEnd" id="org.eclipse.papyrus.uml.MessageEnd"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::MessageEnd">

-		<param name="semanticHint" value="UML::MessageEnd"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for MessageEvent -->

-	<metamodelType eclass="MessageEvent" id="org.eclipse.papyrus.uml.MessageEvent"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::MessageEvent">

-		<param name="semanticHint" value="UML::MessageEvent"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for MessageOccurrenceSpecification -->

-	<metamodelType eclass="MessageOccurrenceSpecification" id="org.eclipse.papyrus.uml.MessageOccurrenceSpecification"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::MessageOccurrenceSpecification">

-		<param name="semanticHint" value="UML::MessageOccurrenceSpecification"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Model -->

-	<metamodelType eclass="Model" id="org.eclipse.papyrus.uml.Model"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Model">

-		<param name="semanticHint" value="UML::Model"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for MultiplicityElement -->

-	<metamodelType eclass="MultiplicityElement" id="org.eclipse.papyrus.uml.MultiplicityElement"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::MultiplicityElement">

-		<param name="semanticHint" value="UML::MultiplicityElement"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for NamedElement -->

-	<metamodelType eclass="NamedElement" id="org.eclipse.papyrus.uml.NamedElement"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::NamedElement">

-		<param name="semanticHint" value="UML::NamedElement"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Namespace -->

-	<metamodelType eclass="Namespace" id="org.eclipse.papyrus.uml.Namespace"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Namespace">

-		<param name="semanticHint" value="UML::Namespace"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Node -->

-	<metamodelType eclass="Node" id="org.eclipse.papyrus.uml.Node"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Node">

-		<param name="semanticHint" value="UML::Node"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ObjectFlow -->

-	<metamodelType eclass="ObjectFlow" id="org.eclipse.papyrus.uml.ObjectFlow"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ObjectFlow">

-		<param name="semanticHint" value="UML::ObjectFlow"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ObjectNode -->

-	<metamodelType eclass="ObjectNode" id="org.eclipse.papyrus.uml.ObjectNode"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ObjectNode">

-		<param name="semanticHint" value="UML::ObjectNode"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Observation -->

-	<metamodelType eclass="Observation" id="org.eclipse.papyrus.uml.Observation"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Observation">

-		<param name="semanticHint" value="UML::Observation"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for OccurrenceSpecification -->

-	<metamodelType eclass="OccurrenceSpecification" id="org.eclipse.papyrus.uml.OccurrenceSpecification"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::OccurrenceSpecification">

-		<param name="semanticHint" value="UML::OccurrenceSpecification"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for OpaqueAction -->

-	<metamodelType eclass="OpaqueAction" id="org.eclipse.papyrus.uml.OpaqueAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::OpaqueAction">

-		<param name="semanticHint" value="UML::OpaqueAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for OpaqueBehavior -->

-	<metamodelType eclass="OpaqueBehavior" id="org.eclipse.papyrus.uml.OpaqueBehavior"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::OpaqueBehavior">

-		<param name="semanticHint" value="UML::OpaqueBehavior"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for OpaqueExpression -->

-	<metamodelType eclass="OpaqueExpression" id="org.eclipse.papyrus.uml.OpaqueExpression"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::OpaqueExpression">

-		<param name="semanticHint" value="UML::OpaqueExpression"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Operation -->

-	<metamodelType eclass="Operation" id="org.eclipse.papyrus.uml.Operation"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Operation">

-		<param name="semanticHint" value="UML::Operation"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for OperationTemplateParameter -->

-	<metamodelType eclass="OperationTemplateParameter" id="org.eclipse.papyrus.uml.OperationTemplateParameter"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::OperationTemplateParameter">

-		<param name="semanticHint" value="UML::OperationTemplateParameter"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for OutputPin -->

-	<metamodelType eclass="OutputPin" id="org.eclipse.papyrus.uml.OutputPin"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::OutputPin">

-		<param name="semanticHint" value="UML::OutputPin"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Package -->

-	<metamodelType eclass="Package" id="org.eclipse.papyrus.uml.Package"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Package">

-		<param name="semanticHint" value="UML::Package"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for PackageableElement -->

-	<metamodelType eclass="PackageableElement" id="org.eclipse.papyrus.uml.PackageableElement"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::PackageableElement">

-		<param name="semanticHint" value="UML::PackageableElement"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for PackageImport -->

-	<metamodelType eclass="PackageImport" id="org.eclipse.papyrus.uml.PackageImport"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::PackageImport">

-		<param name="semanticHint" value="UML::PackageImport"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for PackageMerge -->

-	<metamodelType eclass="PackageMerge" id="org.eclipse.papyrus.uml.PackageMerge"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::PackageMerge">

-		<param name="semanticHint" value="UML::PackageMerge"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Parameter -->

-	<metamodelType eclass="Parameter" id="org.eclipse.papyrus.uml.Parameter"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Parameter">

-		<param name="semanticHint" value="UML::Parameter"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ParameterableElement -->

-	<metamodelType eclass="ParameterableElement" id="org.eclipse.papyrus.uml.ParameterableElement"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ParameterableElement">

-		<param name="semanticHint" value="UML::ParameterableElement"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ParameterSet -->

-	<metamodelType eclass="ParameterSet" id="org.eclipse.papyrus.uml.ParameterSet"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ParameterSet">

-		<param name="semanticHint" value="UML::ParameterSet"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for PartDecomposition -->

-	<metamodelType eclass="PartDecomposition" id="org.eclipse.papyrus.uml.PartDecomposition"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::PartDecomposition">

-		<param name="semanticHint" value="UML::PartDecomposition"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Pin -->

-	<metamodelType eclass="Pin" id="org.eclipse.papyrus.uml.Pin"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Pin">

-		<param name="semanticHint" value="UML::Pin"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Port -->

-	<metamodelType eclass="Port" id="org.eclipse.papyrus.uml.Port"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.PortEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Port">

-		<param name="semanticHint" value="UML::Port"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for PrimitiveType -->

-	<metamodelType eclass="PrimitiveType" id="org.eclipse.papyrus.uml.PrimitiveType"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::PrimitiveType">

-		<param name="semanticHint" value="UML::PrimitiveType"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Profile -->

-	<metamodelType eclass="Profile" id="org.eclipse.papyrus.uml.Profile"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Profile">

-		<param name="semanticHint" value="UML::Profile"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ProfileApplication -->

-	<metamodelType eclass="ProfileApplication" id="org.eclipse.papyrus.uml.ProfileApplication"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ProfileApplication">

-		<param name="semanticHint" value="UML::ProfileApplication"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Property -->

-	<metamodelType eclass="Property" id="org.eclipse.papyrus.uml.Property"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Property">

-		<param name="semanticHint" value="UML::Property"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ProtocolConformance -->

-	<metamodelType eclass="ProtocolConformance" id="org.eclipse.papyrus.uml.ProtocolConformance"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ProtocolConformance">

-		<param name="semanticHint" value="UML::ProtocolConformance"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ProtocolStateMachine -->

-	<metamodelType eclass="ProtocolStateMachine" id="org.eclipse.papyrus.uml.ProtocolStateMachine"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ProtocolStateMachine">

-		<param name="semanticHint" value="UML::ProtocolStateMachine"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ProtocolTransition -->

-	<metamodelType eclass="ProtocolTransition" id="org.eclipse.papyrus.uml.ProtocolTransition"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ProtocolTransition">

-		<param name="semanticHint" value="UML::ProtocolTransition"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Pseudostate -->

-	<metamodelType eclass="Pseudostate" id="org.eclipse.papyrus.uml.Pseudostate"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Pseudostate">

-		<param name="semanticHint" value="UML::Pseudostate"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for QualifierValue -->

-	<metamodelType eclass="QualifierValue" id="org.eclipse.papyrus.uml.QualifierValue"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::QualifierValue">

-		<param name="semanticHint" value="UML::QualifierValue"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for RaiseExceptionAction -->

-	<metamodelType eclass="RaiseExceptionAction" id="org.eclipse.papyrus.uml.RaiseExceptionAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::RaiseExceptionAction">

-		<param name="semanticHint" value="UML::RaiseExceptionAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ReadExtentAction -->

-	<metamodelType eclass="ReadExtentAction" id="org.eclipse.papyrus.uml.ReadExtentAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ReadExtentAction">

-		<param name="semanticHint" value="UML::ReadExtentAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ReadIsClassifiedObjectAction -->

-	<metamodelType eclass="ReadIsClassifiedObjectAction" id="org.eclipse.papyrus.uml.ReadIsClassifiedObjectAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ReadIsClassifiedObjectAction">

-		<param name="semanticHint" value="UML::ReadIsClassifiedObjectAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ReadLinkAction -->

-	<metamodelType eclass="ReadLinkAction" id="org.eclipse.papyrus.uml.ReadLinkAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ReadLinkAction">

-		<param name="semanticHint" value="UML::ReadLinkAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ReadLinkObjectEndAction -->

-	<metamodelType eclass="ReadLinkObjectEndAction" id="org.eclipse.papyrus.uml.ReadLinkObjectEndAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ReadLinkObjectEndAction">

-		<param name="semanticHint" value="UML::ReadLinkObjectEndAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ReadLinkObjectEndQualifierAction -->

-	<metamodelType eclass="ReadLinkObjectEndQualifierAction" id="org.eclipse.papyrus.uml.ReadLinkObjectEndQualifierAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ReadLinkObjectEndQualifierAction">

-		<param name="semanticHint" value="UML::ReadLinkObjectEndQualifierAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ReadSelfAction -->

-	<metamodelType eclass="ReadSelfAction" id="org.eclipse.papyrus.uml.ReadSelfAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ReadSelfAction">

-		<param name="semanticHint" value="UML::ReadSelfAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ReadStructuralFeatureAction -->

-	<metamodelType eclass="ReadStructuralFeatureAction" id="org.eclipse.papyrus.uml.ReadStructuralFeatureAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ReadStructuralFeatureAction">

-		<param name="semanticHint" value="UML::ReadStructuralFeatureAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ReadVariableAction -->

-	<metamodelType eclass="ReadVariableAction" id="org.eclipse.papyrus.uml.ReadVariableAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ReadVariableAction">

-		<param name="semanticHint" value="UML::ReadVariableAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Realization -->

-	<metamodelType eclass="Realization" id="org.eclipse.papyrus.uml.Realization"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Realization">

-		<param name="semanticHint" value="UML::Realization"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ReceiveOperationEvent -->

-	<metamodelType eclass="ReceiveOperationEvent" id="org.eclipse.papyrus.uml.ReceiveOperationEvent"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ReceiveOperationEvent">

-		<param name="semanticHint" value="UML::ReceiveOperationEvent"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ReceiveSignalEvent -->

-	<metamodelType eclass="ReceiveSignalEvent" id="org.eclipse.papyrus.uml.ReceiveSignalEvent"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ReceiveSignalEvent">

-		<param name="semanticHint" value="UML::ReceiveSignalEvent"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Reception -->

-	<metamodelType eclass="Reception" id="org.eclipse.papyrus.uml.Reception"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Reception">

-		<param name="semanticHint" value="UML::Reception"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ReclassifyObjectAction -->

-	<metamodelType eclass="ReclassifyObjectAction" id="org.eclipse.papyrus.uml.ReclassifyObjectAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ReclassifyObjectAction">

-		<param name="semanticHint" value="UML::ReclassifyObjectAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for RedefinableElement -->

-	<metamodelType eclass="RedefinableElement" id="org.eclipse.papyrus.uml.RedefinableElement"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::RedefinableElement">

-		<param name="semanticHint" value="UML::RedefinableElement"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for RedefinableTemplateSignature -->

-	<metamodelType eclass="RedefinableTemplateSignature" id="org.eclipse.papyrus.uml.RedefinableTemplateSignature"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::RedefinableTemplateSignature">

-		<param name="semanticHint" value="UML::RedefinableTemplateSignature"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ReduceAction -->

-	<metamodelType eclass="ReduceAction" id="org.eclipse.papyrus.uml.ReduceAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ReduceAction">

-		<param name="semanticHint" value="UML::ReduceAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Region -->

-	<metamodelType eclass="Region" id="org.eclipse.papyrus.uml.Region"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Region">

-		<param name="semanticHint" value="UML::Region"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Relationship -->

-	<metamodelType eclass="Relationship" id="org.eclipse.papyrus.uml.Relationship"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Relationship">

-		<param name="semanticHint" value="UML::Relationship"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for RemoveStructuralFeatureValueAction -->

-	<metamodelType eclass="RemoveStructuralFeatureValueAction" id="org.eclipse.papyrus.uml.RemoveStructuralFeatureValueAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::RemoveStructuralFeatureValueAction">

-		<param name="semanticHint" value="UML::RemoveStructuralFeatureValueAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for RemoveVariableValueAction -->

-	<metamodelType eclass="RemoveVariableValueAction" id="org.eclipse.papyrus.uml.RemoveVariableValueAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::RemoveVariableValueAction">

-		<param name="semanticHint" value="UML::RemoveVariableValueAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ReplyAction -->

-	<metamodelType eclass="ReplyAction" id="org.eclipse.papyrus.uml.ReplyAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ReplyAction">

-		<param name="semanticHint" value="UML::ReplyAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for SendObjectAction -->

-	<metamodelType eclass="SendObjectAction" id="org.eclipse.papyrus.uml.SendObjectAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::SendObjectAction">

-		<param name="semanticHint" value="UML::SendObjectAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for SendOperationEvent -->

-	<metamodelType eclass="SendOperationEvent" id="org.eclipse.papyrus.uml.SendOperationEvent"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::SendOperationEvent">

-		<param name="semanticHint" value="UML::SendOperationEvent"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for SendSignalAction -->

-	<metamodelType eclass="SendSignalAction" id="org.eclipse.papyrus.uml.SendSignalAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::SendSignalAction">

-		<param name="semanticHint" value="UML::SendSignalAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for SendSignalEvent -->

-	<metamodelType eclass="SendSignalEvent" id="org.eclipse.papyrus.uml.SendSignalEvent"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::SendSignalEvent">

-		<param name="semanticHint" value="UML::SendSignalEvent"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for SequenceNode -->

-	<metamodelType eclass="SequenceNode" id="org.eclipse.papyrus.uml.SequenceNode"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::SequenceNode">

-		<param name="semanticHint" value="UML::SequenceNode"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Signal -->

-	<metamodelType eclass="Signal" id="org.eclipse.papyrus.uml.Signal"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Signal">

-		<param name="semanticHint" value="UML::Signal"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for SignalEvent -->

-	<metamodelType eclass="SignalEvent" id="org.eclipse.papyrus.uml.SignalEvent"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::SignalEvent">

-		<param name="semanticHint" value="UML::SignalEvent"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Slot -->

-	<metamodelType eclass="Slot" id="org.eclipse.papyrus.uml.Slot"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Slot">

-		<param name="semanticHint" value="UML::Slot"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for StartClassifierBehaviorAction -->

-	<metamodelType eclass="StartClassifierBehaviorAction" id="org.eclipse.papyrus.uml.StartClassifierBehaviorAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::StartClassifierBehaviorAction">

-		<param name="semanticHint" value="UML::StartClassifierBehaviorAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for StartObjectBehaviorAction -->

-	<metamodelType eclass="StartObjectBehaviorAction" id="org.eclipse.papyrus.uml.StartObjectBehaviorAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::StartObjectBehaviorAction">

-		<param name="semanticHint" value="UML::StartObjectBehaviorAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for State -->

-	<metamodelType eclass="State" id="org.eclipse.papyrus.uml.State"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::State">

-		<param name="semanticHint" value="UML::State"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for StateInvariant -->

-	<metamodelType eclass="StateInvariant" id="org.eclipse.papyrus.uml.StateInvariant"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::StateInvariant">

-		<param name="semanticHint" value="UML::StateInvariant"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for StateMachine -->

-	<metamodelType eclass="StateMachine" id="org.eclipse.papyrus.uml.StateMachine"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::StateMachine">

-		<param name="semanticHint" value="UML::StateMachine"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Stereotype -->

-	<metamodelType eclass="Stereotype" id="org.eclipse.papyrus.uml.Stereotype"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Stereotype">

-		<param name="semanticHint" value="UML::Stereotype"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for StringExpression -->

-	<metamodelType eclass="StringExpression" id="org.eclipse.papyrus.uml.StringExpression"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::StringExpression">

-		<param name="semanticHint" value="UML::StringExpression"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for StructuralFeature -->

-	<metamodelType eclass="StructuralFeature" id="org.eclipse.papyrus.uml.StructuralFeature"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::StructuralFeature">

-		<param name="semanticHint" value="UML::StructuralFeature"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for StructuralFeatureAction -->

-	<metamodelType eclass="StructuralFeatureAction" id="org.eclipse.papyrus.uml.StructuralFeatureAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::StructuralFeatureAction">

-		<param name="semanticHint" value="UML::StructuralFeatureAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for StructuredActivityNode -->

-	<metamodelType eclass="StructuredActivityNode" id="org.eclipse.papyrus.uml.StructuredActivityNode"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::StructuredActivityNode">

-		<param name="semanticHint" value="UML::StructuredActivityNode"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for StructuredClassifier -->

-	<metamodelType eclass="StructuredClassifier" id="org.eclipse.papyrus.uml.StructuredClassifier"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::StructuredClassifier">

-		<param name="semanticHint" value="UML::StructuredClassifier"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Substitution -->

-	<metamodelType eclass="Substitution" id="org.eclipse.papyrus.uml.Substitution"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Substitution">

-		<param name="semanticHint" value="UML::Substitution"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for TemplateableElement -->

-	<metamodelType eclass="TemplateableElement" id="org.eclipse.papyrus.uml.TemplateableElement"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::TemplateableElement">

-		<param name="semanticHint" value="UML::TemplateableElement"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for TemplateBinding -->

-	<metamodelType eclass="TemplateBinding" id="org.eclipse.papyrus.uml.TemplateBinding"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::TemplateBinding">

-		<param name="semanticHint" value="UML::TemplateBinding"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for TemplateParameter -->

-	<metamodelType eclass="TemplateParameter" id="org.eclipse.papyrus.uml.TemplateParameter"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::TemplateParameter">

-		<param name="semanticHint" value="UML::TemplateParameter"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for TemplateParameterSubstitution -->

-	<metamodelType eclass="TemplateParameterSubstitution" id="org.eclipse.papyrus.uml.TemplateParameterSubstitution"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::TemplateParameterSubstitution">

-		<param name="semanticHint" value="UML::TemplateParameterSubstitution"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for TemplateSignature -->

-	<metamodelType eclass="TemplateSignature" id="org.eclipse.papyrus.uml.TemplateSignature"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::TemplateSignature">

-		<param name="semanticHint" value="UML::TemplateSignature"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for TestIdentityAction -->

-	<metamodelType eclass="TestIdentityAction" id="org.eclipse.papyrus.uml.TestIdentityAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::TestIdentityAction">

-		<param name="semanticHint" value="UML::TestIdentityAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for TimeConstraint -->

-	<metamodelType eclass="TimeConstraint" id="org.eclipse.papyrus.uml.TimeConstraint"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::TimeConstraint">

-		<param name="semanticHint" value="UML::TimeConstraint"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for TimeEvent -->

-	<metamodelType eclass="TimeEvent" id="org.eclipse.papyrus.uml.TimeEvent"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::TimeEvent">

-		<param name="semanticHint" value="UML::TimeEvent"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for TimeExpression -->

-	<metamodelType eclass="TimeExpression" id="org.eclipse.papyrus.uml.TimeExpression"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::TimeExpression">

-		<param name="semanticHint" value="UML::TimeExpression"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for TimeInterval -->

-	<metamodelType eclass="TimeInterval" id="org.eclipse.papyrus.uml.TimeInterval"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::TimeInterval">

-		<param name="semanticHint" value="UML::TimeInterval"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for TimeObservation -->

-	<metamodelType eclass="TimeObservation" id="org.eclipse.papyrus.uml.TimeObservation"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::TimeObservation">

-		<param name="semanticHint" value="UML::TimeObservation"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Transition -->

-	<metamodelType eclass="Transition" id="org.eclipse.papyrus.uml.Transition"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Transition">

-		<param name="semanticHint" value="UML::Transition"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Trigger -->

-	<metamodelType eclass="Trigger" id="org.eclipse.papyrus.uml.Trigger"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Trigger">

-		<param name="semanticHint" value="UML::Trigger"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Type -->

-	<metamodelType eclass="Type" id="org.eclipse.papyrus.uml.Type"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Type">

-		<param name="semanticHint" value="UML::Type"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for TypedElement -->

-	<metamodelType eclass="TypedElement" id="org.eclipse.papyrus.uml.TypedElement"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::TypedElement">

-		<param name="semanticHint" value="UML::TypedElement"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for UnmarshallAction -->

-	<metamodelType eclass="UnmarshallAction" id="org.eclipse.papyrus.uml.UnmarshallAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::UnmarshallAction">

-		<param name="semanticHint" value="UML::UnmarshallAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Usage -->

-	<metamodelType eclass="Usage" id="org.eclipse.papyrus.uml.Usage"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.UsageEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Usage">

-		<param name="semanticHint" value="UML::Usage"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for UseCase -->

-	<metamodelType eclass="UseCase" id="org.eclipse.papyrus.uml.UseCase"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::UseCase">

-		<param name="semanticHint" value="UML::UseCase"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ValuePin -->

-	<metamodelType eclass="ValuePin" id="org.eclipse.papyrus.uml.ValuePin"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ValuePin">

-		<param name="semanticHint" value="UML::ValuePin"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ValueSpecification -->

-	<metamodelType eclass="ValueSpecification" id="org.eclipse.papyrus.uml.ValueSpecification"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ValueSpecification">

-		<param name="semanticHint" value="UML::ValueSpecification"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for ValueSpecificationAction -->

-	<metamodelType eclass="ValueSpecificationAction" id="org.eclipse.papyrus.uml.ValueSpecificationAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ValueSpecificationAction">

-		<param name="semanticHint" value="UML::ValueSpecificationAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Variable -->

-	<metamodelType eclass="Variable" id="org.eclipse.papyrus.uml.Variable"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Variable">

-		<param name="semanticHint" value="UML::Variable"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for VariableAction -->

-	<metamodelType eclass="VariableAction" id="org.eclipse.papyrus.uml.VariableAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::VariableAction">

-		<param name="semanticHint" value="UML::VariableAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for Vertex -->

-	<metamodelType eclass="Vertex" id="org.eclipse.papyrus.uml.Vertex"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Vertex">

-		<param name="semanticHint" value="UML::Vertex"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for WriteLinkAction -->

-	<metamodelType eclass="WriteLinkAction" id="org.eclipse.papyrus.uml.WriteLinkAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::WriteLinkAction">

-		<param name="semanticHint" value="UML::WriteLinkAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for WriteStructuralFeatureAction -->

-	<metamodelType eclass="WriteStructuralFeatureAction" id="org.eclipse.papyrus.uml.WriteStructuralFeatureAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::WriteStructuralFeatureAction">

-		<param name="semanticHint" value="UML::WriteStructuralFeatureAction"/>

-	</metamodelType>

-	

-	<!-- IElementTypes for WriteVariableAction -->

-	<metamodelType eclass="WriteVariableAction" id="org.eclipse.papyrus.uml.WriteVariableAction"

-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"

-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::WriteVariableAction">

-		<param name="semanticHint" value="UML::WriteVariableAction"/>

-	</metamodelType>

-	

-	</metamodel>

-</extension>

-

-<!-- Helper advice declarations -->

-<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">

-

-	<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">

-

-	<!-- Helper advice for Classifier -->

-	<adviceBinding id="org.eclipse.papyrus.uml.advice.Classifier"

-		class="org.eclipse.papyrus.uml.service.types.helper.advice.ClassifierHelperAdvice"

-		inheritance="all" typeId="org.eclipse.papyrus.uml.Classifier">

-	</adviceBinding>

-	

-	<!-- Helper advice for Collaboration -->

-	<adviceBinding id="org.eclipse.papyrus.uml.advice.Collaboration"

-		class="org.eclipse.papyrus.uml.service.types.helper.advice.CollaborationHelperAdvice"

-		inheritance="none" typeId="org.eclipse.papyrus.uml.Collaboration">

-	</adviceBinding>

-						

-	<!-- Helper advice for CollaborationUse -->

-	<adviceBinding id="org.eclipse.papyrus.uml.advice.CollaborationUse"

-		class="org.eclipse.papyrus.uml.service.types.helper.advice.CollaborationUseHelperAdvice"

-		inheritance="none" typeId="org.eclipse.papyrus.uml.CollaborationUse">

-	</adviceBinding>

-

-	<!-- Helper advice for ConnectorEnd -->

-	<adviceBinding id="org.eclipse.papyrus.uml.advice.ConnectorEnd"

-		class="org.eclipse.papyrus.uml.service.types.helper.advice.ConnectorEndHelperAdvice"

-		inheritance="none" typeId="org.eclipse.papyrus.uml.ConnectorEnd">

-	</adviceBinding>

-	

- 	<!-- Helper advice for DestructionEvent -->

-	<adviceBinding id="org.eclipse.papyrus.uml.advice.DestructionEvent"

-		class="org.eclipse.papyrus.uml.service.types.helper.advice.DestructionEventHelperAdvice"

-		inheritance="all" typeId="org.eclipse.papyrus.uml.DestructionEvent">

-	</adviceBinding>

-

-	<!-- Helper advice for unapplication of applied stereotype before delete -->			

-	<adviceBinding id="org.eclipse.papyrus.uml.advice.ElementUnapplyStereotype"

-		class="org.eclipse.papyrus.uml.service.types.helper.advice.ElementUnapplyStereotypeHelperAdvice"

-		inheritance="all" typeId="org.eclipse.papyrus.uml.Element">

-	</adviceBinding>

-			

-	<!-- Helper advice for ExecutionSpecification -->

-	<adviceBinding id="org.eclipse.papyrus.uml.advice.ExecutionSpecification"

-		class="org.eclipse.papyrus.uml.service.types.helper.advice.ExecutionSpecificationHelperAdvice"

-		inheritance="all" typeId="org.eclipse.papyrus.uml.ExecutionSpecification">

-	</adviceBinding>

-	

-	<!-- Helper advice for Generalization -->

-	<adviceBinding id="org.eclipse.papyrus.uml.advice.Generalization"

-		class="org.eclipse.papyrus.uml.service.types.helper.advice.GeneralizationHelperAdvice"

-		inheritance="none" typeId="org.eclipse.papyrus.uml.Generalization">

-	</adviceBinding>	

-	

-	<!-- Helper advice for Lifeline -->

-	<adviceBinding id="org.eclipse.papyrus.uml.advice.Lifeline"

-		class="org.eclipse.papyrus.uml.service.types.helper.advice.LifelineHelperAdvice"

-		inheritance="all" typeId="org.eclipse.papyrus.uml.Lifeline">

- 	</adviceBinding>

-

-	<!-- Helper advice for Message -->

-	<adviceBinding id="org.eclipse.papyrus.uml.advice.Message"

-		class="org.eclipse.papyrus.uml.service.types.helper.advice.MessageHelperAdvice"

-		inheritance="all" typeId="org.eclipse.papyrus.uml.Message">

-	</adviceBinding>

-		

-	<!-- Helper advice for MessageEnd -->

-	<adviceBinding id="org.eclipse.papyrus.uml.advice.MessageEnd"

-		class="org.eclipse.papyrus.uml.service.types.helper.advice.MessageEndHelperAdvice"

-		inheritance="all" typeId="org.eclipse.papyrus.uml.MessageEnd">

-	</adviceBinding>

-	

-	<!-- Helper advice for element name initialization -->		

-	<adviceBinding id="org.eclipse.papyrus.uml.advice.NameElementInitializer"

-		class="org.eclipse.papyrus.uml.service.types.helper.advice.NamedElementInitializerHelperAdvice"

-		inheritance="all" typeId="org.eclipse.papyrus.uml.NamedElement">

-	</adviceBinding>

-	

-	<!-- Helper advice for OccurrenceSpecification -->

-	<adviceBinding id="org.eclipse.papyrus.uml.advice.OccurrenceSpecification"

-		class="org.eclipse.papyrus.uml.service.types.helper.advice.OccurrenceSpecificationHelperAdvice"

-		inheritance="all" typeId="org.eclipse.papyrus.uml.OccurrenceSpecification">

-	</adviceBinding>

-

-	<!-- Helper advice for PartDecomposition -->

-	<adviceBinding id="org.eclipse.papyrus.uml.advice.PartDecomposition"

-		class="org.eclipse.papyrus.uml.service.types.helper.advice.PartDecompositionHelperAdvice"

-		inheritance="none" typeId="org.eclipse.papyrus.uml.PartDecomposition">

-	</adviceBinding>

-	

-	<!-- Helper advice for Property -->

-	<adviceBinding id="org.eclipse.papyrus.uml.advice.Property"

-		class="org.eclipse.papyrus.uml.service.types.helper.advice.PropertyHelperAdvice"

-		inheritance="all" typeId="org.eclipse.papyrus.uml.Property">

-	</adviceBinding>

-		

-	</metamodel>

-</extension>

-	

-<!-- UML ElementType bindings to Papyrus shared IClientContext -->

-<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">

-

-	<!-- Bindings declaration -->

-	<binding context="org.eclipse.papyrus.service.edit.TypeContext">

-		

-		<elementType pattern="org.eclipse.papyrus.uml.*" />	

-		<advice ref="org.eclipse.papyrus.uml.advice.Classifier" />

-		<advice ref="org.eclipse.papyrus.uml.advice.Collaboration" />

-		<advice ref="org.eclipse.papyrus.uml.advice.CollaborationUse" />

-		<advice ref="org.eclipse.papyrus.uml.advice.ConnectorEnd" />		

-		<advice ref="org.eclipse.papyrus.uml.advice.DestructionEvent" />		

-		<advice ref="org.eclipse.papyrus.uml.advice.ElementUnapplyStereotype" />

-		<advice ref="org.eclipse.papyrus.uml.advice.ExecutionSpecification" />

-		<advice ref="org.eclipse.papyrus.uml.advice.Generalization" />

-		<advice ref="org.eclipse.papyrus.uml.advice.Lifeline" />

-		<advice ref="org.eclipse.papyrus.uml.advice.Message" />

-		<advice ref="org.eclipse.papyrus.uml.advice.MessageEnd" />

-		<advice ref="org.eclipse.papyrus.uml.advice.NameElementInitializer" />

-		<advice ref="org.eclipse.papyrus.uml.advice.OccurrenceSpecification" />

-		<advice ref="org.eclipse.papyrus.uml.advice.PartDecomposition" />

-		<advice ref="org.eclipse.papyrus.uml.advice.Property" />	

-	</binding>

-		

-</extension>

-

-</plugin>

+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Generalization"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for GeneralizationSet -->
+	<metamodelType id="org.eclipse.papyrus.uml.GeneralizationSet" name="UML::GeneralizationSet"
+		eclass="GeneralizationSet" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::GeneralizationSet"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Image -->
+	<metamodelType id="org.eclipse.papyrus.uml.Image" name="UML::Image"
+		eclass="Image" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Image"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Include -->
+	<metamodelType id="org.eclipse.papyrus.uml.Include" name="UML::Include"
+		eclass="Include" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Include"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for InformationFlow -->
+	<metamodelType id="org.eclipse.papyrus.uml.InformationFlow" name="UML::InformationFlow"
+		eclass="InformationFlow" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::InformationFlow"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for InformationItem -->
+	<metamodelType id="org.eclipse.papyrus.uml.InformationItem" name="UML::InformationItem"
+		eclass="InformationItem" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::InformationItem"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for InitialNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.InitialNode" name="UML::InitialNode"
+		eclass="InitialNode" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::InitialNode"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for InputPin -->
+	<metamodelType id="org.eclipse.papyrus.uml.InputPin" name="UML::InputPin"
+		eclass="InputPin" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::InputPin"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for InstanceSpecification -->
+	<metamodelType id="org.eclipse.papyrus.uml.InstanceSpecification" name="UML::InstanceSpecification"
+		eclass="InstanceSpecification" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::InstanceSpecification"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for InstanceValue -->
+	<metamodelType id="org.eclipse.papyrus.uml.InstanceValue" name="UML::InstanceValue"
+		eclass="InstanceValue" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::InstanceValue"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Interaction -->
+	<metamodelType id="org.eclipse.papyrus.uml.Interaction" name="UML::Interaction"
+		eclass="Interaction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Interaction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for InteractionConstraint -->
+	<metamodelType id="org.eclipse.papyrus.uml.InteractionConstraint" name="UML::InteractionConstraint"
+		eclass="InteractionConstraint" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::InteractionConstraint"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for InteractionFragment -->
+	<metamodelType id="org.eclipse.papyrus.uml.InteractionFragment" name="UML::InteractionFragment"
+		eclass="InteractionFragment" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::InteractionFragment"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for InteractionOperand -->
+	<metamodelType id="org.eclipse.papyrus.uml.InteractionOperand" name="UML::InteractionOperand"
+		eclass="InteractionOperand" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::InteractionOperand"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for InteractionUse -->
+	<metamodelType id="org.eclipse.papyrus.uml.InteractionUse" name="UML::InteractionUse"
+		eclass="InteractionUse" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::InteractionUse"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Interface -->
+	<metamodelType id="org.eclipse.papyrus.uml.Interface" name="UML::Interface"
+		eclass="Interface" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Interface"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for InterfaceRealization -->
+	<metamodelType id="org.eclipse.papyrus.uml.InterfaceRealization" name="UML::InterfaceRealization"
+		eclass="InterfaceRealization" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.InterfaceRealizationEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::InterfaceRealization"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for InterruptibleActivityRegion -->
+	<metamodelType id="org.eclipse.papyrus.uml.InterruptibleActivityRegion" name="UML::InterruptibleActivityRegion"
+		eclass="InterruptibleActivityRegion" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::InterruptibleActivityRegion"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Interval -->
+	<metamodelType id="org.eclipse.papyrus.uml.Interval" name="UML::Interval"
+		eclass="Interval" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Interval"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for IntervalConstraint -->
+	<metamodelType id="org.eclipse.papyrus.uml.IntervalConstraint" name="UML::IntervalConstraint"
+		eclass="IntervalConstraint" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::IntervalConstraint"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for InvocationAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.InvocationAction" name="UML::InvocationAction"
+		eclass="InvocationAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::InvocationAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for JoinNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.JoinNode" name="UML::JoinNode"
+		eclass="JoinNode" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::JoinNode"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Lifeline -->
+	<metamodelType id="org.eclipse.papyrus.uml.Lifeline" name="UML::Lifeline"
+		eclass="Lifeline" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Lifeline"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for LinkAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.LinkAction" name="UML::LinkAction"
+		eclass="LinkAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::LinkAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for LinkEndCreationData -->
+	<metamodelType id="org.eclipse.papyrus.uml.LinkEndCreationData" name="UML::LinkEndCreationData"
+		eclass="LinkEndCreationData" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::LinkEndCreationData"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for LinkEndData -->
+	<metamodelType id="org.eclipse.papyrus.uml.LinkEndData" name="UML::LinkEndData"
+		eclass="LinkEndData" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::LinkEndData"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for LinkEndDestructionData -->
+	<metamodelType id="org.eclipse.papyrus.uml.LinkEndDestructionData" name="UML::LinkEndDestructionData"
+		eclass="LinkEndDestructionData" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::LinkEndDestructionData"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for LiteralBoolean -->
+	<metamodelType id="org.eclipse.papyrus.uml.LiteralBoolean" name="UML::LiteralBoolean"
+		eclass="LiteralBoolean" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::LiteralBoolean"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for LiteralInteger -->
+	<metamodelType id="org.eclipse.papyrus.uml.LiteralInteger" name="UML::LiteralInteger"
+		eclass="LiteralInteger" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::LiteralInteger"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for LiteralNull -->
+	<metamodelType id="org.eclipse.papyrus.uml.LiteralNull" name="UML::LiteralNull"
+		eclass="LiteralNull" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::LiteralNull"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for LiteralSpecification -->
+	<metamodelType id="org.eclipse.papyrus.uml.LiteralSpecification" name="UML::LiteralSpecification"
+		eclass="LiteralSpecification" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::LiteralSpecification"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for LiteralString -->
+	<metamodelType id="org.eclipse.papyrus.uml.LiteralString" name="UML::LiteralString"
+		eclass="LiteralString" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::LiteralString"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for LiteralUnlimitedNatural -->
+	<metamodelType id="org.eclipse.papyrus.uml.LiteralUnlimitedNatural" name="UML::LiteralUnlimitedNatural"
+		eclass="LiteralUnlimitedNatural" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::LiteralUnlimitedNatural"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for LoopNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.LoopNode" name="UML::LoopNode"
+		eclass="LoopNode" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::LoopNode"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Manifestation -->
+	<metamodelType id="org.eclipse.papyrus.uml.Manifestation" name="UML::Manifestation"
+		eclass="Manifestation" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Manifestation"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for MergeNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.MergeNode" name="UML::MergeNode"
+		eclass="MergeNode" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::MergeNode"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Message -->
+	<metamodelType id="org.eclipse.papyrus.uml.Message" name="UML::Message"
+		eclass="Message" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.MessageEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Message"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for MessageEnd -->
+	<metamodelType id="org.eclipse.papyrus.uml.MessageEnd" name="UML::MessageEnd"
+		eclass="MessageEnd" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::MessageEnd"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for MessageEvent -->
+	<metamodelType id="org.eclipse.papyrus.uml.MessageEvent" name="UML::MessageEvent"
+		eclass="MessageEvent" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::MessageEvent"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for MessageOccurrenceSpecification -->
+	<metamodelType id="org.eclipse.papyrus.uml.MessageOccurrenceSpecification" name="UML::MessageOccurrenceSpecification"
+		eclass="MessageOccurrenceSpecification" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::MessageOccurrenceSpecification"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Model -->
+	<metamodelType id="org.eclipse.papyrus.uml.Model" name="UML::Model"
+		eclass="Model" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Model"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for MultiplicityElement -->
+	<metamodelType id="org.eclipse.papyrus.uml.MultiplicityElement" name="UML::MultiplicityElement"
+		eclass="MultiplicityElement" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::MultiplicityElement"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for NamedElement -->
+	<metamodelType id="org.eclipse.papyrus.uml.NamedElement" name="UML::NamedElement"
+		eclass="NamedElement" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::NamedElement"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Namespace -->
+	<metamodelType id="org.eclipse.papyrus.uml.Namespace" name="UML::Namespace"
+		eclass="Namespace" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Namespace"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Node -->
+	<metamodelType id="org.eclipse.papyrus.uml.Node" name="UML::Node"
+		eclass="Node" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Node"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ObjectFlow -->
+	<metamodelType id="org.eclipse.papyrus.uml.ObjectFlow" name="UML::ObjectFlow"
+		eclass="ObjectFlow" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ObjectFlow"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ObjectNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.ObjectNode" name="UML::ObjectNode"
+		eclass="ObjectNode" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ObjectNode"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Observation -->
+	<metamodelType id="org.eclipse.papyrus.uml.Observation" name="UML::Observation"
+		eclass="Observation" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Observation"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for OccurrenceSpecification -->
+	<metamodelType id="org.eclipse.papyrus.uml.OccurrenceSpecification" name="UML::OccurrenceSpecification"
+		eclass="OccurrenceSpecification" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::OccurrenceSpecification"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for OpaqueAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.OpaqueAction" name="UML::OpaqueAction"
+		eclass="OpaqueAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::OpaqueAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for OpaqueBehavior -->
+	<metamodelType id="org.eclipse.papyrus.uml.OpaqueBehavior" name="UML::OpaqueBehavior"
+		eclass="OpaqueBehavior" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::OpaqueBehavior"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for OpaqueExpression -->
+	<metamodelType id="org.eclipse.papyrus.uml.OpaqueExpression" name="UML::OpaqueExpression"
+		eclass="OpaqueExpression" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::OpaqueExpression"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Operation -->
+	<metamodelType id="org.eclipse.papyrus.uml.Operation" name="UML::Operation"
+		eclass="Operation" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Operation"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for OperationTemplateParameter -->
+	<metamodelType id="org.eclipse.papyrus.uml.OperationTemplateParameter" name="UML::OperationTemplateParameter"
+		eclass="OperationTemplateParameter" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::OperationTemplateParameter"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for OutputPin -->
+	<metamodelType id="org.eclipse.papyrus.uml.OutputPin" name="UML::OutputPin"
+		eclass="OutputPin" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::OutputPin"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Package -->
+	<metamodelType id="org.eclipse.papyrus.uml.Package" name="UML::Package"
+		eclass="Package" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Package"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for PackageImport -->
+	<metamodelType id="org.eclipse.papyrus.uml.PackageImport" name="UML::PackageImport"
+		eclass="PackageImport" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::PackageImport"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for PackageMerge -->
+	<metamodelType id="org.eclipse.papyrus.uml.PackageMerge" name="UML::PackageMerge"
+		eclass="PackageMerge" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::PackageMerge"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for PackageableElement -->
+	<metamodelType id="org.eclipse.papyrus.uml.PackageableElement" name="UML::PackageableElement"
+		eclass="PackageableElement" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::PackageableElement"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Parameter -->
+	<metamodelType id="org.eclipse.papyrus.uml.Parameter" name="UML::Parameter"
+		eclass="Parameter" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Parameter"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ParameterSet -->
+	<metamodelType id="org.eclipse.papyrus.uml.ParameterSet" name="UML::ParameterSet"
+		eclass="ParameterSet" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ParameterSet"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ParameterableElement -->
+	<metamodelType id="org.eclipse.papyrus.uml.ParameterableElement" name="UML::ParameterableElement"
+		eclass="ParameterableElement" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ParameterableElement"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for PartDecomposition -->
+	<metamodelType id="org.eclipse.papyrus.uml.PartDecomposition" name="UML::PartDecomposition"
+		eclass="PartDecomposition" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::PartDecomposition"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Pin -->
+	<metamodelType id="org.eclipse.papyrus.uml.Pin" name="UML::Pin"
+		eclass="Pin" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Pin"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Port -->
+	<metamodelType id="org.eclipse.papyrus.uml.Port" name="UML::Port"
+		eclass="Port" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.PortEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Port"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for PrimitiveType -->
+	<metamodelType id="org.eclipse.papyrus.uml.PrimitiveType" name="UML::PrimitiveType"
+		eclass="PrimitiveType" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::PrimitiveType"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Profile -->
+	<metamodelType id="org.eclipse.papyrus.uml.Profile" name="UML::Profile"
+		eclass="Profile" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Profile"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ProfileApplication -->
+	<metamodelType id="org.eclipse.papyrus.uml.ProfileApplication" name="UML::ProfileApplication"
+		eclass="ProfileApplication" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ProfileApplication"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Property -->
+	<metamodelType id="org.eclipse.papyrus.uml.Property" name="UML::Property"
+		eclass="Property" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Property"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ProtocolConformance -->
+	<metamodelType id="org.eclipse.papyrus.uml.ProtocolConformance" name="UML::ProtocolConformance"
+		eclass="ProtocolConformance" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ProtocolConformance"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ProtocolStateMachine -->
+	<metamodelType id="org.eclipse.papyrus.uml.ProtocolStateMachine" name="UML::ProtocolStateMachine"
+		eclass="ProtocolStateMachine" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ProtocolStateMachine"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ProtocolTransition -->
+	<metamodelType id="org.eclipse.papyrus.uml.ProtocolTransition" name="UML::ProtocolTransition"
+		eclass="ProtocolTransition" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ProtocolTransition"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Pseudostate -->
+	<metamodelType id="org.eclipse.papyrus.uml.Pseudostate" name="UML::Pseudostate"
+		eclass="Pseudostate" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Pseudostate"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for QualifierValue -->
+	<metamodelType id="org.eclipse.papyrus.uml.QualifierValue" name="UML::QualifierValue"
+		eclass="QualifierValue" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::QualifierValue"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for RaiseExceptionAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.RaiseExceptionAction" name="UML::RaiseExceptionAction"
+		eclass="RaiseExceptionAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::RaiseExceptionAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ReadExtentAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.ReadExtentAction" name="UML::ReadExtentAction"
+		eclass="ReadExtentAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ReadExtentAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ReadIsClassifiedObjectAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.ReadIsClassifiedObjectAction" name="UML::ReadIsClassifiedObjectAction"
+		eclass="ReadIsClassifiedObjectAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ReadIsClassifiedObjectAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ReadLinkAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.ReadLinkAction" name="UML::ReadLinkAction"
+		eclass="ReadLinkAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ReadLinkAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ReadLinkObjectEndAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.ReadLinkObjectEndAction" name="UML::ReadLinkObjectEndAction"
+		eclass="ReadLinkObjectEndAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ReadLinkObjectEndAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ReadLinkObjectEndQualifierAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.ReadLinkObjectEndQualifierAction" name="UML::ReadLinkObjectEndQualifierAction"
+		eclass="ReadLinkObjectEndQualifierAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ReadLinkObjectEndQualifierAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ReadSelfAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.ReadSelfAction" name="UML::ReadSelfAction"
+		eclass="ReadSelfAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ReadSelfAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ReadStructuralFeatureAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.ReadStructuralFeatureAction" name="UML::ReadStructuralFeatureAction"
+		eclass="ReadStructuralFeatureAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ReadStructuralFeatureAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ReadVariableAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.ReadVariableAction" name="UML::ReadVariableAction"
+		eclass="ReadVariableAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ReadVariableAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Realization -->
+	<metamodelType id="org.eclipse.papyrus.uml.Realization" name="UML::Realization"
+		eclass="Realization" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Realization"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ReceiveOperationEvent -->
+	<metamodelType id="org.eclipse.papyrus.uml.ReceiveOperationEvent" name="UML::ReceiveOperationEvent"
+		eclass="ReceiveOperationEvent" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ReceiveOperationEvent"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ReceiveSignalEvent -->
+	<metamodelType id="org.eclipse.papyrus.uml.ReceiveSignalEvent" name="UML::ReceiveSignalEvent"
+		eclass="ReceiveSignalEvent" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ReceiveSignalEvent"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Reception -->
+	<metamodelType id="org.eclipse.papyrus.uml.Reception" name="UML::Reception"
+		eclass="Reception" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Reception"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ReclassifyObjectAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.ReclassifyObjectAction" name="UML::ReclassifyObjectAction"
+		eclass="ReclassifyObjectAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ReclassifyObjectAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for RedefinableElement -->
+	<metamodelType id="org.eclipse.papyrus.uml.RedefinableElement" name="UML::RedefinableElement"
+		eclass="RedefinableElement" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::RedefinableElement"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for RedefinableTemplateSignature -->
+	<metamodelType id="org.eclipse.papyrus.uml.RedefinableTemplateSignature" name="UML::RedefinableTemplateSignature"
+		eclass="RedefinableTemplateSignature" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::RedefinableTemplateSignature"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ReduceAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.ReduceAction" name="UML::ReduceAction"
+		eclass="ReduceAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ReduceAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Region -->
+	<metamodelType id="org.eclipse.papyrus.uml.Region" name="UML::Region"
+		eclass="Region" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Region"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Relationship -->
+	<metamodelType id="org.eclipse.papyrus.uml.Relationship" name="UML::Relationship"
+		eclass="Relationship" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Relationship"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for RemoveStructuralFeatureValueAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.RemoveStructuralFeatureValueAction" name="UML::RemoveStructuralFeatureValueAction"
+		eclass="RemoveStructuralFeatureValueAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::RemoveStructuralFeatureValueAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for RemoveVariableValueAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.RemoveVariableValueAction" name="UML::RemoveVariableValueAction"
+		eclass="RemoveVariableValueAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::RemoveVariableValueAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ReplyAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.ReplyAction" name="UML::ReplyAction"
+		eclass="ReplyAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ReplyAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for SendObjectAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.SendObjectAction" name="UML::SendObjectAction"
+		eclass="SendObjectAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::SendObjectAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for SendOperationEvent -->
+	<metamodelType id="org.eclipse.papyrus.uml.SendOperationEvent" name="UML::SendOperationEvent"
+		eclass="SendOperationEvent" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::SendOperationEvent"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for SendSignalAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.SendSignalAction" name="UML::SendSignalAction"
+		eclass="SendSignalAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::SendSignalAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for SendSignalEvent -->
+	<metamodelType id="org.eclipse.papyrus.uml.SendSignalEvent" name="UML::SendSignalEvent"
+		eclass="SendSignalEvent" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::SendSignalEvent"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for SequenceNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.SequenceNode" name="UML::SequenceNode"
+		eclass="SequenceNode" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::SequenceNode"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Signal -->
+	<metamodelType id="org.eclipse.papyrus.uml.Signal" name="UML::Signal"
+		eclass="Signal" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Signal"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for SignalEvent -->
+	<metamodelType id="org.eclipse.papyrus.uml.SignalEvent" name="UML::SignalEvent"
+		eclass="SignalEvent" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::SignalEvent"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Slot -->
+	<metamodelType id="org.eclipse.papyrus.uml.Slot" name="UML::Slot"
+		eclass="Slot" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Slot"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for StartClassifierBehaviorAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.StartClassifierBehaviorAction" name="UML::StartClassifierBehaviorAction"
+		eclass="StartClassifierBehaviorAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::StartClassifierBehaviorAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for StartObjectBehaviorAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.StartObjectBehaviorAction" name="UML::StartObjectBehaviorAction"
+		eclass="StartObjectBehaviorAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::StartObjectBehaviorAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for State -->
+	<metamodelType id="org.eclipse.papyrus.uml.State" name="UML::State"
+		eclass="State" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::State"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for StateInvariant -->
+	<metamodelType id="org.eclipse.papyrus.uml.StateInvariant" name="UML::StateInvariant"
+		eclass="StateInvariant" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::StateInvariant"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for StateMachine -->
+	<metamodelType id="org.eclipse.papyrus.uml.StateMachine" name="UML::StateMachine"
+		eclass="StateMachine" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::StateMachine"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Stereotype -->
+	<metamodelType id="org.eclipse.papyrus.uml.Stereotype" name="UML::Stereotype"
+		eclass="Stereotype" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Stereotype"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for StringExpression -->
+	<metamodelType id="org.eclipse.papyrus.uml.StringExpression" name="UML::StringExpression"
+		eclass="StringExpression" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::StringExpression"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for StructuralFeature -->
+	<metamodelType id="org.eclipse.papyrus.uml.StructuralFeature" name="UML::StructuralFeature"
+		eclass="StructuralFeature" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::StructuralFeature"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for StructuralFeatureAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.StructuralFeatureAction" name="UML::StructuralFeatureAction"
+		eclass="StructuralFeatureAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::StructuralFeatureAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for StructuredActivityNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.StructuredActivityNode" name="UML::StructuredActivityNode"
+		eclass="StructuredActivityNode" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::StructuredActivityNode"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for StructuredClassifier -->
+	<metamodelType id="org.eclipse.papyrus.uml.StructuredClassifier" name="UML::StructuredClassifier"
+		eclass="StructuredClassifier" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::StructuredClassifier"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Substitution -->
+	<metamodelType id="org.eclipse.papyrus.uml.Substitution" name="UML::Substitution"
+		eclass="Substitution" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Substitution"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for TemplateBinding -->
+	<metamodelType id="org.eclipse.papyrus.uml.TemplateBinding" name="UML::TemplateBinding"
+		eclass="TemplateBinding" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::TemplateBinding"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for TemplateParameter -->
+	<metamodelType id="org.eclipse.papyrus.uml.TemplateParameter" name="UML::TemplateParameter"
+		eclass="TemplateParameter" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::TemplateParameter"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for TemplateParameterSubstitution -->
+	<metamodelType id="org.eclipse.papyrus.uml.TemplateParameterSubstitution" name="UML::TemplateParameterSubstitution"
+		eclass="TemplateParameterSubstitution" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::TemplateParameterSubstitution"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for TemplateSignature -->
+	<metamodelType id="org.eclipse.papyrus.uml.TemplateSignature" name="UML::TemplateSignature"
+		eclass="TemplateSignature" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::TemplateSignature"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for TemplateableElement -->
+	<metamodelType id="org.eclipse.papyrus.uml.TemplateableElement" name="UML::TemplateableElement"
+		eclass="TemplateableElement" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::TemplateableElement"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for TestIdentityAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.TestIdentityAction" name="UML::TestIdentityAction"
+		eclass="TestIdentityAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::TestIdentityAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for TimeConstraint -->
+	<metamodelType id="org.eclipse.papyrus.uml.TimeConstraint" name="UML::TimeConstraint"
+		eclass="TimeConstraint" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::TimeConstraint"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for TimeEvent -->
+	<metamodelType id="org.eclipse.papyrus.uml.TimeEvent" name="UML::TimeEvent"
+		eclass="TimeEvent" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::TimeEvent"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for TimeExpression -->
+	<metamodelType id="org.eclipse.papyrus.uml.TimeExpression" name="UML::TimeExpression"
+		eclass="TimeExpression" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::TimeExpression"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for TimeInterval -->
+	<metamodelType id="org.eclipse.papyrus.uml.TimeInterval" name="UML::TimeInterval"
+		eclass="TimeInterval" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::TimeInterval"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for TimeObservation -->
+	<metamodelType id="org.eclipse.papyrus.uml.TimeObservation" name="UML::TimeObservation"
+		eclass="TimeObservation" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::TimeObservation"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Transition -->
+	<metamodelType id="org.eclipse.papyrus.uml.Transition" name="UML::Transition"
+		eclass="Transition" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Transition"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Trigger -->
+	<metamodelType id="org.eclipse.papyrus.uml.Trigger" name="UML::Trigger"
+		eclass="Trigger" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Trigger"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Type -->
+	<metamodelType id="org.eclipse.papyrus.uml.Type" name="UML::Type"
+		eclass="Type" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Type"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for TypedElement -->
+	<metamodelType id="org.eclipse.papyrus.uml.TypedElement" name="UML::TypedElement"
+		eclass="TypedElement" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::TypedElement"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for UnmarshallAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.UnmarshallAction" name="UML::UnmarshallAction"
+		eclass="UnmarshallAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::UnmarshallAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Usage -->
+	<metamodelType id="org.eclipse.papyrus.uml.Usage" name="UML::Usage"
+		eclass="Usage" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.UsageEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Usage"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for UseCase -->
+	<metamodelType id="org.eclipse.papyrus.uml.UseCase" name="UML::UseCase"
+		eclass="UseCase" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::UseCase"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ValuePin -->
+	<metamodelType id="org.eclipse.papyrus.uml.ValuePin" name="UML::ValuePin"
+		eclass="ValuePin" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ValuePin"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ValueSpecification -->
+	<metamodelType id="org.eclipse.papyrus.uml.ValueSpecification" name="UML::ValueSpecification"
+		eclass="ValueSpecification" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ValueSpecification"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for ValueSpecificationAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.ValueSpecificationAction" name="UML::ValueSpecificationAction"
+		eclass="ValueSpecificationAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ValueSpecificationAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Variable -->
+	<metamodelType id="org.eclipse.papyrus.uml.Variable" name="UML::Variable"
+		eclass="Variable" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Variable"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for VariableAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.VariableAction" name="UML::VariableAction"
+		eclass="VariableAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::VariableAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for Vertex -->
+	<metamodelType id="org.eclipse.papyrus.uml.Vertex" name="UML::Vertex"
+		eclass="Vertex" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Vertex"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for WriteLinkAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.WriteLinkAction" name="UML::WriteLinkAction"
+		eclass="WriteLinkAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::WriteLinkAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for WriteStructuralFeatureAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.WriteStructuralFeatureAction" name="UML::WriteStructuralFeatureAction"
+		eclass="WriteStructuralFeatureAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::WriteStructuralFeatureAction"/>
+	</metamodelType>
+	
+	<!-- IMetamodelType for WriteVariableAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.WriteVariableAction" name="UML::WriteVariableAction"
+		eclass="WriteVariableAction" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::WriteVariableAction"/>
+	</metamodelType>
+	
+	</metamodel>
+</extension>
+
+<!-- Helper advice declarations -->
+<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
+
+	<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
+	
+	<!-- Helper advice for Classifier -->
+	<adviceBinding id="org.eclipse.papyrus.uml.advice.Classifier"
+		class="org.eclipse.papyrus.uml.service.types.helper.advice.ClassifierHelperAdvice"
+		inheritance="all" typeId="org.eclipse.papyrus.uml.Classifier">
+	</adviceBinding>
+	
+	<!-- Helper advice for Collaboration -->
+	<adviceBinding id="org.eclipse.papyrus.uml.advice.Collaboration"
+		class="org.eclipse.papyrus.uml.service.types.helper.advice.CollaborationHelperAdvice"
+		inheritance="none" typeId="org.eclipse.papyrus.uml.Collaboration">
+	</adviceBinding>
+	
+	<!-- Helper advice for CollaborationUse -->
+	<adviceBinding id="org.eclipse.papyrus.uml.advice.CollaborationUse"
+		class="org.eclipse.papyrus.uml.service.types.helper.advice.CollaborationUseHelperAdvice"
+		inheritance="none" typeId="org.eclipse.papyrus.uml.CollaborationUse">
+	</adviceBinding>
+	
+	<!-- Helper advice for ConnectorEnd -->
+	<adviceBinding id="org.eclipse.papyrus.uml.advice.ConnectorEnd"
+		class="org.eclipse.papyrus.uml.service.types.helper.advice.ConnectorEndHelperAdvice"
+		inheritance="none" typeId="org.eclipse.papyrus.uml.ConnectorEnd">
+	</adviceBinding>
+	
+	<!-- Helper advice for DestructionEvent -->
+	<adviceBinding id="org.eclipse.papyrus.uml.advice.DestructionEvent"
+		class="org.eclipse.papyrus.uml.service.types.helper.advice.DestructionEventHelperAdvice"
+		inheritance="all" typeId="org.eclipse.papyrus.uml.DestructionEvent">
+	</adviceBinding>
+	
+	<!-- Helper advice for unapplication of applied stereotype before delete -->

+	<adviceBinding id="org.eclipse.papyrus.uml.advice.ElementUnapplyStereotype"
+		class="org.eclipse.papyrus.uml.service.types.helper.advice.ElementUnapplyStereotypeHelperAdvice"
+		inheritance="all" typeId="org.eclipse.papyrus.uml.Element">
+	</adviceBinding>
+	
+	<!-- Helper advice for ExecutionSpecification -->
+	<adviceBinding id="org.eclipse.papyrus.uml.advice.ExecutionSpecification"
+		class="org.eclipse.papyrus.uml.service.types.helper.advice.ExecutionSpecificationHelperAdvice"
+		inheritance="all" typeId="org.eclipse.papyrus.uml.ExecutionSpecification">
+	</adviceBinding>
+	
+	<!-- Helper advice for Generalization -->
+	<adviceBinding id="org.eclipse.papyrus.uml.advice.Generalization"
+		class="org.eclipse.papyrus.uml.service.types.helper.advice.GeneralizationHelperAdvice"
+		inheritance="none" typeId="org.eclipse.papyrus.uml.Generalization">
+	</adviceBinding>
+	
+	<!-- Helper advice for Lifeline -->
+	<adviceBinding id="org.eclipse.papyrus.uml.advice.Lifeline"
+		class="org.eclipse.papyrus.uml.service.types.helper.advice.LifelineHelperAdvice"
+		inheritance="all" typeId="org.eclipse.papyrus.uml.Lifeline">
+	</adviceBinding>
+	
+	<!-- Helper advice for Message -->
+	<adviceBinding id="org.eclipse.papyrus.uml.advice.Message"
+		class="org.eclipse.papyrus.uml.service.types.helper.advice.MessageHelperAdvice"
+		inheritance="all" typeId="org.eclipse.papyrus.uml.Message">
+	</adviceBinding>
+	
+	<!-- Helper advice for MessageEnd -->
+	<adviceBinding id="org.eclipse.papyrus.uml.advice.MessageEnd"
+		class="org.eclipse.papyrus.uml.service.types.helper.advice.MessageEndHelperAdvice"
+		inheritance="all" typeId="org.eclipse.papyrus.uml.MessageEnd">
+	</adviceBinding>
+	
+	<!-- Helper advice for element name initialization -->

+	<adviceBinding id="org.eclipse.papyrus.uml.advice.NameElementInitializer"
+		class="org.eclipse.papyrus.uml.service.types.helper.advice.NamedElementInitializerHelperAdvice"
+		inheritance="all" typeId="org.eclipse.papyrus.uml.NamedElement">
+	</adviceBinding>
+	
+	<!-- Helper advice for OccurrenceSpecification -->
+	<adviceBinding id="org.eclipse.papyrus.uml.advice.OccurrenceSpecification"
+		class="org.eclipse.papyrus.uml.service.types.helper.advice.OccurrenceSpecificationHelperAdvice"
+		inheritance="all" typeId="org.eclipse.papyrus.uml.OccurrenceSpecification">
+	</adviceBinding>
+	
+	<!-- Helper advice for PartDecomposition -->
+	<adviceBinding id="org.eclipse.papyrus.uml.advice.PartDecomposition"
+		class="org.eclipse.papyrus.uml.service.types.helper.advice.PartDecompositionHelperAdvice"
+		inheritance="none" typeId="org.eclipse.papyrus.uml.PartDecomposition">
+	</adviceBinding>
+	
+	<!-- Helper advice for Property -->
+	<adviceBinding id="org.eclipse.papyrus.uml.advice.Property"
+		class="org.eclipse.papyrus.uml.service.types.helper.advice.PropertyHelperAdvice"
+		inheritance="all" typeId="org.eclipse.papyrus.uml.Property">
+	</adviceBinding>
+	
+	</metamodel>
+</extension>
+
+<!-- UML ElementType bindings to Papyrus shared IClientContext -->
+<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">
+
+	<!-- Bindings declaration -->
+	<binding context="org.eclipse.papyrus.service.edit.TypeContext">
+	
+		<elementType pattern="org.eclipse.papyrus.uml.*" />
+		<advice ref="org.eclipse.papyrus.uml.advice.Classifier" />
+		<advice ref="org.eclipse.papyrus.uml.advice.Collaboration" />
+		<advice ref="org.eclipse.papyrus.uml.advice.CollaborationUse" />
+		<advice ref="org.eclipse.papyrus.uml.advice.ConnectorEnd" />
+		<advice ref="org.eclipse.papyrus.uml.advice.DestructionEvent" />
+		<advice ref="org.eclipse.papyrus.uml.advice.ElementUnapplyStereotype" />
+		<advice ref="org.eclipse.papyrus.uml.advice.ExecutionSpecification" />
+		<advice ref="org.eclipse.papyrus.uml.advice.Generalization" />
+		<advice ref="org.eclipse.papyrus.uml.advice.Lifeline" />
+		<advice ref="org.eclipse.papyrus.uml.advice.Message" />
+		<advice ref="org.eclipse.papyrus.uml.advice.MessageEnd" />
+		<advice ref="org.eclipse.papyrus.uml.advice.NameElementInitializer" />
+		<advice ref="org.eclipse.papyrus.uml.advice.OccurrenceSpecification" />
+		<advice ref="org.eclipse.papyrus.uml.advice.PartDecomposition" />
+		<advice ref="org.eclipse.papyrus.uml.advice.Property" />
+
+	</binding>
+	
+</extension>
+
+</plugin>
+
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src-gen/org/eclipse/papyrus/uml/service/types/element/UMLElementTypes.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src-gen/org/eclipse/papyrus/uml/service/types/element/UMLElementTypes.java
index 811b01aab9a..244f3b3d21a 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src-gen/org/eclipse/papyrus/uml/service/types/element/UMLElementTypes.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src-gen/org/eclipse/papyrus/uml/service/types/element/UMLElementTypes.java
@@ -21,744 +21,744 @@ import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
 public class UMLElementTypes extends AbstractElementTypeEnumerator {
 
 	/** IElementType for UML Abstraction */
-	public static final IHintedType ABSTRACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Abstraction");
-
+	public static final IHintedType ABSTRACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Abstraction"); //$NON-NLS-1$
+	
 	/** IElementType for UML AcceptCallAction */
-	public static final IHintedType ACCEPT_CALL_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.AcceptCallAction");
-
+	public static final IHintedType ACCEPT_CALL_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.AcceptCallAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML AcceptEventAction */
-	public static final IHintedType ACCEPT_EVENT_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.AcceptEventAction");
-
+	public static final IHintedType ACCEPT_EVENT_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.AcceptEventAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML Action */
-	public static final IHintedType ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Action");
-
+	public static final IHintedType ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Action"); //$NON-NLS-1$
+	
 	/** IElementType for UML ActionExecutionSpecification */
-	public static final IHintedType ACTION_EXECUTION_SPECIFICATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ActionExecutionSpecification");
-
+	public static final IHintedType ACTION_EXECUTION_SPECIFICATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ActionExecutionSpecification"); //$NON-NLS-1$
+	
 	/** IElementType for UML ActionInputPin */
-	public static final IHintedType ACTION_INPUT_PIN = (IHintedType)getElementType("org.eclipse.papyrus.uml.ActionInputPin");
-
+	public static final IHintedType ACTION_INPUT_PIN = (IHintedType)getElementType("org.eclipse.papyrus.uml.ActionInputPin"); //$NON-NLS-1$
+	
 	/** IElementType for UML Activity */
-	public static final IHintedType ACTIVITY = (IHintedType)getElementType("org.eclipse.papyrus.uml.Activity");
-
+	public static final IHintedType ACTIVITY = (IHintedType)getElementType("org.eclipse.papyrus.uml.Activity"); //$NON-NLS-1$
+	
 	/** IElementType for UML ActivityEdge */
-	public static final IHintedType ACTIVITY_EDGE = (IHintedType)getElementType("org.eclipse.papyrus.uml.ActivityEdge");
-
+	public static final IHintedType ACTIVITY_EDGE = (IHintedType)getElementType("org.eclipse.papyrus.uml.ActivityEdge"); //$NON-NLS-1$
+	
 	/** IElementType for UML ActivityFinalNode */
-	public static final IHintedType ACTIVITY_FINAL_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.ActivityFinalNode");
-
+	public static final IHintedType ACTIVITY_FINAL_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.ActivityFinalNode"); //$NON-NLS-1$
+	
 	/** IElementType for UML ActivityGroup */
-	public static final IHintedType ACTIVITY_GROUP = (IHintedType)getElementType("org.eclipse.papyrus.uml.ActivityGroup");
-
+	public static final IHintedType ACTIVITY_GROUP = (IHintedType)getElementType("org.eclipse.papyrus.uml.ActivityGroup"); //$NON-NLS-1$
+	
 	/** IElementType for UML ActivityNode */
-	public static final IHintedType ACTIVITY_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.ActivityNode");
-
+	public static final IHintedType ACTIVITY_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.ActivityNode"); //$NON-NLS-1$
+	
 	/** IElementType for UML ActivityParameterNode */
-	public static final IHintedType ACTIVITY_PARAMETER_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.ActivityParameterNode");
-
+	public static final IHintedType ACTIVITY_PARAMETER_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.ActivityParameterNode"); //$NON-NLS-1$
+	
 	/** IElementType for UML ActivityPartition */
-	public static final IHintedType ACTIVITY_PARTITION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ActivityPartition");
-
+	public static final IHintedType ACTIVITY_PARTITION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ActivityPartition"); //$NON-NLS-1$
+	
 	/** IElementType for UML Actor */
-	public static final IHintedType ACTOR = (IHintedType)getElementType("org.eclipse.papyrus.uml.Actor");
-
+	public static final IHintedType ACTOR = (IHintedType)getElementType("org.eclipse.papyrus.uml.Actor"); //$NON-NLS-1$
+	
 	/** IElementType for UML AddStructuralFeatureValueAction */
-	public static final IHintedType ADD_STRUCTURAL_FEATURE_VALUE_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.AddStructuralFeatureValueAction");
-
+	public static final IHintedType ADD_STRUCTURAL_FEATURE_VALUE_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.AddStructuralFeatureValueAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML AddVariableValueAction */
-	public static final IHintedType ADD_VARIABLE_VALUE_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.AddVariableValueAction");
-
+	public static final IHintedType ADD_VARIABLE_VALUE_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.AddVariableValueAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML AnyReceiveEvent */
-	public static final IHintedType ANY_RECEIVE_EVENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.AnyReceiveEvent");
-
+	public static final IHintedType ANY_RECEIVE_EVENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.AnyReceiveEvent"); //$NON-NLS-1$
+	
 	/** IElementType for UML Artifact */
-	public static final IHintedType ARTIFACT = (IHintedType)getElementType("org.eclipse.papyrus.uml.Artifact");
-
+	public static final IHintedType ARTIFACT = (IHintedType)getElementType("org.eclipse.papyrus.uml.Artifact"); //$NON-NLS-1$
+	
 	/** IElementType for UML Association */
-	public static final IHintedType ASSOCIATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Association");
-
+	public static final IHintedType ASSOCIATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Association"); //$NON-NLS-1$
+	
 	/** IElementType for UML AssociationClass */
-	public static final IHintedType ASSOCIATION_CLASS = (IHintedType)getElementType("org.eclipse.papyrus.uml.AssociationClass");
-
+	public static final IHintedType ASSOCIATION_CLASS = (IHintedType)getElementType("org.eclipse.papyrus.uml.AssociationClass"); //$NON-NLS-1$
+	
 	/** IElementType for UML Behavior */
-	public static final IHintedType BEHAVIOR = (IHintedType)getElementType("org.eclipse.papyrus.uml.Behavior");
-
+	public static final IHintedType BEHAVIOR = (IHintedType)getElementType("org.eclipse.papyrus.uml.Behavior"); //$NON-NLS-1$
+	
+	/** IElementType for UML BehaviorExecutionSpecification */
+	public static final IHintedType BEHAVIOR_EXECUTION_SPECIFICATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.BehaviorExecutionSpecification"); //$NON-NLS-1$
+	
 	/** IElementType for UML BehavioralFeature */
-	public static final IHintedType BEHAVIORAL_FEATURE = (IHintedType)getElementType("org.eclipse.papyrus.uml.BehavioralFeature");
-
+	public static final IHintedType BEHAVIORAL_FEATURE = (IHintedType)getElementType("org.eclipse.papyrus.uml.BehavioralFeature"); //$NON-NLS-1$
+	
 	/** IElementType for UML BehavioredClassifier */
-	public static final IHintedType BEHAVIORED_CLASSIFIER = (IHintedType)getElementType("org.eclipse.papyrus.uml.BehavioredClassifier");
-
-	/** IElementType for UML BehaviorExecutionSpecification */
-	public static final IHintedType BEHAVIOR_EXECUTION_SPECIFICATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.BehaviorExecutionSpecification");
-
+	public static final IHintedType BEHAVIORED_CLASSIFIER = (IHintedType)getElementType("org.eclipse.papyrus.uml.BehavioredClassifier"); //$NON-NLS-1$
+	
 	/** IElementType for UML BroadcastSignalAction */
-	public static final IHintedType BROADCAST_SIGNAL_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.BroadcastSignalAction");
-
+	public static final IHintedType BROADCAST_SIGNAL_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.BroadcastSignalAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML CallAction */
-	public static final IHintedType CALL_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.CallAction");
-
+	public static final IHintedType CALL_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.CallAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML CallBehaviorAction */
-	public static final IHintedType CALL_BEHAVIOR_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.CallBehaviorAction");
-
+	public static final IHintedType CALL_BEHAVIOR_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.CallBehaviorAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML CallEvent */
-	public static final IHintedType CALL_EVENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.CallEvent");
-
+	public static final IHintedType CALL_EVENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.CallEvent"); //$NON-NLS-1$
+	
 	/** IElementType for UML CallOperationAction */
-	public static final IHintedType CALL_OPERATION_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.CallOperationAction");
-
+	public static final IHintedType CALL_OPERATION_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.CallOperationAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML CentralBufferNode */
-	public static final IHintedType CENTRAL_BUFFER_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.CentralBufferNode");
-
+	public static final IHintedType CENTRAL_BUFFER_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.CentralBufferNode"); //$NON-NLS-1$
+	
 	/** IElementType for UML ChangeEvent */
-	public static final IHintedType CHANGE_EVENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.ChangeEvent");
-
+	public static final IHintedType CHANGE_EVENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.ChangeEvent"); //$NON-NLS-1$
+	
 	/** IElementType for UML Class */
-	public static final IHintedType CLASS = (IHintedType)getElementType("org.eclipse.papyrus.uml.Class");
-
+	public static final IHintedType CLASS = (IHintedType)getElementType("org.eclipse.papyrus.uml.Class"); //$NON-NLS-1$
+	
 	/** IElementType for UML Classifier */
-	public static final IHintedType CLASSIFIER = (IHintedType)getElementType("org.eclipse.papyrus.uml.Classifier");
-
+	public static final IHintedType CLASSIFIER = (IHintedType)getElementType("org.eclipse.papyrus.uml.Classifier"); //$NON-NLS-1$
+	
 	/** IElementType for UML ClassifierTemplateParameter */
-	public static final IHintedType CLASSIFIER_TEMPLATE_PARAMETER = (IHintedType)getElementType("org.eclipse.papyrus.uml.ClassifierTemplateParameter");
-
+	public static final IHintedType CLASSIFIER_TEMPLATE_PARAMETER = (IHintedType)getElementType("org.eclipse.papyrus.uml.ClassifierTemplateParameter"); //$NON-NLS-1$
+	
 	/** IElementType for UML Clause */
-	public static final IHintedType CLAUSE = (IHintedType)getElementType("org.eclipse.papyrus.uml.Clause");
-
+	public static final IHintedType CLAUSE = (IHintedType)getElementType("org.eclipse.papyrus.uml.Clause"); //$NON-NLS-1$
+	
 	/** IElementType for UML ClearAssociationAction */
-	public static final IHintedType CLEAR_ASSOCIATION_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ClearAssociationAction");
-
+	public static final IHintedType CLEAR_ASSOCIATION_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ClearAssociationAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML ClearStructuralFeatureAction */
-	public static final IHintedType CLEAR_STRUCTURAL_FEATURE_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ClearStructuralFeatureAction");
-
+	public static final IHintedType CLEAR_STRUCTURAL_FEATURE_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ClearStructuralFeatureAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML ClearVariableAction */
-	public static final IHintedType CLEAR_VARIABLE_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ClearVariableAction");
-
+	public static final IHintedType CLEAR_VARIABLE_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ClearVariableAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML Collaboration */
-	public static final IHintedType COLLABORATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Collaboration");
-
+	public static final IHintedType COLLABORATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Collaboration"); //$NON-NLS-1$
+	
 	/** IElementType for UML CollaborationUse */
-	public static final IHintedType COLLABORATION_USE = (IHintedType)getElementType("org.eclipse.papyrus.uml.CollaborationUse");
-
+	public static final IHintedType COLLABORATION_USE = (IHintedType)getElementType("org.eclipse.papyrus.uml.CollaborationUse"); //$NON-NLS-1$
+	
 	/** IElementType for UML CombinedFragment */
-	public static final IHintedType COMBINED_FRAGMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.CombinedFragment");
-
+	public static final IHintedType COMBINED_FRAGMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.CombinedFragment"); //$NON-NLS-1$
+	
 	/** IElementType for UML Comment */
-	public static final IHintedType COMMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.Comment");
-
+	public static final IHintedType COMMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.Comment"); //$NON-NLS-1$
+	
 	/** IElementType for UML CommunicationPath */
-	public static final IHintedType COMMUNICATION_PATH = (IHintedType)getElementType("org.eclipse.papyrus.uml.CommunicationPath");
-
+	public static final IHintedType COMMUNICATION_PATH = (IHintedType)getElementType("org.eclipse.papyrus.uml.CommunicationPath"); //$NON-NLS-1$
+	
 	/** IElementType for UML Component */
-	public static final IHintedType COMPONENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.Component");
-
+	public static final IHintedType COMPONENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.Component"); //$NON-NLS-1$
+	
 	/** IElementType for UML ComponentRealization */
-	public static final IHintedType COMPONENT_REALIZATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ComponentRealization");
-
+	public static final IHintedType COMPONENT_REALIZATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ComponentRealization"); //$NON-NLS-1$
+	
 	/** IElementType for UML ConditionalNode */
-	public static final IHintedType CONDITIONAL_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.ConditionalNode");
-
+	public static final IHintedType CONDITIONAL_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.ConditionalNode"); //$NON-NLS-1$
+	
 	/** IElementType for UML ConnectableElement */
-	public static final IHintedType CONNECTABLE_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.ConnectableElement");
-
+	public static final IHintedType CONNECTABLE_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.ConnectableElement"); //$NON-NLS-1$
+	
 	/** IElementType for UML ConnectableElementTemplateParameter */
-	public static final IHintedType CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER = (IHintedType)getElementType("org.eclipse.papyrus.uml.ConnectableElementTemplateParameter");
-
+	public static final IHintedType CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER = (IHintedType)getElementType("org.eclipse.papyrus.uml.ConnectableElementTemplateParameter"); //$NON-NLS-1$
+	
 	/** IElementType for UML ConnectionPointReference */
-	public static final IHintedType CONNECTION_POINT_REFERENCE = (IHintedType)getElementType("org.eclipse.papyrus.uml.ConnectionPointReference");
-
+	public static final IHintedType CONNECTION_POINT_REFERENCE = (IHintedType)getElementType("org.eclipse.papyrus.uml.ConnectionPointReference"); //$NON-NLS-1$
+	
 	/** IElementType for UML Connector */
-	public static final IHintedType CONNECTOR = (IHintedType)getElementType("org.eclipse.papyrus.uml.Connector");
-
+	public static final IHintedType CONNECTOR = (IHintedType)getElementType("org.eclipse.papyrus.uml.Connector"); //$NON-NLS-1$
+	
 	/** IElementType for UML ConnectorEnd */
-	public static final IHintedType CONNECTOR_END = (IHintedType)getElementType("org.eclipse.papyrus.uml.ConnectorEnd");
-
+	public static final IHintedType CONNECTOR_END = (IHintedType)getElementType("org.eclipse.papyrus.uml.ConnectorEnd"); //$NON-NLS-1$
+	
 	/** IElementType for UML ConsiderIgnoreFragment */
-	public static final IHintedType CONSIDER_IGNORE_FRAGMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.ConsiderIgnoreFragment");
-
+	public static final IHintedType CONSIDER_IGNORE_FRAGMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.ConsiderIgnoreFragment"); //$NON-NLS-1$
+	
 	/** IElementType for UML Constraint */
-	public static final IHintedType CONSTRAINT = (IHintedType)getElementType("org.eclipse.papyrus.uml.Constraint");
-
+	public static final IHintedType CONSTRAINT = (IHintedType)getElementType("org.eclipse.papyrus.uml.Constraint"); //$NON-NLS-1$
+	
 	/** IElementType for UML Continuation */
-	public static final IHintedType CONTINUATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Continuation");
-
+	public static final IHintedType CONTINUATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Continuation"); //$NON-NLS-1$
+	
 	/** IElementType for UML ControlFlow */
-	public static final IHintedType CONTROL_FLOW = (IHintedType)getElementType("org.eclipse.papyrus.uml.ControlFlow");
-
+	public static final IHintedType CONTROL_FLOW = (IHintedType)getElementType("org.eclipse.papyrus.uml.ControlFlow"); //$NON-NLS-1$
+	
 	/** IElementType for UML ControlNode */
-	public static final IHintedType CONTROL_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.ControlNode");
-
+	public static final IHintedType CONTROL_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.ControlNode"); //$NON-NLS-1$
+	
 	/** IElementType for UML CreateLinkAction */
-	public static final IHintedType CREATE_LINK_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.CreateLinkAction");
-
+	public static final IHintedType CREATE_LINK_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.CreateLinkAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML CreateLinkObjectAction */
-	public static final IHintedType CREATE_LINK_OBJECT_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.CreateLinkObjectAction");
-
+	public static final IHintedType CREATE_LINK_OBJECT_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.CreateLinkObjectAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML CreateObjectAction */
-	public static final IHintedType CREATE_OBJECT_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.CreateObjectAction");
-
+	public static final IHintedType CREATE_OBJECT_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.CreateObjectAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML CreationEvent */
-	public static final IHintedType CREATION_EVENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.CreationEvent");
-
+	public static final IHintedType CREATION_EVENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.CreationEvent"); //$NON-NLS-1$
+	
 	/** IElementType for UML DataStoreNode */
-	public static final IHintedType DATA_STORE_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.DataStoreNode");
-
+	public static final IHintedType DATA_STORE_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.DataStoreNode"); //$NON-NLS-1$
+	
 	/** IElementType for UML DataType */
-	public static final IHintedType DATA_TYPE = (IHintedType)getElementType("org.eclipse.papyrus.uml.DataType");
-
+	public static final IHintedType DATA_TYPE = (IHintedType)getElementType("org.eclipse.papyrus.uml.DataType"); //$NON-NLS-1$
+	
 	/** IElementType for UML DecisionNode */
-	public static final IHintedType DECISION_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.DecisionNode");
-
+	public static final IHintedType DECISION_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.DecisionNode"); //$NON-NLS-1$
+	
 	/** IElementType for UML Dependency */
-	public static final IHintedType DEPENDENCY = (IHintedType)getElementType("org.eclipse.papyrus.uml.Dependency");
-
+	public static final IHintedType DEPENDENCY = (IHintedType)getElementType("org.eclipse.papyrus.uml.Dependency"); //$NON-NLS-1$
+	
 	/** IElementType for UML DeployedArtifact */
-	public static final IHintedType DEPLOYED_ARTIFACT = (IHintedType)getElementType("org.eclipse.papyrus.uml.DeployedArtifact");
-
+	public static final IHintedType DEPLOYED_ARTIFACT = (IHintedType)getElementType("org.eclipse.papyrus.uml.DeployedArtifact"); //$NON-NLS-1$
+	
 	/** IElementType for UML Deployment */
-	public static final IHintedType DEPLOYMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.Deployment");
-
+	public static final IHintedType DEPLOYMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.Deployment"); //$NON-NLS-1$
+	
 	/** IElementType for UML DeploymentSpecification */
-	public static final IHintedType DEPLOYMENT_SPECIFICATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.DeploymentSpecification");
-
+	public static final IHintedType DEPLOYMENT_SPECIFICATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.DeploymentSpecification"); //$NON-NLS-1$
+	
 	/** IElementType for UML DeploymentTarget */
-	public static final IHintedType DEPLOYMENT_TARGET = (IHintedType)getElementType("org.eclipse.papyrus.uml.DeploymentTarget");
-
+	public static final IHintedType DEPLOYMENT_TARGET = (IHintedType)getElementType("org.eclipse.papyrus.uml.DeploymentTarget"); //$NON-NLS-1$
+	
 	/** IElementType for UML DestroyLinkAction */
-	public static final IHintedType DESTROY_LINK_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.DestroyLinkAction");
-
+	public static final IHintedType DESTROY_LINK_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.DestroyLinkAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML DestroyObjectAction */
-	public static final IHintedType DESTROY_OBJECT_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.DestroyObjectAction");
-
+	public static final IHintedType DESTROY_OBJECT_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.DestroyObjectAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML DestructionEvent */
-	public static final IHintedType DESTRUCTION_EVENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.DestructionEvent");
-
+	public static final IHintedType DESTRUCTION_EVENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.DestructionEvent"); //$NON-NLS-1$
+	
 	/** IElementType for UML Device */
-	public static final IHintedType DEVICE = (IHintedType)getElementType("org.eclipse.papyrus.uml.Device");
-
+	public static final IHintedType DEVICE = (IHintedType)getElementType("org.eclipse.papyrus.uml.Device"); //$NON-NLS-1$
+	
 	/** IElementType for UML DirectedRelationship */
-	public static final IHintedType DIRECTED_RELATIONSHIP = (IHintedType)getElementType("org.eclipse.papyrus.uml.DirectedRelationship");
-
+	public static final IHintedType DIRECTED_RELATIONSHIP = (IHintedType)getElementType("org.eclipse.papyrus.uml.DirectedRelationship"); //$NON-NLS-1$
+	
 	/** IElementType for UML Duration */
-	public static final IHintedType DURATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Duration");
-
+	public static final IHintedType DURATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Duration"); //$NON-NLS-1$
+	
 	/** IElementType for UML DurationConstraint */
-	public static final IHintedType DURATION_CONSTRAINT = (IHintedType)getElementType("org.eclipse.papyrus.uml.DurationConstraint");
-
+	public static final IHintedType DURATION_CONSTRAINT = (IHintedType)getElementType("org.eclipse.papyrus.uml.DurationConstraint"); //$NON-NLS-1$
+	
 	/** IElementType for UML DurationInterval */
-	public static final IHintedType DURATION_INTERVAL = (IHintedType)getElementType("org.eclipse.papyrus.uml.DurationInterval");
-
+	public static final IHintedType DURATION_INTERVAL = (IHintedType)getElementType("org.eclipse.papyrus.uml.DurationInterval"); //$NON-NLS-1$
+	
 	/** IElementType for UML DurationObservation */
-	public static final IHintedType DURATION_OBSERVATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.DurationObservation");
-
+	public static final IHintedType DURATION_OBSERVATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.DurationObservation"); //$NON-NLS-1$
+	
 	/** IElementType for UML Element */
-	public static final IHintedType ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.Element");
-
+	public static final IHintedType ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.Element"); //$NON-NLS-1$
+	
 	/** IElementType for UML ElementImport */
-	public static final IHintedType ELEMENT_IMPORT = (IHintedType)getElementType("org.eclipse.papyrus.uml.ElementImport");
-
+	public static final IHintedType ELEMENT_IMPORT = (IHintedType)getElementType("org.eclipse.papyrus.uml.ElementImport"); //$NON-NLS-1$
+	
 	/** IElementType for UML EncapsulatedClassifier */
-	public static final IHintedType ENCAPSULATED_CLASSIFIER = (IHintedType)getElementType("org.eclipse.papyrus.uml.EncapsulatedClassifier");
-
+	public static final IHintedType ENCAPSULATED_CLASSIFIER = (IHintedType)getElementType("org.eclipse.papyrus.uml.EncapsulatedClassifier"); //$NON-NLS-1$
+	
 	/** IElementType for UML Enumeration */
-	public static final IHintedType ENUMERATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Enumeration");
-
+	public static final IHintedType ENUMERATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Enumeration"); //$NON-NLS-1$
+	
 	/** IElementType for UML EnumerationLiteral */
-	public static final IHintedType ENUMERATION_LITERAL = (IHintedType)getElementType("org.eclipse.papyrus.uml.EnumerationLiteral");
-
+	public static final IHintedType ENUMERATION_LITERAL = (IHintedType)getElementType("org.eclipse.papyrus.uml.EnumerationLiteral"); //$NON-NLS-1$
+	
 	/** IElementType for UML Event */
-	public static final IHintedType EVENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.Event");
-
+	public static final IHintedType EVENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.Event"); //$NON-NLS-1$
+	
 	/** IElementType for UML ExceptionHandler */
-	public static final IHintedType EXCEPTION_HANDLER = (IHintedType)getElementType("org.eclipse.papyrus.uml.ExceptionHandler");
-
+	public static final IHintedType EXCEPTION_HANDLER = (IHintedType)getElementType("org.eclipse.papyrus.uml.ExceptionHandler"); //$NON-NLS-1$
+	
 	/** IElementType for UML ExecutableNode */
-	public static final IHintedType EXECUTABLE_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.ExecutableNode");
-
+	public static final IHintedType EXECUTABLE_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.ExecutableNode"); //$NON-NLS-1$
+	
 	/** IElementType for UML ExecutionEnvironment */
-	public static final IHintedType EXECUTION_ENVIRONMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.ExecutionEnvironment");
-
+	public static final IHintedType EXECUTION_ENVIRONMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.ExecutionEnvironment"); //$NON-NLS-1$
+	
 	/** IElementType for UML ExecutionEvent */
-	public static final IHintedType EXECUTION_EVENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.ExecutionEvent");
-
+	public static final IHintedType EXECUTION_EVENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.ExecutionEvent"); //$NON-NLS-1$
+	
 	/** IElementType for UML ExecutionOccurrenceSpecification */
-	public static final IHintedType EXECUTION_OCCURRENCE_SPECIFICATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ExecutionOccurrenceSpecification");
-
+	public static final IHintedType EXECUTION_OCCURRENCE_SPECIFICATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ExecutionOccurrenceSpecification"); //$NON-NLS-1$
+	
 	/** IElementType for UML ExecutionSpecification */
-	public static final IHintedType EXECUTION_SPECIFICATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ExecutionSpecification");
-
+	public static final IHintedType EXECUTION_SPECIFICATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ExecutionSpecification"); //$NON-NLS-1$
+	
 	/** IElementType for UML ExpansionNode */
-	public static final IHintedType EXPANSION_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.ExpansionNode");
-
+	public static final IHintedType EXPANSION_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.ExpansionNode"); //$NON-NLS-1$
+	
 	/** IElementType for UML ExpansionRegion */
-	public static final IHintedType EXPANSION_REGION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ExpansionRegion");
-
+	public static final IHintedType EXPANSION_REGION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ExpansionRegion"); //$NON-NLS-1$
+	
 	/** IElementType for UML Expression */
-	public static final IHintedType EXPRESSION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Expression");
-
+	public static final IHintedType EXPRESSION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Expression"); //$NON-NLS-1$
+	
 	/** IElementType for UML Extend */
-	public static final IHintedType EXTEND = (IHintedType)getElementType("org.eclipse.papyrus.uml.Extend");
-
+	public static final IHintedType EXTEND = (IHintedType)getElementType("org.eclipse.papyrus.uml.Extend"); //$NON-NLS-1$
+	
 	/** IElementType for UML Extension */
-	public static final IHintedType EXTENSION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Extension");
-
+	public static final IHintedType EXTENSION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Extension"); //$NON-NLS-1$
+	
 	/** IElementType for UML ExtensionEnd */
-	public static final IHintedType EXTENSION_END = (IHintedType)getElementType("org.eclipse.papyrus.uml.ExtensionEnd");
-
+	public static final IHintedType EXTENSION_END = (IHintedType)getElementType("org.eclipse.papyrus.uml.ExtensionEnd"); //$NON-NLS-1$
+	
 	/** IElementType for UML ExtensionPoint */
-	public static final IHintedType EXTENSION_POINT = (IHintedType)getElementType("org.eclipse.papyrus.uml.ExtensionPoint");
-
+	public static final IHintedType EXTENSION_POINT = (IHintedType)getElementType("org.eclipse.papyrus.uml.ExtensionPoint"); //$NON-NLS-1$
+	
 	/** IElementType for UML Feature */
-	public static final IHintedType FEATURE = (IHintedType)getElementType("org.eclipse.papyrus.uml.Feature");
-
+	public static final IHintedType FEATURE = (IHintedType)getElementType("org.eclipse.papyrus.uml.Feature"); //$NON-NLS-1$
+	
 	/** IElementType for UML FinalNode */
-	public static final IHintedType FINAL_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.FinalNode");
-
+	public static final IHintedType FINAL_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.FinalNode"); //$NON-NLS-1$
+	
 	/** IElementType for UML FinalState */
-	public static final IHintedType FINAL_STATE = (IHintedType)getElementType("org.eclipse.papyrus.uml.FinalState");
-
+	public static final IHintedType FINAL_STATE = (IHintedType)getElementType("org.eclipse.papyrus.uml.FinalState"); //$NON-NLS-1$
+	
 	/** IElementType for UML FlowFinalNode */
-	public static final IHintedType FLOW_FINAL_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.FlowFinalNode");
-
+	public static final IHintedType FLOW_FINAL_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.FlowFinalNode"); //$NON-NLS-1$
+	
 	/** IElementType for UML ForkNode */
-	public static final IHintedType FORK_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.ForkNode");
-
+	public static final IHintedType FORK_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.ForkNode"); //$NON-NLS-1$
+	
 	/** IElementType for UML FunctionBehavior */
-	public static final IHintedType FUNCTION_BEHAVIOR = (IHintedType)getElementType("org.eclipse.papyrus.uml.FunctionBehavior");
-
+	public static final IHintedType FUNCTION_BEHAVIOR = (IHintedType)getElementType("org.eclipse.papyrus.uml.FunctionBehavior"); //$NON-NLS-1$
+	
 	/** IElementType for UML Gate */
-	public static final IHintedType GATE = (IHintedType)getElementType("org.eclipse.papyrus.uml.Gate");
-
+	public static final IHintedType GATE = (IHintedType)getElementType("org.eclipse.papyrus.uml.Gate"); //$NON-NLS-1$
+	
+	/** IElementType for UML GeneralOrdering */
+	public static final IHintedType GENERAL_ORDERING = (IHintedType)getElementType("org.eclipse.papyrus.uml.GeneralOrdering"); //$NON-NLS-1$
+	
 	/** IElementType for UML Generalization */
-	public static final IHintedType GENERALIZATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Generalization");
-
+	public static final IHintedType GENERALIZATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Generalization"); //$NON-NLS-1$
+	
 	/** IElementType for UML GeneralizationSet */
-	public static final IHintedType GENERALIZATION_SET = (IHintedType)getElementType("org.eclipse.papyrus.uml.GeneralizationSet");
-
-	/** IElementType for UML GeneralOrdering */
-	public static final IHintedType GENERAL_ORDERING = (IHintedType)getElementType("org.eclipse.papyrus.uml.GeneralOrdering");
-
+	public static final IHintedType GENERALIZATION_SET = (IHintedType)getElementType("org.eclipse.papyrus.uml.GeneralizationSet"); //$NON-NLS-1$
+	
 	/** IElementType for UML Image */
-	public static final IHintedType IMAGE = (IHintedType)getElementType("org.eclipse.papyrus.uml.Image");
-
+	public static final IHintedType IMAGE = (IHintedType)getElementType("org.eclipse.papyrus.uml.Image"); //$NON-NLS-1$
+	
 	/** IElementType for UML Include */
-	public static final IHintedType INCLUDE = (IHintedType)getElementType("org.eclipse.papyrus.uml.Include");
-
+	public static final IHintedType INCLUDE = (IHintedType)getElementType("org.eclipse.papyrus.uml.Include"); //$NON-NLS-1$
+	
 	/** IElementType for UML InformationFlow */
-	public static final IHintedType INFORMATION_FLOW = (IHintedType)getElementType("org.eclipse.papyrus.uml.InformationFlow");
-
+	public static final IHintedType INFORMATION_FLOW = (IHintedType)getElementType("org.eclipse.papyrus.uml.InformationFlow"); //$NON-NLS-1$
+	
 	/** IElementType for UML InformationItem */
-	public static final IHintedType INFORMATION_ITEM = (IHintedType)getElementType("org.eclipse.papyrus.uml.InformationItem");
-
+	public static final IHintedType INFORMATION_ITEM = (IHintedType)getElementType("org.eclipse.papyrus.uml.InformationItem"); //$NON-NLS-1$
+	
 	/** IElementType for UML InitialNode */
-	public static final IHintedType INITIAL_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.InitialNode");
-
+	public static final IHintedType INITIAL_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.InitialNode"); //$NON-NLS-1$
+	
 	/** IElementType for UML InputPin */
-	public static final IHintedType INPUT_PIN = (IHintedType)getElementType("org.eclipse.papyrus.uml.InputPin");
-
+	public static final IHintedType INPUT_PIN = (IHintedType)getElementType("org.eclipse.papyrus.uml.InputPin"); //$NON-NLS-1$
+	
 	/** IElementType for UML InstanceSpecification */
-	public static final IHintedType INSTANCE_SPECIFICATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.InstanceSpecification");
-
+	public static final IHintedType INSTANCE_SPECIFICATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.InstanceSpecification"); //$NON-NLS-1$
+	
 	/** IElementType for UML InstanceValue */
-	public static final IHintedType INSTANCE_VALUE = (IHintedType)getElementType("org.eclipse.papyrus.uml.InstanceValue");
-
+	public static final IHintedType INSTANCE_VALUE = (IHintedType)getElementType("org.eclipse.papyrus.uml.InstanceValue"); //$NON-NLS-1$
+	
 	/** IElementType for UML Interaction */
-	public static final IHintedType INTERACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Interaction");
-
+	public static final IHintedType INTERACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Interaction"); //$NON-NLS-1$
+	
 	/** IElementType for UML InteractionConstraint */
-	public static final IHintedType INTERACTION_CONSTRAINT = (IHintedType)getElementType("org.eclipse.papyrus.uml.InteractionConstraint");
-
+	public static final IHintedType INTERACTION_CONSTRAINT = (IHintedType)getElementType("org.eclipse.papyrus.uml.InteractionConstraint"); //$NON-NLS-1$
+	
 	/** IElementType for UML InteractionFragment */
-	public static final IHintedType INTERACTION_FRAGMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.InteractionFragment");
-
+	public static final IHintedType INTERACTION_FRAGMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.InteractionFragment"); //$NON-NLS-1$
+	
 	/** IElementType for UML InteractionOperand */
-	public static final IHintedType INTERACTION_OPERAND = (IHintedType)getElementType("org.eclipse.papyrus.uml.InteractionOperand");
-
+	public static final IHintedType INTERACTION_OPERAND = (IHintedType)getElementType("org.eclipse.papyrus.uml.InteractionOperand"); //$NON-NLS-1$
+	
 	/** IElementType for UML InteractionUse */
-	public static final IHintedType INTERACTION_USE = (IHintedType)getElementType("org.eclipse.papyrus.uml.InteractionUse");
-
+	public static final IHintedType INTERACTION_USE = (IHintedType)getElementType("org.eclipse.papyrus.uml.InteractionUse"); //$NON-NLS-1$
+	
 	/** IElementType for UML Interface */
-	public static final IHintedType INTERFACE = (IHintedType)getElementType("org.eclipse.papyrus.uml.Interface");
-
+	public static final IHintedType INTERFACE = (IHintedType)getElementType("org.eclipse.papyrus.uml.Interface"); //$NON-NLS-1$
+	
 	/** IElementType for UML InterfaceRealization */
-	public static final IHintedType INTERFACE_REALIZATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.InterfaceRealization");
-
+	public static final IHintedType INTERFACE_REALIZATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.InterfaceRealization"); //$NON-NLS-1$
+	
 	/** IElementType for UML InterruptibleActivityRegion */
-	public static final IHintedType INTERRUPTIBLE_ACTIVITY_REGION = (IHintedType)getElementType("org.eclipse.papyrus.uml.InterruptibleActivityRegion");
-
+	public static final IHintedType INTERRUPTIBLE_ACTIVITY_REGION = (IHintedType)getElementType("org.eclipse.papyrus.uml.InterruptibleActivityRegion"); //$NON-NLS-1$
+	
 	/** IElementType for UML Interval */
-	public static final IHintedType INTERVAL = (IHintedType)getElementType("org.eclipse.papyrus.uml.Interval");
-
+	public static final IHintedType INTERVAL = (IHintedType)getElementType("org.eclipse.papyrus.uml.Interval"); //$NON-NLS-1$
+	
 	/** IElementType for UML IntervalConstraint */
-	public static final IHintedType INTERVAL_CONSTRAINT = (IHintedType)getElementType("org.eclipse.papyrus.uml.IntervalConstraint");
-
+	public static final IHintedType INTERVAL_CONSTRAINT = (IHintedType)getElementType("org.eclipse.papyrus.uml.IntervalConstraint"); //$NON-NLS-1$
+	
 	/** IElementType for UML InvocationAction */
-	public static final IHintedType INVOCATION_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.InvocationAction");
-
+	public static final IHintedType INVOCATION_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.InvocationAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML JoinNode */
-	public static final IHintedType JOIN_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.JoinNode");
-
+	public static final IHintedType JOIN_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.JoinNode"); //$NON-NLS-1$
+	
 	/** IElementType for UML Lifeline */
-	public static final IHintedType LIFELINE = (IHintedType)getElementType("org.eclipse.papyrus.uml.Lifeline");
-
+	public static final IHintedType LIFELINE = (IHintedType)getElementType("org.eclipse.papyrus.uml.Lifeline"); //$NON-NLS-1$
+	
 	/** IElementType for UML LinkAction */
-	public static final IHintedType LINK_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.LinkAction");
-
+	public static final IHintedType LINK_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.LinkAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML LinkEndCreationData */
-	public static final IHintedType LINK_END_CREATION_DATA = (IHintedType)getElementType("org.eclipse.papyrus.uml.LinkEndCreationData");
-
+	public static final IHintedType LINK_END_CREATION_DATA = (IHintedType)getElementType("org.eclipse.papyrus.uml.LinkEndCreationData"); //$NON-NLS-1$
+	
 	/** IElementType for UML LinkEndData */
-	public static final IHintedType LINK_END_DATA = (IHintedType)getElementType("org.eclipse.papyrus.uml.LinkEndData");
-
+	public static final IHintedType LINK_END_DATA = (IHintedType)getElementType("org.eclipse.papyrus.uml.LinkEndData"); //$NON-NLS-1$
+	
 	/** IElementType for UML LinkEndDestructionData */
-	public static final IHintedType LINK_END_DESTRUCTION_DATA = (IHintedType)getElementType("org.eclipse.papyrus.uml.LinkEndDestructionData");
-
+	public static final IHintedType LINK_END_DESTRUCTION_DATA = (IHintedType)getElementType("org.eclipse.papyrus.uml.LinkEndDestructionData"); //$NON-NLS-1$
+	
 	/** IElementType for UML LiteralBoolean */
-	public static final IHintedType LITERAL_BOOLEAN = (IHintedType)getElementType("org.eclipse.papyrus.uml.LiteralBoolean");
-
+	public static final IHintedType LITERAL_BOOLEAN = (IHintedType)getElementType("org.eclipse.papyrus.uml.LiteralBoolean"); //$NON-NLS-1$
+	
 	/** IElementType for UML LiteralInteger */
-	public static final IHintedType LITERAL_INTEGER = (IHintedType)getElementType("org.eclipse.papyrus.uml.LiteralInteger");
-
+	public static final IHintedType LITERAL_INTEGER = (IHintedType)getElementType("org.eclipse.papyrus.uml.LiteralInteger"); //$NON-NLS-1$
+	
 	/** IElementType for UML LiteralNull */
-	public static final IHintedType LITERAL_NULL = (IHintedType)getElementType("org.eclipse.papyrus.uml.LiteralNull");
-
+	public static final IHintedType LITERAL_NULL = (IHintedType)getElementType("org.eclipse.papyrus.uml.LiteralNull"); //$NON-NLS-1$
+	
 	/** IElementType for UML LiteralSpecification */
-	public static final IHintedType LITERAL_SPECIFICATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.LiteralSpecification");
-
+	public static final IHintedType LITERAL_SPECIFICATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.LiteralSpecification"); //$NON-NLS-1$
+	
 	/** IElementType for UML LiteralString */
-	public static final IHintedType LITERAL_STRING = (IHintedType)getElementType("org.eclipse.papyrus.uml.LiteralString");
-
+	public static final IHintedType LITERAL_STRING = (IHintedType)getElementType("org.eclipse.papyrus.uml.LiteralString"); //$NON-NLS-1$
+	
 	/** IElementType for UML LiteralUnlimitedNatural */
-	public static final IHintedType LITERAL_UNLIMITED_NATURAL = (IHintedType)getElementType("org.eclipse.papyrus.uml.LiteralUnlimitedNatural");
-
+	public static final IHintedType LITERAL_UNLIMITED_NATURAL = (IHintedType)getElementType("org.eclipse.papyrus.uml.LiteralUnlimitedNatural"); //$NON-NLS-1$
+	
 	/** IElementType for UML LoopNode */
-	public static final IHintedType LOOP_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.LoopNode");
-
+	public static final IHintedType LOOP_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.LoopNode"); //$NON-NLS-1$
+	
 	/** IElementType for UML Manifestation */
-	public static final IHintedType MANIFESTATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Manifestation");
-
+	public static final IHintedType MANIFESTATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Manifestation"); //$NON-NLS-1$
+	
 	/** IElementType for UML MergeNode */
-	public static final IHintedType MERGE_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.MergeNode");
-
+	public static final IHintedType MERGE_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.MergeNode"); //$NON-NLS-1$
+	
 	/** IElementType for UML Message */
-	public static final IHintedType MESSAGE = (IHintedType)getElementType("org.eclipse.papyrus.uml.Message");
-
+	public static final IHintedType MESSAGE = (IHintedType)getElementType("org.eclipse.papyrus.uml.Message"); //$NON-NLS-1$
+	
 	/** IElementType for UML MessageEnd */
-	public static final IHintedType MESSAGE_END = (IHintedType)getElementType("org.eclipse.papyrus.uml.MessageEnd");
-
+	public static final IHintedType MESSAGE_END = (IHintedType)getElementType("org.eclipse.papyrus.uml.MessageEnd"); //$NON-NLS-1$
+	
 	/** IElementType for UML MessageEvent */
-	public static final IHintedType MESSAGE_EVENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.MessageEvent");
-
+	public static final IHintedType MESSAGE_EVENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.MessageEvent"); //$NON-NLS-1$
+	
 	/** IElementType for UML MessageOccurrenceSpecification */
-	public static final IHintedType MESSAGE_OCCURRENCE_SPECIFICATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.MessageOccurrenceSpecification");
-
+	public static final IHintedType MESSAGE_OCCURRENCE_SPECIFICATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.MessageOccurrenceSpecification"); //$NON-NLS-1$
+	
 	/** IElementType for UML Model */
-	public static final IHintedType MODEL = (IHintedType)getElementType("org.eclipse.papyrus.uml.Model");
-
+	public static final IHintedType MODEL = (IHintedType)getElementType("org.eclipse.papyrus.uml.Model"); //$NON-NLS-1$
+	
 	/** IElementType for UML MultiplicityElement */
-	public static final IHintedType MULTIPLICITY_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.MultiplicityElement");
-
+	public static final IHintedType MULTIPLICITY_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.MultiplicityElement"); //$NON-NLS-1$
+	
 	/** IElementType for UML NamedElement */
-	public static final IHintedType NAMED_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.NamedElement");
-
+	public static final IHintedType NAMED_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.NamedElement"); //$NON-NLS-1$
+	
 	/** IElementType for UML Namespace */
-	public static final IHintedType NAMESPACE = (IHintedType)getElementType("org.eclipse.papyrus.uml.Namespace");
-
+	public static final IHintedType NAMESPACE = (IHintedType)getElementType("org.eclipse.papyrus.uml.Namespace"); //$NON-NLS-1$
+	
 	/** IElementType for UML Node */
-	public static final IHintedType NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.Node");
-
+	public static final IHintedType NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.Node"); //$NON-NLS-1$
+	
 	/** IElementType for UML ObjectFlow */
-	public static final IHintedType OBJECT_FLOW = (IHintedType)getElementType("org.eclipse.papyrus.uml.ObjectFlow");
-
+	public static final IHintedType OBJECT_FLOW = (IHintedType)getElementType("org.eclipse.papyrus.uml.ObjectFlow"); //$NON-NLS-1$
+	
 	/** IElementType for UML ObjectNode */
-	public static final IHintedType OBJECT_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.ObjectNode");
-
+	public static final IHintedType OBJECT_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.ObjectNode"); //$NON-NLS-1$
+	
 	/** IElementType for UML Observation */
-	public static final IHintedType OBSERVATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Observation");
-
+	public static final IHintedType OBSERVATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Observation"); //$NON-NLS-1$
+	
 	/** IElementType for UML OccurrenceSpecification */
-	public static final IHintedType OCCURRENCE_SPECIFICATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.OccurrenceSpecification");
-
+	public static final IHintedType OCCURRENCE_SPECIFICATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.OccurrenceSpecification"); //$NON-NLS-1$
+	
 	/** IElementType for UML OpaqueAction */
-	public static final IHintedType OPAQUE_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.OpaqueAction");
-
+	public static final IHintedType OPAQUE_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.OpaqueAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML OpaqueBehavior */
-	public static final IHintedType OPAQUE_BEHAVIOR = (IHintedType)getElementType("org.eclipse.papyrus.uml.OpaqueBehavior");
-
+	public static final IHintedType OPAQUE_BEHAVIOR = (IHintedType)getElementType("org.eclipse.papyrus.uml.OpaqueBehavior"); //$NON-NLS-1$
+	
 	/** IElementType for UML OpaqueExpression */
-	public static final IHintedType OPAQUE_EXPRESSION = (IHintedType)getElementType("org.eclipse.papyrus.uml.OpaqueExpression");
-
+	public static final IHintedType OPAQUE_EXPRESSION = (IHintedType)getElementType("org.eclipse.papyrus.uml.OpaqueExpression"); //$NON-NLS-1$
+	
 	/** IElementType for UML Operation */
-	public static final IHintedType OPERATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Operation");
-
+	public static final IHintedType OPERATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Operation"); //$NON-NLS-1$
+	
 	/** IElementType for UML OperationTemplateParameter */
-	public static final IHintedType OPERATION_TEMPLATE_PARAMETER = (IHintedType)getElementType("org.eclipse.papyrus.uml.OperationTemplateParameter");
-
+	public static final IHintedType OPERATION_TEMPLATE_PARAMETER = (IHintedType)getElementType("org.eclipse.papyrus.uml.OperationTemplateParameter"); //$NON-NLS-1$
+	
 	/** IElementType for UML OutputPin */
-	public static final IHintedType OUTPUT_PIN = (IHintedType)getElementType("org.eclipse.papyrus.uml.OutputPin");
-
+	public static final IHintedType OUTPUT_PIN = (IHintedType)getElementType("org.eclipse.papyrus.uml.OutputPin"); //$NON-NLS-1$
+	
 	/** IElementType for UML Package */
-	public static final IHintedType PACKAGE = (IHintedType)getElementType("org.eclipse.papyrus.uml.Package");
-
-	/** IElementType for UML PackageableElement */
-	public static final IHintedType PACKAGEABLE_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.PackageableElement");
-
+	public static final IHintedType PACKAGE = (IHintedType)getElementType("org.eclipse.papyrus.uml.Package"); //$NON-NLS-1$
+	
 	/** IElementType for UML PackageImport */
-	public static final IHintedType PACKAGE_IMPORT = (IHintedType)getElementType("org.eclipse.papyrus.uml.PackageImport");
-
+	public static final IHintedType PACKAGE_IMPORT = (IHintedType)getElementType("org.eclipse.papyrus.uml.PackageImport"); //$NON-NLS-1$
+	
 	/** IElementType for UML PackageMerge */
-	public static final IHintedType PACKAGE_MERGE = (IHintedType)getElementType("org.eclipse.papyrus.uml.PackageMerge");
-
+	public static final IHintedType PACKAGE_MERGE = (IHintedType)getElementType("org.eclipse.papyrus.uml.PackageMerge"); //$NON-NLS-1$
+	
+	/** IElementType for UML PackageableElement */
+	public static final IHintedType PACKAGEABLE_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.PackageableElement"); //$NON-NLS-1$
+	
 	/** IElementType for UML Parameter */
-	public static final IHintedType PARAMETER = (IHintedType)getElementType("org.eclipse.papyrus.uml.Parameter");
-
-	/** IElementType for UML ParameterableElement */
-	public static final IHintedType PARAMETERABLE_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.ParameterableElement");
-
+	public static final IHintedType PARAMETER = (IHintedType)getElementType("org.eclipse.papyrus.uml.Parameter"); //$NON-NLS-1$
+	
 	/** IElementType for UML ParameterSet */
-	public static final IHintedType PARAMETER_SET = (IHintedType)getElementType("org.eclipse.papyrus.uml.ParameterSet");
-
+	public static final IHintedType PARAMETER_SET = (IHintedType)getElementType("org.eclipse.papyrus.uml.ParameterSet"); //$NON-NLS-1$
+	
+	/** IElementType for UML ParameterableElement */
+	public static final IHintedType PARAMETERABLE_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.ParameterableElement"); //$NON-NLS-1$
+	
 	/** IElementType for UML PartDecomposition */
-	public static final IHintedType PART_DECOMPOSITION = (IHintedType)getElementType("org.eclipse.papyrus.uml.PartDecomposition");
-
+	public static final IHintedType PART_DECOMPOSITION = (IHintedType)getElementType("org.eclipse.papyrus.uml.PartDecomposition"); //$NON-NLS-1$
+	
 	/** IElementType for UML Pin */
-	public static final IHintedType PIN = (IHintedType)getElementType("org.eclipse.papyrus.uml.Pin");
-
+	public static final IHintedType PIN = (IHintedType)getElementType("org.eclipse.papyrus.uml.Pin"); //$NON-NLS-1$
+	
 	/** IElementType for UML Port */
-	public static final IHintedType PORT = (IHintedType)getElementType("org.eclipse.papyrus.uml.Port");
-
+	public static final IHintedType PORT = (IHintedType)getElementType("org.eclipse.papyrus.uml.Port"); //$NON-NLS-1$
+	
 	/** IElementType for UML PrimitiveType */
-	public static final IHintedType PRIMITIVE_TYPE = (IHintedType)getElementType("org.eclipse.papyrus.uml.PrimitiveType");
-
+	public static final IHintedType PRIMITIVE_TYPE = (IHintedType)getElementType("org.eclipse.papyrus.uml.PrimitiveType"); //$NON-NLS-1$
+	
 	/** IElementType for UML Profile */
-	public static final IHintedType PROFILE = (IHintedType)getElementType("org.eclipse.papyrus.uml.Profile");
-
+	public static final IHintedType PROFILE = (IHintedType)getElementType("org.eclipse.papyrus.uml.Profile"); //$NON-NLS-1$
+	
 	/** IElementType for UML ProfileApplication */
-	public static final IHintedType PROFILE_APPLICATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ProfileApplication");
-
+	public static final IHintedType PROFILE_APPLICATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ProfileApplication"); //$NON-NLS-1$
+	
 	/** IElementType for UML Property */
-	public static final IHintedType PROPERTY = (IHintedType)getElementType("org.eclipse.papyrus.uml.Property");
-
+	public static final IHintedType PROPERTY = (IHintedType)getElementType("org.eclipse.papyrus.uml.Property"); //$NON-NLS-1$
+	
 	/** IElementType for UML ProtocolConformance */
-	public static final IHintedType PROTOCOL_CONFORMANCE = (IHintedType)getElementType("org.eclipse.papyrus.uml.ProtocolConformance");
-
+	public static final IHintedType PROTOCOL_CONFORMANCE = (IHintedType)getElementType("org.eclipse.papyrus.uml.ProtocolConformance"); //$NON-NLS-1$
+	
 	/** IElementType for UML ProtocolStateMachine */
-	public static final IHintedType PROTOCOL_STATE_MACHINE = (IHintedType)getElementType("org.eclipse.papyrus.uml.ProtocolStateMachine");
-
+	public static final IHintedType PROTOCOL_STATE_MACHINE = (IHintedType)getElementType("org.eclipse.papyrus.uml.ProtocolStateMachine"); //$NON-NLS-1$
+	
 	/** IElementType for UML ProtocolTransition */
-	public static final IHintedType PROTOCOL_TRANSITION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ProtocolTransition");
-
+	public static final IHintedType PROTOCOL_TRANSITION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ProtocolTransition"); //$NON-NLS-1$
+	
 	/** IElementType for UML Pseudostate */
-	public static final IHintedType PSEUDOSTATE = (IHintedType)getElementType("org.eclipse.papyrus.uml.Pseudostate");
-
+	public static final IHintedType PSEUDOSTATE = (IHintedType)getElementType("org.eclipse.papyrus.uml.Pseudostate"); //$NON-NLS-1$
+	
 	/** IElementType for UML QualifierValue */
-	public static final IHintedType QUALIFIER_VALUE = (IHintedType)getElementType("org.eclipse.papyrus.uml.QualifierValue");
-
+	public static final IHintedType QUALIFIER_VALUE = (IHintedType)getElementType("org.eclipse.papyrus.uml.QualifierValue"); //$NON-NLS-1$
+	
 	/** IElementType for UML RaiseExceptionAction */
-	public static final IHintedType RAISE_EXCEPTION_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.RaiseExceptionAction");
-
+	public static final IHintedType RAISE_EXCEPTION_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.RaiseExceptionAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML ReadExtentAction */
-	public static final IHintedType READ_EXTENT_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ReadExtentAction");
-
+	public static final IHintedType READ_EXTENT_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ReadExtentAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML ReadIsClassifiedObjectAction */
-	public static final IHintedType READ_IS_CLASSIFIED_OBJECT_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ReadIsClassifiedObjectAction");
-
+	public static final IHintedType READ_IS_CLASSIFIED_OBJECT_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ReadIsClassifiedObjectAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML ReadLinkAction */
-	public static final IHintedType READ_LINK_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ReadLinkAction");
-
+	public static final IHintedType READ_LINK_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ReadLinkAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML ReadLinkObjectEndAction */
-	public static final IHintedType READ_LINK_OBJECT_END_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ReadLinkObjectEndAction");
-
+	public static final IHintedType READ_LINK_OBJECT_END_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ReadLinkObjectEndAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML ReadLinkObjectEndQualifierAction */
-	public static final IHintedType READ_LINK_OBJECT_END_QUALIFIER_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ReadLinkObjectEndQualifierAction");
-
+	public static final IHintedType READ_LINK_OBJECT_END_QUALIFIER_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ReadLinkObjectEndQualifierAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML ReadSelfAction */
-	public static final IHintedType READ_SELF_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ReadSelfAction");
-
+	public static final IHintedType READ_SELF_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ReadSelfAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML ReadStructuralFeatureAction */
-	public static final IHintedType READ_STRUCTURAL_FEATURE_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ReadStructuralFeatureAction");
-
+	public static final IHintedType READ_STRUCTURAL_FEATURE_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ReadStructuralFeatureAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML ReadVariableAction */
-	public static final IHintedType READ_VARIABLE_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ReadVariableAction");
-
+	public static final IHintedType READ_VARIABLE_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ReadVariableAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML Realization */
-	public static final IHintedType REALIZATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Realization");
-
+	public static final IHintedType REALIZATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Realization"); //$NON-NLS-1$
+	
 	/** IElementType for UML ReceiveOperationEvent */
-	public static final IHintedType RECEIVE_OPERATION_EVENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.ReceiveOperationEvent");
-
+	public static final IHintedType RECEIVE_OPERATION_EVENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.ReceiveOperationEvent"); //$NON-NLS-1$
+	
 	/** IElementType for UML ReceiveSignalEvent */
-	public static final IHintedType RECEIVE_SIGNAL_EVENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.ReceiveSignalEvent");
-
+	public static final IHintedType RECEIVE_SIGNAL_EVENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.ReceiveSignalEvent"); //$NON-NLS-1$
+	
 	/** IElementType for UML Reception */
-	public static final IHintedType RECEPTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Reception");
-
+	public static final IHintedType RECEPTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Reception"); //$NON-NLS-1$
+	
 	/** IElementType for UML ReclassifyObjectAction */
-	public static final IHintedType RECLASSIFY_OBJECT_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ReclassifyObjectAction");
-
+	public static final IHintedType RECLASSIFY_OBJECT_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ReclassifyObjectAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML RedefinableElement */
-	public static final IHintedType REDEFINABLE_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.RedefinableElement");
-
+	public static final IHintedType REDEFINABLE_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.RedefinableElement"); //$NON-NLS-1$
+	
 	/** IElementType for UML RedefinableTemplateSignature */
-	public static final IHintedType REDEFINABLE_TEMPLATE_SIGNATURE = (IHintedType)getElementType("org.eclipse.papyrus.uml.RedefinableTemplateSignature");
-
+	public static final IHintedType REDEFINABLE_TEMPLATE_SIGNATURE = (IHintedType)getElementType("org.eclipse.papyrus.uml.RedefinableTemplateSignature"); //$NON-NLS-1$
+	
 	/** IElementType for UML ReduceAction */
-	public static final IHintedType REDUCE_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ReduceAction");
-
+	public static final IHintedType REDUCE_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ReduceAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML Region */
-	public static final IHintedType REGION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Region");
-
+	public static final IHintedType REGION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Region"); //$NON-NLS-1$
+	
 	/** IElementType for UML Relationship */
-	public static final IHintedType RELATIONSHIP = (IHintedType)getElementType("org.eclipse.papyrus.uml.Relationship");
-
+	public static final IHintedType RELATIONSHIP = (IHintedType)getElementType("org.eclipse.papyrus.uml.Relationship"); //$NON-NLS-1$
+	
 	/** IElementType for UML RemoveStructuralFeatureValueAction */
-	public static final IHintedType REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.RemoveStructuralFeatureValueAction");
-
+	public static final IHintedType REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.RemoveStructuralFeatureValueAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML RemoveVariableValueAction */
-	public static final IHintedType REMOVE_VARIABLE_VALUE_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.RemoveVariableValueAction");
-
+	public static final IHintedType REMOVE_VARIABLE_VALUE_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.RemoveVariableValueAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML ReplyAction */
-	public static final IHintedType REPLY_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ReplyAction");
-
+	public static final IHintedType REPLY_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ReplyAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML SendObjectAction */
-	public static final IHintedType SEND_OBJECT_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.SendObjectAction");
-
+	public static final IHintedType SEND_OBJECT_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.SendObjectAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML SendOperationEvent */
-	public static final IHintedType SEND_OPERATION_EVENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.SendOperationEvent");
-
+	public static final IHintedType SEND_OPERATION_EVENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.SendOperationEvent"); //$NON-NLS-1$
+	
 	/** IElementType for UML SendSignalAction */
-	public static final IHintedType SEND_SIGNAL_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.SendSignalAction");
-
+	public static final IHintedType SEND_SIGNAL_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.SendSignalAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML SendSignalEvent */
-	public static final IHintedType SEND_SIGNAL_EVENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.SendSignalEvent");
-
+	public static final IHintedType SEND_SIGNAL_EVENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.SendSignalEvent"); //$NON-NLS-1$
+	
 	/** IElementType for UML SequenceNode */
-	public static final IHintedType SEQUENCE_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.SequenceNode");
-
+	public static final IHintedType SEQUENCE_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.SequenceNode"); //$NON-NLS-1$
+	
 	/** IElementType for UML Signal */
-	public static final IHintedType SIGNAL = (IHintedType)getElementType("org.eclipse.papyrus.uml.Signal");
-
+	public static final IHintedType SIGNAL = (IHintedType)getElementType("org.eclipse.papyrus.uml.Signal"); //$NON-NLS-1$
+	
 	/** IElementType for UML SignalEvent */
-	public static final IHintedType SIGNAL_EVENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.SignalEvent");
-
+	public static final IHintedType SIGNAL_EVENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.SignalEvent"); //$NON-NLS-1$
+	
 	/** IElementType for UML Slot */
-	public static final IHintedType SLOT = (IHintedType)getElementType("org.eclipse.papyrus.uml.Slot");
-
+	public static final IHintedType SLOT = (IHintedType)getElementType("org.eclipse.papyrus.uml.Slot"); //$NON-NLS-1$
+	
 	/** IElementType for UML StartClassifierBehaviorAction */
-	public static final IHintedType START_CLASSIFIER_BEHAVIOR_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.StartClassifierBehaviorAction");
-
+	public static final IHintedType START_CLASSIFIER_BEHAVIOR_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.StartClassifierBehaviorAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML StartObjectBehaviorAction */
-	public static final IHintedType START_OBJECT_BEHAVIOR_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.StartObjectBehaviorAction");
-
+	public static final IHintedType START_OBJECT_BEHAVIOR_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.StartObjectBehaviorAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML State */
-	public static final IHintedType STATE = (IHintedType)getElementType("org.eclipse.papyrus.uml.State");
-
+	public static final IHintedType STATE = (IHintedType)getElementType("org.eclipse.papyrus.uml.State"); //$NON-NLS-1$
+	
 	/** IElementType for UML StateInvariant */
-	public static final IHintedType STATE_INVARIANT = (IHintedType)getElementType("org.eclipse.papyrus.uml.StateInvariant");
-
+	public static final IHintedType STATE_INVARIANT = (IHintedType)getElementType("org.eclipse.papyrus.uml.StateInvariant"); //$NON-NLS-1$
+	
 	/** IElementType for UML StateMachine */
-	public static final IHintedType STATE_MACHINE = (IHintedType)getElementType("org.eclipse.papyrus.uml.StateMachine");
-
+	public static final IHintedType STATE_MACHINE = (IHintedType)getElementType("org.eclipse.papyrus.uml.StateMachine"); //$NON-NLS-1$
+	
 	/** IElementType for UML Stereotype */
-	public static final IHintedType STEREOTYPE = (IHintedType)getElementType("org.eclipse.papyrus.uml.Stereotype");
-
+	public static final IHintedType STEREOTYPE = (IHintedType)getElementType("org.eclipse.papyrus.uml.Stereotype"); //$NON-NLS-1$
+	
 	/** IElementType for UML StringExpression */
-	public static final IHintedType STRING_EXPRESSION = (IHintedType)getElementType("org.eclipse.papyrus.uml.StringExpression");
-
+	public static final IHintedType STRING_EXPRESSION = (IHintedType)getElementType("org.eclipse.papyrus.uml.StringExpression"); //$NON-NLS-1$
+	
 	/** IElementType for UML StructuralFeature */
-	public static final IHintedType STRUCTURAL_FEATURE = (IHintedType)getElementType("org.eclipse.papyrus.uml.StructuralFeature");
-
+	public static final IHintedType STRUCTURAL_FEATURE = (IHintedType)getElementType("org.eclipse.papyrus.uml.StructuralFeature"); //$NON-NLS-1$
+	
 	/** IElementType for UML StructuralFeatureAction */
-	public static final IHintedType STRUCTURAL_FEATURE_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.StructuralFeatureAction");
-
+	public static final IHintedType STRUCTURAL_FEATURE_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.StructuralFeatureAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML StructuredActivityNode */
-	public static final IHintedType STRUCTURED_ACTIVITY_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.StructuredActivityNode");
-
+	public static final IHintedType STRUCTURED_ACTIVITY_NODE = (IHintedType)getElementType("org.eclipse.papyrus.uml.StructuredActivityNode"); //$NON-NLS-1$
+	
 	/** IElementType for UML StructuredClassifier */
-	public static final IHintedType STRUCTURED_CLASSIFIER = (IHintedType)getElementType("org.eclipse.papyrus.uml.StructuredClassifier");
-
+	public static final IHintedType STRUCTURED_CLASSIFIER = (IHintedType)getElementType("org.eclipse.papyrus.uml.StructuredClassifier"); //$NON-NLS-1$
+	
 	/** IElementType for UML Substitution */
-	public static final IHintedType SUBSTITUTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Substitution");
-
-	/** IElementType for UML TemplateableElement */
-	public static final IHintedType TEMPLATEABLE_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.TemplateableElement");
-
+	public static final IHintedType SUBSTITUTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Substitution"); //$NON-NLS-1$
+	
 	/** IElementType for UML TemplateBinding */
-	public static final IHintedType TEMPLATE_BINDING = (IHintedType)getElementType("org.eclipse.papyrus.uml.TemplateBinding");
-
+	public static final IHintedType TEMPLATE_BINDING = (IHintedType)getElementType("org.eclipse.papyrus.uml.TemplateBinding"); //$NON-NLS-1$
+	
 	/** IElementType for UML TemplateParameter */
-	public static final IHintedType TEMPLATE_PARAMETER = (IHintedType)getElementType("org.eclipse.papyrus.uml.TemplateParameter");
-
+	public static final IHintedType TEMPLATE_PARAMETER = (IHintedType)getElementType("org.eclipse.papyrus.uml.TemplateParameter"); //$NON-NLS-1$
+	
 	/** IElementType for UML TemplateParameterSubstitution */
-	public static final IHintedType TEMPLATE_PARAMETER_SUBSTITUTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.TemplateParameterSubstitution");
-
+	public static final IHintedType TEMPLATE_PARAMETER_SUBSTITUTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.TemplateParameterSubstitution"); //$NON-NLS-1$
+	
 	/** IElementType for UML TemplateSignature */
-	public static final IHintedType TEMPLATE_SIGNATURE = (IHintedType)getElementType("org.eclipse.papyrus.uml.TemplateSignature");
-
+	public static final IHintedType TEMPLATE_SIGNATURE = (IHintedType)getElementType("org.eclipse.papyrus.uml.TemplateSignature"); //$NON-NLS-1$
+	
+	/** IElementType for UML TemplateableElement */
+	public static final IHintedType TEMPLATEABLE_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.TemplateableElement"); //$NON-NLS-1$
+	
 	/** IElementType for UML TestIdentityAction */
-	public static final IHintedType TEST_IDENTITY_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.TestIdentityAction");
-
+	public static final IHintedType TEST_IDENTITY_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.TestIdentityAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML TimeConstraint */
-	public static final IHintedType TIME_CONSTRAINT = (IHintedType)getElementType("org.eclipse.papyrus.uml.TimeConstraint");
-
+	public static final IHintedType TIME_CONSTRAINT = (IHintedType)getElementType("org.eclipse.papyrus.uml.TimeConstraint"); //$NON-NLS-1$
+	
 	/** IElementType for UML TimeEvent */
-	public static final IHintedType TIME_EVENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.TimeEvent");
-
+	public static final IHintedType TIME_EVENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.TimeEvent"); //$NON-NLS-1$
+	
 	/** IElementType for UML TimeExpression */
-	public static final IHintedType TIME_EXPRESSION = (IHintedType)getElementType("org.eclipse.papyrus.uml.TimeExpression");
-
+	public static final IHintedType TIME_EXPRESSION = (IHintedType)getElementType("org.eclipse.papyrus.uml.TimeExpression"); //$NON-NLS-1$
+	
 	/** IElementType for UML TimeInterval */
-	public static final IHintedType TIME_INTERVAL = (IHintedType)getElementType("org.eclipse.papyrus.uml.TimeInterval");
-
+	public static final IHintedType TIME_INTERVAL = (IHintedType)getElementType("org.eclipse.papyrus.uml.TimeInterval"); //$NON-NLS-1$
+	
 	/** IElementType for UML TimeObservation */
-	public static final IHintedType TIME_OBSERVATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.TimeObservation");
-
+	public static final IHintedType TIME_OBSERVATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.TimeObservation"); //$NON-NLS-1$
+	
 	/** IElementType for UML Transition */
-	public static final IHintedType TRANSITION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Transition");
-
+	public static final IHintedType TRANSITION = (IHintedType)getElementType("org.eclipse.papyrus.uml.Transition"); //$NON-NLS-1$
+	
 	/** IElementType for UML Trigger */
-	public static final IHintedType TRIGGER = (IHintedType)getElementType("org.eclipse.papyrus.uml.Trigger");
-
+	public static final IHintedType TRIGGER = (IHintedType)getElementType("org.eclipse.papyrus.uml.Trigger"); //$NON-NLS-1$
+	
 	/** IElementType for UML Type */
-	public static final IHintedType TYPE = (IHintedType)getElementType("org.eclipse.papyrus.uml.Type");
-
+	public static final IHintedType TYPE = (IHintedType)getElementType("org.eclipse.papyrus.uml.Type"); //$NON-NLS-1$
+	
 	/** IElementType for UML TypedElement */
-	public static final IHintedType TYPED_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.TypedElement");
-
+	public static final IHintedType TYPED_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.TypedElement"); //$NON-NLS-1$
+	
 	/** IElementType for UML UnmarshallAction */
-	public static final IHintedType UNMARSHALL_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.UnmarshallAction");
-
+	public static final IHintedType UNMARSHALL_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.UnmarshallAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML Usage */
-	public static final IHintedType USAGE = (IHintedType)getElementType("org.eclipse.papyrus.uml.Usage");
-
+	public static final IHintedType USAGE = (IHintedType)getElementType("org.eclipse.papyrus.uml.Usage"); //$NON-NLS-1$
+	
 	/** IElementType for UML UseCase */
-	public static final IHintedType USE_CASE = (IHintedType)getElementType("org.eclipse.papyrus.uml.UseCase");
-
+	public static final IHintedType USE_CASE = (IHintedType)getElementType("org.eclipse.papyrus.uml.UseCase"); //$NON-NLS-1$
+	
 	/** IElementType for UML ValuePin */
-	public static final IHintedType VALUE_PIN = (IHintedType)getElementType("org.eclipse.papyrus.uml.ValuePin");
-
+	public static final IHintedType VALUE_PIN = (IHintedType)getElementType("org.eclipse.papyrus.uml.ValuePin"); //$NON-NLS-1$
+	
 	/** IElementType for UML ValueSpecification */
-	public static final IHintedType VALUE_SPECIFICATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ValueSpecification");
-
+	public static final IHintedType VALUE_SPECIFICATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ValueSpecification"); //$NON-NLS-1$
+	
 	/** IElementType for UML ValueSpecificationAction */
-	public static final IHintedType VALUE_SPECIFICATION_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ValueSpecificationAction");
-
+	public static final IHintedType VALUE_SPECIFICATION_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.ValueSpecificationAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML Variable */
-	public static final IHintedType VARIABLE = (IHintedType)getElementType("org.eclipse.papyrus.uml.Variable");
-
+	public static final IHintedType VARIABLE = (IHintedType)getElementType("org.eclipse.papyrus.uml.Variable"); //$NON-NLS-1$
+	
 	/** IElementType for UML VariableAction */
-	public static final IHintedType VARIABLE_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.VariableAction");
-
+	public static final IHintedType VARIABLE_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.VariableAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML Vertex */
-	public static final IHintedType VERTEX = (IHintedType)getElementType("org.eclipse.papyrus.uml.Vertex");
-
+	public static final IHintedType VERTEX = (IHintedType)getElementType("org.eclipse.papyrus.uml.Vertex"); //$NON-NLS-1$
+	
 	/** IElementType for UML WriteLinkAction */
-	public static final IHintedType WRITE_LINK_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.WriteLinkAction");
-
+	public static final IHintedType WRITE_LINK_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.WriteLinkAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML WriteStructuralFeatureAction */
-	public static final IHintedType WRITE_STRUCTURAL_FEATURE_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.WriteStructuralFeatureAction");
-
+	public static final IHintedType WRITE_STRUCTURAL_FEATURE_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.WriteStructuralFeatureAction"); //$NON-NLS-1$
+	
 	/** IElementType for UML WriteVariableAction */
-	public static final IHintedType WRITE_VARIABLE_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.WriteVariableAction");
-
+	public static final IHintedType WRITE_VARIABLE_ACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.WriteVariableAction"); //$NON-NLS-1$
+	
 }
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/xmlElementTypes.xml b/plugins/uml/org.eclipse.papyrus.uml.service.types/xmlElementTypes.xml
index 6fc5b3655e2..b83de051a26 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/xmlElementTypes.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/xmlElementTypes.xml
@@ -1,1748 +1,2116 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <plugin>
-	
+
+<!-- UML ElementTypes declarations -->
 <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
 
 	<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
 	
 	<!-- Declaration of IElementTypes -->
 	
-	<!-- IElementTypes for Abstraction -->
-	<metamodelType eclass="Abstraction" id="org.eclipse.papyrus.uml.Abstraction"
+	<!-- IMetamodelType for Abstraction -->
+	<metamodelType id="org.eclipse.papyrus.uml.Abstraction" name="UML::Abstraction"
+		eclass="Abstraction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Abstraction">
-		<param name="semanticHint" value="UML::Abstraction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Abstraction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for AcceptCallAction -->
-	<metamodelType eclass="AcceptCallAction" id="org.eclipse.papyrus.uml.AcceptCallAction"
+	<!-- IMetamodelType for AcceptCallAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.AcceptCallAction" name="UML::AcceptCallAction"
+		eclass="AcceptCallAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::AcceptCallAction">
-		<param name="semanticHint" value="UML::AcceptCallAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::AcceptCallAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for AcceptEventAction -->
-	<metamodelType eclass="AcceptEventAction" id="org.eclipse.papyrus.uml.AcceptEventAction"
+	<!-- IMetamodelType for AcceptEventAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.AcceptEventAction" name="UML::AcceptEventAction"
+		eclass="AcceptEventAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::AcceptEventAction">
-		<param name="semanticHint" value="UML::AcceptEventAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::AcceptEventAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Action -->
-	<metamodelType eclass="Action" id="org.eclipse.papyrus.uml.Action"
+	<!-- IMetamodelType for Action -->
+	<metamodelType id="org.eclipse.papyrus.uml.Action" name="UML::Action"
+		eclass="Action" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Action">
-		<param name="semanticHint" value="UML::Action"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Action"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ActionExecutionSpecification -->
-	<metamodelType eclass="ActionExecutionSpecification" id="org.eclipse.papyrus.uml.ActionExecutionSpecification"
+	<!-- IMetamodelType for ActionExecutionSpecification -->
+	<metamodelType id="org.eclipse.papyrus.uml.ActionExecutionSpecification" name="UML::ActionExecutionSpecification"
+		eclass="ActionExecutionSpecification" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ActionExecutionSpecification">
-		<param name="semanticHint" value="UML::ActionExecutionSpecification"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ActionExecutionSpecification"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ActionInputPin -->
-	<metamodelType eclass="ActionInputPin" id="org.eclipse.papyrus.uml.ActionInputPin"
+	<!-- IMetamodelType for ActionInputPin -->
+	<metamodelType id="org.eclipse.papyrus.uml.ActionInputPin" name="UML::ActionInputPin"
+		eclass="ActionInputPin" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ActionInputPin">
-		<param name="semanticHint" value="UML::ActionInputPin"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ActionInputPin"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Activity -->
-	<metamodelType eclass="Activity" id="org.eclipse.papyrus.uml.Activity"
+	<!-- IMetamodelType for Activity -->
+	<metamodelType id="org.eclipse.papyrus.uml.Activity" name="UML::Activity"
+		eclass="Activity" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Activity">
-		<param name="semanticHint" value="UML::Activity"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Activity"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ActivityEdge -->
-	<metamodelType eclass="ActivityEdge" id="org.eclipse.papyrus.uml.ActivityEdge"
+	<!-- IMetamodelType for ActivityEdge -->
+	<metamodelType id="org.eclipse.papyrus.uml.ActivityEdge" name="UML::ActivityEdge"
+		eclass="ActivityEdge" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ActivityEdge">
-		<param name="semanticHint" value="UML::ActivityEdge"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ActivityEdge"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ActivityFinalNode -->
-	<metamodelType eclass="ActivityFinalNode" id="org.eclipse.papyrus.uml.ActivityFinalNode"
+	<!-- IMetamodelType for ActivityFinalNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.ActivityFinalNode" name="UML::ActivityFinalNode"
+		eclass="ActivityFinalNode" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ActivityFinalNode">
-		<param name="semanticHint" value="UML::ActivityFinalNode"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ActivityFinalNode"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ActivityGroup -->
-	<metamodelType eclass="ActivityGroup" id="org.eclipse.papyrus.uml.ActivityGroup"
+	<!-- IMetamodelType for ActivityGroup -->
+	<metamodelType id="org.eclipse.papyrus.uml.ActivityGroup" name="UML::ActivityGroup"
+		eclass="ActivityGroup" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ActivityGroup">
-		<param name="semanticHint" value="UML::ActivityGroup"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ActivityGroup"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ActivityNode -->
-	<metamodelType eclass="ActivityNode" id="org.eclipse.papyrus.uml.ActivityNode"
+	<!-- IMetamodelType for ActivityNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.ActivityNode" name="UML::ActivityNode"
+		eclass="ActivityNode" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ActivityNode">
-		<param name="semanticHint" value="UML::ActivityNode"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ActivityNode"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ActivityParameterNode -->
-	<metamodelType eclass="ActivityParameterNode" id="org.eclipse.papyrus.uml.ActivityParameterNode"
+	<!-- IMetamodelType for ActivityParameterNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.ActivityParameterNode" name="UML::ActivityParameterNode"
+		eclass="ActivityParameterNode" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ActivityParameterNode">
-		<param name="semanticHint" value="UML::ActivityParameterNode"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ActivityParameterNode"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ActivityPartition -->
-	<metamodelType eclass="ActivityPartition" id="org.eclipse.papyrus.uml.ActivityPartition"
+	<!-- IMetamodelType for ActivityPartition -->
+	<metamodelType id="org.eclipse.papyrus.uml.ActivityPartition" name="UML::ActivityPartition"
+		eclass="ActivityPartition" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ActivityPartition">
-		<param name="semanticHint" value="UML::ActivityPartition"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ActivityPartition"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Actor -->
-	<metamodelType eclass="Actor" id="org.eclipse.papyrus.uml.Actor"
+	<!-- IMetamodelType for Actor -->
+	<metamodelType id="org.eclipse.papyrus.uml.Actor" name="UML::Actor"
+		eclass="Actor" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Actor">
-		<param name="semanticHint" value="UML::Actor"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Actor"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for AddStructuralFeatureValueAction -->
-	<metamodelType eclass="AddStructuralFeatureValueAction" id="org.eclipse.papyrus.uml.AddStructuralFeatureValueAction"
+	<!-- IMetamodelType for AddStructuralFeatureValueAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.AddStructuralFeatureValueAction" name="UML::AddStructuralFeatureValueAction"
+		eclass="AddStructuralFeatureValueAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::AddStructuralFeatureValueAction">
-		<param name="semanticHint" value="UML::AddStructuralFeatureValueAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::AddStructuralFeatureValueAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for AddVariableValueAction -->
-	<metamodelType eclass="AddVariableValueAction" id="org.eclipse.papyrus.uml.AddVariableValueAction"
+	<!-- IMetamodelType for AddVariableValueAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.AddVariableValueAction" name="UML::AddVariableValueAction"
+		eclass="AddVariableValueAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::AddVariableValueAction">
-		<param name="semanticHint" value="UML::AddVariableValueAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::AddVariableValueAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for AnyReceiveEvent -->
-	<metamodelType eclass="AnyReceiveEvent" id="org.eclipse.papyrus.uml.AnyReceiveEvent"
+	<!-- IMetamodelType for AnyReceiveEvent -->
+	<metamodelType id="org.eclipse.papyrus.uml.AnyReceiveEvent" name="UML::AnyReceiveEvent"
+		eclass="AnyReceiveEvent" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::AnyReceiveEvent">
-		<param name="semanticHint" value="UML::AnyReceiveEvent"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::AnyReceiveEvent"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Artifact -->
-	<metamodelType eclass="Artifact" id="org.eclipse.papyrus.uml.Artifact"
+	<!-- IMetamodelType for Artifact -->
+	<metamodelType id="org.eclipse.papyrus.uml.Artifact" name="UML::Artifact"
+		eclass="Artifact" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Artifact">
-		<param name="semanticHint" value="UML::Artifact"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Artifact"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Association -->
-	<metamodelType eclass="Association" id="org.eclipse.papyrus.uml.Association"
+	<!-- IMetamodelType for Association -->
+	<metamodelType id="org.eclipse.papyrus.uml.Association" name="UML::Association"
+		eclass="Association" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Association">
-		<param name="semanticHint" value="UML::Association"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Association"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for AssociationClass -->
-	<metamodelType eclass="AssociationClass" id="org.eclipse.papyrus.uml.AssociationClass"
+	<!-- IMetamodelType for AssociationClass -->
+	<metamodelType id="org.eclipse.papyrus.uml.AssociationClass" name="UML::AssociationClass"
+		eclass="AssociationClass" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::AssociationClass">
-		<param name="semanticHint" value="UML::AssociationClass"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::AssociationClass"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Behavior -->
-	<metamodelType eclass="Behavior" id="org.eclipse.papyrus.uml.Behavior"
+	<!-- IMetamodelType for Behavior -->
+	<metamodelType id="org.eclipse.papyrus.uml.Behavior" name="UML::Behavior"
+		eclass="Behavior" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Behavior">
-		<param name="semanticHint" value="UML::Behavior"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Behavior"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for BehavioralFeature -->
-	<metamodelType eclass="BehavioralFeature" id="org.eclipse.papyrus.uml.BehavioralFeature"
+	<!-- IMetamodelType for BehaviorExecutionSpecification -->
+	<metamodelType id="org.eclipse.papyrus.uml.BehaviorExecutionSpecification" name="UML::BehaviorExecutionSpecification"
+		eclass="BehaviorExecutionSpecification" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::BehavioralFeature">
-		<param name="semanticHint" value="UML::BehavioralFeature"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::BehaviorExecutionSpecification"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for BehavioredClassifier -->
-	<metamodelType eclass="BehavioredClassifier" id="org.eclipse.papyrus.uml.BehavioredClassifier"
+	<!-- IMetamodelType for BehavioralFeature -->
+	<metamodelType id="org.eclipse.papyrus.uml.BehavioralFeature" name="UML::BehavioralFeature"
+		eclass="BehavioralFeature" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::BehavioredClassifier">
-		<param name="semanticHint" value="UML::BehavioredClassifier"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::BehavioralFeature"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for BehaviorExecutionSpecification -->
-	<metamodelType eclass="BehaviorExecutionSpecification" id="org.eclipse.papyrus.uml.BehaviorExecutionSpecification"
+	<!-- IMetamodelType for BehavioredClassifier -->
+	<metamodelType id="org.eclipse.papyrus.uml.BehavioredClassifier" name="UML::BehavioredClassifier"
+		eclass="BehavioredClassifier" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::BehaviorExecutionSpecification">
-		<param name="semanticHint" value="UML::BehaviorExecutionSpecification"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::BehavioredClassifier"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for BroadcastSignalAction -->
-	<metamodelType eclass="BroadcastSignalAction" id="org.eclipse.papyrus.uml.BroadcastSignalAction"
+	<!-- IMetamodelType for BroadcastSignalAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.BroadcastSignalAction" name="UML::BroadcastSignalAction"
+		eclass="BroadcastSignalAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::BroadcastSignalAction">
-		<param name="semanticHint" value="UML::BroadcastSignalAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::BroadcastSignalAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for CallAction -->
-	<metamodelType eclass="CallAction" id="org.eclipse.papyrus.uml.CallAction"
+	<!-- IMetamodelType for CallAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.CallAction" name="UML::CallAction"
+		eclass="CallAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::CallAction">
-		<param name="semanticHint" value="UML::CallAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::CallAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for CallBehaviorAction -->
-	<metamodelType eclass="CallBehaviorAction" id="org.eclipse.papyrus.uml.CallBehaviorAction"
+	<!-- IMetamodelType for CallBehaviorAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.CallBehaviorAction" name="UML::CallBehaviorAction"
+		eclass="CallBehaviorAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::CallBehaviorAction">
-		<param name="semanticHint" value="UML::CallBehaviorAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::CallBehaviorAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for CallEvent -->
-	<metamodelType eclass="CallEvent" id="org.eclipse.papyrus.uml.CallEvent"
+	<!-- IMetamodelType for CallEvent -->
+	<metamodelType id="org.eclipse.papyrus.uml.CallEvent" name="UML::CallEvent"
+		eclass="CallEvent" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::CallEvent">
-		<param name="semanticHint" value="UML::CallEvent"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::CallEvent"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for CallOperationAction -->
-	<metamodelType eclass="CallOperationAction" id="org.eclipse.papyrus.uml.CallOperationAction"
+	<!-- IMetamodelType for CallOperationAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.CallOperationAction" name="UML::CallOperationAction"
+		eclass="CallOperationAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::CallOperationAction">
-		<param name="semanticHint" value="UML::CallOperationAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::CallOperationAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for CentralBufferNode -->
-	<metamodelType eclass="CentralBufferNode" id="org.eclipse.papyrus.uml.CentralBufferNode"
+	<!-- IMetamodelType for CentralBufferNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.CentralBufferNode" name="UML::CentralBufferNode"
+		eclass="CentralBufferNode" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::CentralBufferNode">
-		<param name="semanticHint" value="UML::CentralBufferNode"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::CentralBufferNode"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ChangeEvent -->
-	<metamodelType eclass="ChangeEvent" id="org.eclipse.papyrus.uml.ChangeEvent"
+	<!-- IMetamodelType for ChangeEvent -->
+	<metamodelType id="org.eclipse.papyrus.uml.ChangeEvent" name="UML::ChangeEvent"
+		eclass="ChangeEvent" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ChangeEvent">
-		<param name="semanticHint" value="UML::ChangeEvent"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ChangeEvent"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Class -->
-	<metamodelType eclass="Class" id="org.eclipse.papyrus.uml.Class"
+	<!-- IMetamodelType for Class -->
+	<metamodelType id="org.eclipse.papyrus.uml.Class" name="UML::Class"
+		eclass="Class" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Class">
-		<param name="semanticHint" value="UML::Class"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Class"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Classifier -->
-	<metamodelType eclass="Classifier" id="org.eclipse.papyrus.uml.Classifier"
+	<!-- IMetamodelType for Classifier -->
+	<metamodelType id="org.eclipse.papyrus.uml.Classifier" name="UML::Classifier"
+		eclass="Classifier" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Classifier">
-		<param name="semanticHint" value="UML::Classifier"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Classifier"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ClassifierTemplateParameter -->
-	<metamodelType eclass="ClassifierTemplateParameter" id="org.eclipse.papyrus.uml.ClassifierTemplateParameter"
+	<!-- IMetamodelType for ClassifierTemplateParameter -->
+	<metamodelType id="org.eclipse.papyrus.uml.ClassifierTemplateParameter" name="UML::ClassifierTemplateParameter"
+		eclass="ClassifierTemplateParameter" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ClassifierTemplateParameter">
-		<param name="semanticHint" value="UML::ClassifierTemplateParameter"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ClassifierTemplateParameter"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Clause -->
-	<metamodelType eclass="Clause" id="org.eclipse.papyrus.uml.Clause"
+	<!-- IMetamodelType for Clause -->
+	<metamodelType id="org.eclipse.papyrus.uml.Clause" name="UML::Clause"
+		eclass="Clause" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Clause">
-		<param name="semanticHint" value="UML::Clause"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Clause"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ClearAssociationAction -->
-	<metamodelType eclass="ClearAssociationAction" id="org.eclipse.papyrus.uml.ClearAssociationAction"
+	<!-- IMetamodelType for ClearAssociationAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.ClearAssociationAction" name="UML::ClearAssociationAction"
+		eclass="ClearAssociationAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ClearAssociationAction">
-		<param name="semanticHint" value="UML::ClearAssociationAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ClearAssociationAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ClearStructuralFeatureAction -->
-	<metamodelType eclass="ClearStructuralFeatureAction" id="org.eclipse.papyrus.uml.ClearStructuralFeatureAction"
+	<!-- IMetamodelType for ClearStructuralFeatureAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.ClearStructuralFeatureAction" name="UML::ClearStructuralFeatureAction"
+		eclass="ClearStructuralFeatureAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ClearStructuralFeatureAction">
-		<param name="semanticHint" value="UML::ClearStructuralFeatureAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ClearStructuralFeatureAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ClearVariableAction -->
-	<metamodelType eclass="ClearVariableAction" id="org.eclipse.papyrus.uml.ClearVariableAction"
+	<!-- IMetamodelType for ClearVariableAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.ClearVariableAction" name="UML::ClearVariableAction"
+		eclass="ClearVariableAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ClearVariableAction">
-		<param name="semanticHint" value="UML::ClearVariableAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ClearVariableAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Collaboration -->
-	<metamodelType eclass="Collaboration" id="org.eclipse.papyrus.uml.Collaboration"
+	<!-- IMetamodelType for Collaboration -->
+	<metamodelType id="org.eclipse.papyrus.uml.Collaboration" name="UML::Collaboration"
+		eclass="Collaboration" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Collaboration">
-		<param name="semanticHint" value="UML::Collaboration"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Collaboration"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for CollaborationUse -->
-	<metamodelType eclass="CollaborationUse" id="org.eclipse.papyrus.uml.CollaborationUse"
+	<!-- IMetamodelType for CollaborationUse -->
+	<metamodelType id="org.eclipse.papyrus.uml.CollaborationUse" name="UML::CollaborationUse"
+		eclass="CollaborationUse" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::CollaborationUse">
-		<param name="semanticHint" value="UML::CollaborationUse"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::CollaborationUse"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for CombinedFragment -->
-	<metamodelType eclass="CombinedFragment" id="org.eclipse.papyrus.uml.CombinedFragment"
+	<!-- IMetamodelType for CombinedFragment -->
+	<metamodelType id="org.eclipse.papyrus.uml.CombinedFragment" name="UML::CombinedFragment"
+		eclass="CombinedFragment" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::CombinedFragment">
-		<param name="semanticHint" value="UML::CombinedFragment"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::CombinedFragment"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Comment -->
-	<metamodelType eclass="Comment" id="org.eclipse.papyrus.uml.Comment"
+	<!-- IMetamodelType for Comment -->
+	<metamodelType id="org.eclipse.papyrus.uml.Comment" name="UML::Comment"
+		eclass="Comment" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Comment">
-		<param name="semanticHint" value="UML::Comment"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Comment"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for CommunicationPath -->
-	<metamodelType eclass="CommunicationPath" id="org.eclipse.papyrus.uml.CommunicationPath"
+	<!-- IMetamodelType for CommunicationPath -->
+	<metamodelType id="org.eclipse.papyrus.uml.CommunicationPath" name="UML::CommunicationPath"
+		eclass="CommunicationPath" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::CommunicationPath">
-		<param name="semanticHint" value="UML::CommunicationPath"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::CommunicationPath"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Component -->
-	<metamodelType eclass="Component" id="org.eclipse.papyrus.uml.Component"
+	<!-- IMetamodelType for Component -->
+	<metamodelType id="org.eclipse.papyrus.uml.Component" name="UML::Component"
+		eclass="Component" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Component">
-		<param name="semanticHint" value="UML::Component"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Component"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ComponentRealization -->
-	<metamodelType eclass="ComponentRealization" id="org.eclipse.papyrus.uml.ComponentRealization"
+	<!-- IMetamodelType for ComponentRealization -->
+	<metamodelType id="org.eclipse.papyrus.uml.ComponentRealization" name="UML::ComponentRealization"
+		eclass="ComponentRealization" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ComponentRealization">
-		<param name="semanticHint" value="UML::ComponentRealization"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ComponentRealization"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ConditionalNode -->
-	<metamodelType eclass="ConditionalNode" id="org.eclipse.papyrus.uml.ConditionalNode"
+	<!-- IMetamodelType for ConditionalNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.ConditionalNode" name="UML::ConditionalNode"
+		eclass="ConditionalNode" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ConditionalNode">
-		<param name="semanticHint" value="UML::ConditionalNode"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ConditionalNode"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ConnectableElement -->
-	<metamodelType eclass="ConnectableElement" id="org.eclipse.papyrus.uml.ConnectableElement"
+	<!-- IMetamodelType for ConnectableElement -->
+	<metamodelType id="org.eclipse.papyrus.uml.ConnectableElement" name="UML::ConnectableElement"
+		eclass="ConnectableElement" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ConnectableElement">
-		<param name="semanticHint" value="UML::ConnectableElement"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ConnectableElement"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ConnectableElementTemplateParameter -->
-	<metamodelType eclass="ConnectableElementTemplateParameter" id="org.eclipse.papyrus.uml.ConnectableElementTemplateParameter"
+	<!-- IMetamodelType for ConnectableElementTemplateParameter -->
+	<metamodelType id="org.eclipse.papyrus.uml.ConnectableElementTemplateParameter" name="UML::ConnectableElementTemplateParameter"
+		eclass="ConnectableElementTemplateParameter" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ConnectableElementTemplateParameter">
-		<param name="semanticHint" value="UML::ConnectableElementTemplateParameter"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ConnectableElementTemplateParameter"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ConnectionPointReference -->
-	<metamodelType eclass="ConnectionPointReference" id="org.eclipse.papyrus.uml.ConnectionPointReference"
+	<!-- IMetamodelType for ConnectionPointReference -->
+	<metamodelType id="org.eclipse.papyrus.uml.ConnectionPointReference" name="UML::ConnectionPointReference"
+		eclass="ConnectionPointReference" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ConnectionPointReference">
-		<param name="semanticHint" value="UML::ConnectionPointReference"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ConnectionPointReference"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Connector -->
-	<metamodelType eclass="Connector" id="org.eclipse.papyrus.uml.Connector"
+	<!-- IMetamodelType for Connector -->
+	<metamodelType id="org.eclipse.papyrus.uml.Connector" name="UML::Connector"
+		eclass="Connector" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Connector">
-		<param name="semanticHint" value="UML::Connector"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Connector"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ConnectorEnd -->
-	<metamodelType eclass="ConnectorEnd" id="org.eclipse.papyrus.uml.ConnectorEnd"
+	<!-- IMetamodelType for ConnectorEnd -->
+	<metamodelType id="org.eclipse.papyrus.uml.ConnectorEnd" name="UML::ConnectorEnd"
+		eclass="ConnectorEnd" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ConnectorEnd">
-		<param name="semanticHint" value="UML::ConnectorEnd"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ConnectorEnd"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ConsiderIgnoreFragment -->
-	<metamodelType eclass="ConsiderIgnoreFragment" id="org.eclipse.papyrus.uml.ConsiderIgnoreFragment"
+	<!-- IMetamodelType for ConsiderIgnoreFragment -->
+	<metamodelType id="org.eclipse.papyrus.uml.ConsiderIgnoreFragment" name="UML::ConsiderIgnoreFragment"
+		eclass="ConsiderIgnoreFragment" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ConsiderIgnoreFragment">
-		<param name="semanticHint" value="UML::ConsiderIgnoreFragment"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ConsiderIgnoreFragment"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Constraint -->
-	<metamodelType eclass="Constraint" id="org.eclipse.papyrus.uml.Constraint"
+	<!-- IMetamodelType for Constraint -->
+	<metamodelType id="org.eclipse.papyrus.uml.Constraint" name="UML::Constraint"
+		eclass="Constraint" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Constraint">
-		<param name="semanticHint" value="UML::Constraint"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Constraint"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Continuation -->
-	<metamodelType eclass="Continuation" id="org.eclipse.papyrus.uml.Continuation"
+	<!-- IMetamodelType for Continuation -->
+	<metamodelType id="org.eclipse.papyrus.uml.Continuation" name="UML::Continuation"
+		eclass="Continuation" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Continuation">
-		<param name="semanticHint" value="UML::Continuation"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Continuation"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ControlFlow -->
-	<metamodelType eclass="ControlFlow" id="org.eclipse.papyrus.uml.ControlFlow"
+	<!-- IMetamodelType for ControlFlow -->
+	<metamodelType id="org.eclipse.papyrus.uml.ControlFlow" name="UML::ControlFlow"
+		eclass="ControlFlow" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ControlFlow">
-		<param name="semanticHint" value="UML::ControlFlow"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ControlFlow"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ControlNode -->
-	<metamodelType eclass="ControlNode" id="org.eclipse.papyrus.uml.ControlNode"
+	<!-- IMetamodelType for ControlNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.ControlNode" name="UML::ControlNode"
+		eclass="ControlNode" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ControlNode">
-		<param name="semanticHint" value="UML::ControlNode"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ControlNode"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for CreateLinkAction -->
-	<metamodelType eclass="CreateLinkAction" id="org.eclipse.papyrus.uml.CreateLinkAction"
+	<!-- IMetamodelType for CreateLinkAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.CreateLinkAction" name="UML::CreateLinkAction"
+		eclass="CreateLinkAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::CreateLinkAction">
-		<param name="semanticHint" value="UML::CreateLinkAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::CreateLinkAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for CreateLinkObjectAction -->
-	<metamodelType eclass="CreateLinkObjectAction" id="org.eclipse.papyrus.uml.CreateLinkObjectAction"
+	<!-- IMetamodelType for CreateLinkObjectAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.CreateLinkObjectAction" name="UML::CreateLinkObjectAction"
+		eclass="CreateLinkObjectAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::CreateLinkObjectAction">
-		<param name="semanticHint" value="UML::CreateLinkObjectAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::CreateLinkObjectAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for CreateObjectAction -->
-	<metamodelType eclass="CreateObjectAction" id="org.eclipse.papyrus.uml.CreateObjectAction"
+	<!-- IMetamodelType for CreateObjectAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.CreateObjectAction" name="UML::CreateObjectAction"
+		eclass="CreateObjectAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::CreateObjectAction">
-		<param name="semanticHint" value="UML::CreateObjectAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::CreateObjectAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for CreationEvent -->
-	<metamodelType eclass="CreationEvent" id="org.eclipse.papyrus.uml.CreationEvent"
+	<!-- IMetamodelType for CreationEvent -->
+	<metamodelType id="org.eclipse.papyrus.uml.CreationEvent" name="UML::CreationEvent"
+		eclass="CreationEvent" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::CreationEvent">
-		<param name="semanticHint" value="UML::CreationEvent"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::CreationEvent"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for DataStoreNode -->
-	<metamodelType eclass="DataStoreNode" id="org.eclipse.papyrus.uml.DataStoreNode"
+	<!-- IMetamodelType for DataStoreNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.DataStoreNode" name="UML::DataStoreNode"
+		eclass="DataStoreNode" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::DataStoreNode">
-		<param name="semanticHint" value="UML::DataStoreNode"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::DataStoreNode"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for DataType -->
-	<metamodelType eclass="DataType" id="org.eclipse.papyrus.uml.DataType"
+	<!-- IMetamodelType for DataType -->
+	<metamodelType id="org.eclipse.papyrus.uml.DataType" name="UML::DataType"
+		eclass="DataType" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::DataType">
-		<param name="semanticHint" value="UML::DataType"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::DataType"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for DecisionNode -->
-	<metamodelType eclass="DecisionNode" id="org.eclipse.papyrus.uml.DecisionNode"
+	<!-- IMetamodelType for DecisionNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.DecisionNode" name="UML::DecisionNode"
+		eclass="DecisionNode" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::DecisionNode">
-		<param name="semanticHint" value="UML::DecisionNode"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::DecisionNode"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Dependency -->
-	<metamodelType eclass="Dependency" id="org.eclipse.papyrus.uml.Dependency"
+	<!-- IMetamodelType for Dependency -->
+	<metamodelType id="org.eclipse.papyrus.uml.Dependency" name="UML::Dependency"
+		eclass="Dependency" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DependencyEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Dependency">
-		<param name="semanticHint" value="UML::Dependency"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Dependency"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for DeployedArtifact -->
-	<metamodelType eclass="DeployedArtifact" id="org.eclipse.papyrus.uml.DeployedArtifact"
+	<!-- IMetamodelType for DeployedArtifact -->
+	<metamodelType id="org.eclipse.papyrus.uml.DeployedArtifact" name="UML::DeployedArtifact"
+		eclass="DeployedArtifact" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::DeployedArtifact">
-		<param name="semanticHint" value="UML::DeployedArtifact"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::DeployedArtifact"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Deployment -->
-	<metamodelType eclass="Deployment" id="org.eclipse.papyrus.uml.Deployment"
+	<!-- IMetamodelType for Deployment -->
+	<metamodelType id="org.eclipse.papyrus.uml.Deployment" name="UML::Deployment"
+		eclass="Deployment" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Deployment">
-		<param name="semanticHint" value="UML::Deployment"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Deployment"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for DeploymentSpecification -->
-	<metamodelType eclass="DeploymentSpecification" id="org.eclipse.papyrus.uml.DeploymentSpecification"
+	<!-- IMetamodelType for DeploymentSpecification -->
+	<metamodelType id="org.eclipse.papyrus.uml.DeploymentSpecification" name="UML::DeploymentSpecification"
+		eclass="DeploymentSpecification" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::DeploymentSpecification">
-		<param name="semanticHint" value="UML::DeploymentSpecification"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::DeploymentSpecification"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for DeploymentTarget -->
-	<metamodelType eclass="DeploymentTarget" id="org.eclipse.papyrus.uml.DeploymentTarget"
+	<!-- IMetamodelType for DeploymentTarget -->
+	<metamodelType id="org.eclipse.papyrus.uml.DeploymentTarget" name="UML::DeploymentTarget"
+		eclass="DeploymentTarget" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::DeploymentTarget">
-		<param name="semanticHint" value="UML::DeploymentTarget"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::DeploymentTarget"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for DestroyLinkAction -->
-	<metamodelType eclass="DestroyLinkAction" id="org.eclipse.papyrus.uml.DestroyLinkAction"
+	<!-- IMetamodelType for DestroyLinkAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.DestroyLinkAction" name="UML::DestroyLinkAction"
+		eclass="DestroyLinkAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::DestroyLinkAction">
-		<param name="semanticHint" value="UML::DestroyLinkAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::DestroyLinkAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for DestroyObjectAction -->
-	<metamodelType eclass="DestroyObjectAction" id="org.eclipse.papyrus.uml.DestroyObjectAction"
+	<!-- IMetamodelType for DestroyObjectAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.DestroyObjectAction" name="UML::DestroyObjectAction"
+		eclass="DestroyObjectAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::DestroyObjectAction">
-		<param name="semanticHint" value="UML::DestroyObjectAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::DestroyObjectAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for DestructionEvent -->
-	<metamodelType eclass="DestructionEvent" id="org.eclipse.papyrus.uml.DestructionEvent"
+	<!-- IMetamodelType for DestructionEvent -->
+	<metamodelType id="org.eclipse.papyrus.uml.DestructionEvent" name="UML::DestructionEvent"
+		eclass="DestructionEvent" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::DestructionEvent">
-		<param name="semanticHint" value="UML::DestructionEvent"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::DestructionEvent"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Device -->
-	<metamodelType eclass="Device" id="org.eclipse.papyrus.uml.Device"
+	<!-- IMetamodelType for Device -->
+	<metamodelType id="org.eclipse.papyrus.uml.Device" name="UML::Device"
+		eclass="Device" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Device">
-		<param name="semanticHint" value="UML::Device"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Device"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for DirectedRelationship -->
-	<metamodelType eclass="DirectedRelationship" id="org.eclipse.papyrus.uml.DirectedRelationship"
+	<!-- IMetamodelType for DirectedRelationship -->
+	<metamodelType id="org.eclipse.papyrus.uml.DirectedRelationship" name="UML::DirectedRelationship"
+		eclass="DirectedRelationship" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::DirectedRelationship">
-		<param name="semanticHint" value="UML::DirectedRelationship"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::DirectedRelationship"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Duration -->
-	<metamodelType eclass="Duration" id="org.eclipse.papyrus.uml.Duration"
+	<!-- IMetamodelType for Duration -->
+	<metamodelType id="org.eclipse.papyrus.uml.Duration" name="UML::Duration"
+		eclass="Duration" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Duration">
-		<param name="semanticHint" value="UML::Duration"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Duration"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for DurationConstraint -->
-	<metamodelType eclass="DurationConstraint" id="org.eclipse.papyrus.uml.DurationConstraint"
+	<!-- IMetamodelType for DurationConstraint -->
+	<metamodelType id="org.eclipse.papyrus.uml.DurationConstraint" name="UML::DurationConstraint"
+		eclass="DurationConstraint" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::DurationConstraint">
-		<param name="semanticHint" value="UML::DurationConstraint"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::DurationConstraint"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for DurationInterval -->
-	<metamodelType eclass="DurationInterval" id="org.eclipse.papyrus.uml.DurationInterval"
+	<!-- IMetamodelType for DurationInterval -->
+	<metamodelType id="org.eclipse.papyrus.uml.DurationInterval" name="UML::DurationInterval"
+		eclass="DurationInterval" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::DurationInterval">
-		<param name="semanticHint" value="UML::DurationInterval"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::DurationInterval"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for DurationObservation -->
-	<metamodelType eclass="DurationObservation" id="org.eclipse.papyrus.uml.DurationObservation"
+	<!-- IMetamodelType for DurationObservation -->
+	<metamodelType id="org.eclipse.papyrus.uml.DurationObservation" name="UML::DurationObservation"
+		eclass="DurationObservation" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::DurationObservation">
-		<param name="semanticHint" value="UML::DurationObservation"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::DurationObservation"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Element -->
-	<metamodelType eclass="Element" id="org.eclipse.papyrus.uml.Element"
+	<!-- IMetamodelType for Element -->
+	<metamodelType id="org.eclipse.papyrus.uml.Element" name="UML::Element"
+		eclass="Element" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Element">
-		<param name="semanticHint" value="UML::Element"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Element"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ElementImport -->
-	<metamodelType eclass="ElementImport" id="org.eclipse.papyrus.uml.ElementImport"
+	<!-- IMetamodelType for ElementImport -->
+	<metamodelType id="org.eclipse.papyrus.uml.ElementImport" name="UML::ElementImport"
+		eclass="ElementImport" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ElementImport">
-		<param name="semanticHint" value="UML::ElementImport"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ElementImport"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for EncapsulatedClassifier -->
-	<metamodelType eclass="EncapsulatedClassifier" id="org.eclipse.papyrus.uml.EncapsulatedClassifier"
+	<!-- IMetamodelType for EncapsulatedClassifier -->
+	<metamodelType id="org.eclipse.papyrus.uml.EncapsulatedClassifier" name="UML::EncapsulatedClassifier"
+		eclass="EncapsulatedClassifier" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::EncapsulatedClassifier">
-		<param name="semanticHint" value="UML::EncapsulatedClassifier"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::EncapsulatedClassifier"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Enumeration -->
-	<metamodelType eclass="Enumeration" id="org.eclipse.papyrus.uml.Enumeration"
+	<!-- IMetamodelType for Enumeration -->
+	<metamodelType id="org.eclipse.papyrus.uml.Enumeration" name="UML::Enumeration"
+		eclass="Enumeration" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Enumeration">
-		<param name="semanticHint" value="UML::Enumeration"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Enumeration"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for EnumerationLiteral -->
-	<metamodelType eclass="EnumerationLiteral" id="org.eclipse.papyrus.uml.EnumerationLiteral"
+	<!-- IMetamodelType for EnumerationLiteral -->
+	<metamodelType id="org.eclipse.papyrus.uml.EnumerationLiteral" name="UML::EnumerationLiteral"
+		eclass="EnumerationLiteral" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::EnumerationLiteral">
-		<param name="semanticHint" value="UML::EnumerationLiteral"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::EnumerationLiteral"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Event -->
-	<metamodelType eclass="Event" id="org.eclipse.papyrus.uml.Event"
+	<!-- IMetamodelType for Event -->
+	<metamodelType id="org.eclipse.papyrus.uml.Event" name="UML::Event"
+		eclass="Event" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Event">
-		<param name="semanticHint" value="UML::Event"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Event"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ExceptionHandler -->
-	<metamodelType eclass="ExceptionHandler" id="org.eclipse.papyrus.uml.ExceptionHandler"
+	<!-- IMetamodelType for ExceptionHandler -->
+	<metamodelType id="org.eclipse.papyrus.uml.ExceptionHandler" name="UML::ExceptionHandler"
+		eclass="ExceptionHandler" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ExceptionHandler">
-		<param name="semanticHint" value="UML::ExceptionHandler"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ExceptionHandler"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ExecutableNode -->
-	<metamodelType eclass="ExecutableNode" id="org.eclipse.papyrus.uml.ExecutableNode"
+	<!-- IMetamodelType for ExecutableNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.ExecutableNode" name="UML::ExecutableNode"
+		eclass="ExecutableNode" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ExecutableNode">
-		<param name="semanticHint" value="UML::ExecutableNode"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ExecutableNode"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ExecutionEnvironment -->
-	<metamodelType eclass="ExecutionEnvironment" id="org.eclipse.papyrus.uml.ExecutionEnvironment"
+	<!-- IMetamodelType for ExecutionEnvironment -->
+	<metamodelType id="org.eclipse.papyrus.uml.ExecutionEnvironment" name="UML::ExecutionEnvironment"
+		eclass="ExecutionEnvironment" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ExecutionEnvironment">
-		<param name="semanticHint" value="UML::ExecutionEnvironment"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ExecutionEnvironment"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ExecutionEvent -->
-	<metamodelType eclass="ExecutionEvent" id="org.eclipse.papyrus.uml.ExecutionEvent"
+	<!-- IMetamodelType for ExecutionEvent -->
+	<metamodelType id="org.eclipse.papyrus.uml.ExecutionEvent" name="UML::ExecutionEvent"
+		eclass="ExecutionEvent" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ExecutionEvent">
-		<param name="semanticHint" value="UML::ExecutionEvent"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ExecutionEvent"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ExecutionOccurrenceSpecification -->
-	<metamodelType eclass="ExecutionOccurrenceSpecification" id="org.eclipse.papyrus.uml.ExecutionOccurrenceSpecification"
+	<!-- IMetamodelType for ExecutionOccurrenceSpecification -->
+	<metamodelType id="org.eclipse.papyrus.uml.ExecutionOccurrenceSpecification" name="UML::ExecutionOccurrenceSpecification"
+		eclass="ExecutionOccurrenceSpecification" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ExecutionOccurrenceSpecification">
-		<param name="semanticHint" value="UML::ExecutionOccurrenceSpecification"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ExecutionOccurrenceSpecification"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ExecutionSpecification -->
-	<metamodelType eclass="ExecutionSpecification" id="org.eclipse.papyrus.uml.ExecutionSpecification"
+	<!-- IMetamodelType for ExecutionSpecification -->
+	<metamodelType id="org.eclipse.papyrus.uml.ExecutionSpecification" name="UML::ExecutionSpecification"
+		eclass="ExecutionSpecification" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ExecutionSpecification">
-		<param name="semanticHint" value="UML::ExecutionSpecification"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ExecutionSpecification"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ExpansionNode -->
-	<metamodelType eclass="ExpansionNode" id="org.eclipse.papyrus.uml.ExpansionNode"
+	<!-- IMetamodelType for ExpansionNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.ExpansionNode" name="UML::ExpansionNode"
+		eclass="ExpansionNode" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ExpansionNode">
-		<param name="semanticHint" value="UML::ExpansionNode"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ExpansionNode"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ExpansionRegion -->
-	<metamodelType eclass="ExpansionRegion" id="org.eclipse.papyrus.uml.ExpansionRegion"
+	<!-- IMetamodelType for ExpansionRegion -->
+	<metamodelType id="org.eclipse.papyrus.uml.ExpansionRegion" name="UML::ExpansionRegion"
+		eclass="ExpansionRegion" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ExpansionRegion">
-		<param name="semanticHint" value="UML::ExpansionRegion"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ExpansionRegion"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Expression -->
-	<metamodelType eclass="Expression" id="org.eclipse.papyrus.uml.Expression"
+	<!-- IMetamodelType for Expression -->
+	<metamodelType id="org.eclipse.papyrus.uml.Expression" name="UML::Expression"
+		eclass="Expression" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Expression">
-		<param name="semanticHint" value="UML::Expression"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Expression"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Extend -->
-	<metamodelType eclass="Extend" id="org.eclipse.papyrus.uml.Extend"
+	<!-- IMetamodelType for Extend -->
+	<metamodelType id="org.eclipse.papyrus.uml.Extend" name="UML::Extend"
+		eclass="Extend" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Extend">
-		<param name="semanticHint" value="UML::Extend"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Extend"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Extension -->
-	<metamodelType eclass="Extension" id="org.eclipse.papyrus.uml.Extension"
+	<!-- IMetamodelType for Extension -->
+	<metamodelType id="org.eclipse.papyrus.uml.Extension" name="UML::Extension"
+		eclass="Extension" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Extension">
-		<param name="semanticHint" value="UML::Extension"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Extension"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ExtensionEnd -->
-	<metamodelType eclass="ExtensionEnd" id="org.eclipse.papyrus.uml.ExtensionEnd"
+	<!-- IMetamodelType for ExtensionEnd -->
+	<metamodelType id="org.eclipse.papyrus.uml.ExtensionEnd" name="UML::ExtensionEnd"
+		eclass="ExtensionEnd" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ExtensionEnd">
-		<param name="semanticHint" value="UML::ExtensionEnd"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ExtensionEnd"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ExtensionPoint -->
-	<metamodelType eclass="ExtensionPoint" id="org.eclipse.papyrus.uml.ExtensionPoint"
+	<!-- IMetamodelType for ExtensionPoint -->
+	<metamodelType id="org.eclipse.papyrus.uml.ExtensionPoint" name="UML::ExtensionPoint"
+		eclass="ExtensionPoint" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ExtensionPoint">
-		<param name="semanticHint" value="UML::ExtensionPoint"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ExtensionPoint"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Feature -->
-	<metamodelType eclass="Feature" id="org.eclipse.papyrus.uml.Feature"
+	<!-- IMetamodelType for Feature -->
+	<metamodelType id="org.eclipse.papyrus.uml.Feature" name="UML::Feature"
+		eclass="Feature" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Feature">
-		<param name="semanticHint" value="UML::Feature"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Feature"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for FinalNode -->
-	<metamodelType eclass="FinalNode" id="org.eclipse.papyrus.uml.FinalNode"
+	<!-- IMetamodelType for FinalNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.FinalNode" name="UML::FinalNode"
+		eclass="FinalNode" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::FinalNode">
-		<param name="semanticHint" value="UML::FinalNode"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::FinalNode"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for FinalState -->
-	<metamodelType eclass="FinalState" id="org.eclipse.papyrus.uml.FinalState"
+	<!-- IMetamodelType for FinalState -->
+	<metamodelType id="org.eclipse.papyrus.uml.FinalState" name="UML::FinalState"
+		eclass="FinalState" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::FinalState">
-		<param name="semanticHint" value="UML::FinalState"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::FinalState"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for FlowFinalNode -->
-	<metamodelType eclass="FlowFinalNode" id="org.eclipse.papyrus.uml.FlowFinalNode"
+	<!-- IMetamodelType for FlowFinalNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.FlowFinalNode" name="UML::FlowFinalNode"
+		eclass="FlowFinalNode" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::FlowFinalNode">
-		<param name="semanticHint" value="UML::FlowFinalNode"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::FlowFinalNode"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ForkNode -->
-	<metamodelType eclass="ForkNode" id="org.eclipse.papyrus.uml.ForkNode"
+	<!-- IMetamodelType for ForkNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.ForkNode" name="UML::ForkNode"
+		eclass="ForkNode" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ForkNode">
-		<param name="semanticHint" value="UML::ForkNode"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ForkNode"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for FunctionBehavior -->
-	<metamodelType eclass="FunctionBehavior" id="org.eclipse.papyrus.uml.FunctionBehavior"
+	<!-- IMetamodelType for FunctionBehavior -->
+	<metamodelType id="org.eclipse.papyrus.uml.FunctionBehavior" name="UML::FunctionBehavior"
+		eclass="FunctionBehavior" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::FunctionBehavior">
-		<param name="semanticHint" value="UML::FunctionBehavior"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::FunctionBehavior"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Gate -->
-	<metamodelType eclass="Gate" id="org.eclipse.papyrus.uml.Gate"
+	<!-- IMetamodelType for Gate -->
+	<metamodelType id="org.eclipse.papyrus.uml.Gate" name="UML::Gate"
+		eclass="Gate" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Gate">
-		<param name="semanticHint" value="UML::Gate"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Gate"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Generalization -->
-	<metamodelType eclass="Generalization" id="org.eclipse.papyrus.uml.Generalization"
-		edithelper="org.eclipse.papyrus.uml.service.types.helper.GeneralizationEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Generalization">
-		<param name="semanticHint" value="UML::Generalization"/>
+	<!-- IMetamodelType for GeneralOrdering -->
+	<metamodelType id="org.eclipse.papyrus.uml.GeneralOrdering" name="UML::GeneralOrdering"
+		eclass="GeneralOrdering" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::GeneralOrdering"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for GeneralizationSet -->
-	<metamodelType eclass="GeneralizationSet" id="org.eclipse.papyrus.uml.GeneralizationSet"
-		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::GeneralizationSet">
-		<param name="semanticHint" value="UML::GeneralizationSet"/>
+	<!-- IMetamodelType for Generalization -->
+	<metamodelType id="org.eclipse.papyrus.uml.Generalization" name="UML::Generalization"
+		eclass="Generalization" 
+		edithelper="org.eclipse.papyrus.uml.service.types.helper.GeneralizationEditHelper"
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Generalization"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for GeneralOrdering -->
-	<metamodelType eclass="GeneralOrdering" id="org.eclipse.papyrus.uml.GeneralOrdering"
+	<!-- IMetamodelType for GeneralizationSet -->
+	<metamodelType id="org.eclipse.papyrus.uml.GeneralizationSet" name="UML::GeneralizationSet"
+		eclass="GeneralizationSet" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::GeneralOrdering">
-		<param name="semanticHint" value="UML::GeneralOrdering"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::GeneralizationSet"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Image -->
-	<metamodelType eclass="Image" id="org.eclipse.papyrus.uml.Image"
+	<!-- IMetamodelType for Image -->
+	<metamodelType id="org.eclipse.papyrus.uml.Image" name="UML::Image"
+		eclass="Image" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Image">
-		<param name="semanticHint" value="UML::Image"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Image"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Include -->
-	<metamodelType eclass="Include" id="org.eclipse.papyrus.uml.Include"
+	<!-- IMetamodelType for Include -->
+	<metamodelType id="org.eclipse.papyrus.uml.Include" name="UML::Include"
+		eclass="Include" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Include">
-		<param name="semanticHint" value="UML::Include"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Include"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for InformationFlow -->
-	<metamodelType eclass="InformationFlow" id="org.eclipse.papyrus.uml.InformationFlow"
+	<!-- IMetamodelType for InformationFlow -->
+	<metamodelType id="org.eclipse.papyrus.uml.InformationFlow" name="UML::InformationFlow"
+		eclass="InformationFlow" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::InformationFlow">
-		<param name="semanticHint" value="UML::InformationFlow"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::InformationFlow"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for InformationItem -->
-	<metamodelType eclass="InformationItem" id="org.eclipse.papyrus.uml.InformationItem"
+	<!-- IMetamodelType for InformationItem -->
+	<metamodelType id="org.eclipse.papyrus.uml.InformationItem" name="UML::InformationItem"
+		eclass="InformationItem" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::InformationItem">
-		<param name="semanticHint" value="UML::InformationItem"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::InformationItem"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for InitialNode -->
-	<metamodelType eclass="InitialNode" id="org.eclipse.papyrus.uml.InitialNode"
+	<!-- IMetamodelType for InitialNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.InitialNode" name="UML::InitialNode"
+		eclass="InitialNode" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::InitialNode">
-		<param name="semanticHint" value="UML::InitialNode"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::InitialNode"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for InputPin -->
-	<metamodelType eclass="InputPin" id="org.eclipse.papyrus.uml.InputPin"
+	<!-- IMetamodelType for InputPin -->
+	<metamodelType id="org.eclipse.papyrus.uml.InputPin" name="UML::InputPin"
+		eclass="InputPin" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::InputPin">
-		<param name="semanticHint" value="UML::InputPin"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::InputPin"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for InstanceSpecification -->
-	<metamodelType eclass="InstanceSpecification" id="org.eclipse.papyrus.uml.InstanceSpecification"
+	<!-- IMetamodelType for InstanceSpecification -->
+	<metamodelType id="org.eclipse.papyrus.uml.InstanceSpecification" name="UML::InstanceSpecification"
+		eclass="InstanceSpecification" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::InstanceSpecification">
-		<param name="semanticHint" value="UML::InstanceSpecification"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::InstanceSpecification"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for InstanceValue -->
-	<metamodelType eclass="InstanceValue" id="org.eclipse.papyrus.uml.InstanceValue"
+	<!-- IMetamodelType for InstanceValue -->
+	<metamodelType id="org.eclipse.papyrus.uml.InstanceValue" name="UML::InstanceValue"
+		eclass="InstanceValue" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::InstanceValue">
-		<param name="semanticHint" value="UML::InstanceValue"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::InstanceValue"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Interaction -->
-	<metamodelType eclass="Interaction" id="org.eclipse.papyrus.uml.Interaction"
+	<!-- IMetamodelType for Interaction -->
+	<metamodelType id="org.eclipse.papyrus.uml.Interaction" name="UML::Interaction"
+		eclass="Interaction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Interaction">
-		<param name="semanticHint" value="UML::Interaction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Interaction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for InteractionConstraint -->
-	<metamodelType eclass="InteractionConstraint" id="org.eclipse.papyrus.uml.InteractionConstraint"
+	<!-- IMetamodelType for InteractionConstraint -->
+	<metamodelType id="org.eclipse.papyrus.uml.InteractionConstraint" name="UML::InteractionConstraint"
+		eclass="InteractionConstraint" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::InteractionConstraint">
-		<param name="semanticHint" value="UML::InteractionConstraint"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::InteractionConstraint"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for InteractionFragment -->
-	<metamodelType eclass="InteractionFragment" id="org.eclipse.papyrus.uml.InteractionFragment"
+	<!-- IMetamodelType for InteractionFragment -->
+	<metamodelType id="org.eclipse.papyrus.uml.InteractionFragment" name="UML::InteractionFragment"
+		eclass="InteractionFragment" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::InteractionFragment">
-		<param name="semanticHint" value="UML::InteractionFragment"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::InteractionFragment"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for InteractionOperand -->
-	<metamodelType eclass="InteractionOperand" id="org.eclipse.papyrus.uml.InteractionOperand"
+	<!-- IMetamodelType for InteractionOperand -->
+	<metamodelType id="org.eclipse.papyrus.uml.InteractionOperand" name="UML::InteractionOperand"
+		eclass="InteractionOperand" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::InteractionOperand">
-		<param name="semanticHint" value="UML::InteractionOperand"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::InteractionOperand"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for InteractionUse -->
-	<metamodelType eclass="InteractionUse" id="org.eclipse.papyrus.uml.InteractionUse"
+	<!-- IMetamodelType for InteractionUse -->
+	<metamodelType id="org.eclipse.papyrus.uml.InteractionUse" name="UML::InteractionUse"
+		eclass="InteractionUse" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::InteractionUse">
-		<param name="semanticHint" value="UML::InteractionUse"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::InteractionUse"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Interface -->
-	<metamodelType eclass="Interface" id="org.eclipse.papyrus.uml.Interface"
+	<!-- IMetamodelType for Interface -->
+	<metamodelType id="org.eclipse.papyrus.uml.Interface" name="UML::Interface"
+		eclass="Interface" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Interface">
-		<param name="semanticHint" value="UML::Interface"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Interface"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for InterfaceRealization -->
-	<metamodelType eclass="InterfaceRealization" id="org.eclipse.papyrus.uml.InterfaceRealization"
+	<!-- IMetamodelType for InterfaceRealization -->
+	<metamodelType id="org.eclipse.papyrus.uml.InterfaceRealization" name="UML::InterfaceRealization"
+		eclass="InterfaceRealization" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.InterfaceRealizationEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::InterfaceRealization">
-		<param name="semanticHint" value="UML::InterfaceRealization"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::InterfaceRealization"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for InterruptibleActivityRegion -->
-	<metamodelType eclass="InterruptibleActivityRegion" id="org.eclipse.papyrus.uml.InterruptibleActivityRegion"
+	<!-- IMetamodelType for InterruptibleActivityRegion -->
+	<metamodelType id="org.eclipse.papyrus.uml.InterruptibleActivityRegion" name="UML::InterruptibleActivityRegion"
+		eclass="InterruptibleActivityRegion" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::InterruptibleActivityRegion">
-		<param name="semanticHint" value="UML::InterruptibleActivityRegion"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::InterruptibleActivityRegion"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Interval -->
-	<metamodelType eclass="Interval" id="org.eclipse.papyrus.uml.Interval"
+	<!-- IMetamodelType for Interval -->
+	<metamodelType id="org.eclipse.papyrus.uml.Interval" name="UML::Interval"
+		eclass="Interval" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Interval">
-		<param name="semanticHint" value="UML::Interval"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Interval"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for IntervalConstraint -->
-	<metamodelType eclass="IntervalConstraint" id="org.eclipse.papyrus.uml.IntervalConstraint"
+	<!-- IMetamodelType for IntervalConstraint -->
+	<metamodelType id="org.eclipse.papyrus.uml.IntervalConstraint" name="UML::IntervalConstraint"
+		eclass="IntervalConstraint" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::IntervalConstraint">
-		<param name="semanticHint" value="UML::IntervalConstraint"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::IntervalConstraint"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for InvocationAction -->
-	<metamodelType eclass="InvocationAction" id="org.eclipse.papyrus.uml.InvocationAction"
+	<!-- IMetamodelType for InvocationAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.InvocationAction" name="UML::InvocationAction"
+		eclass="InvocationAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::InvocationAction">
-		<param name="semanticHint" value="UML::InvocationAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::InvocationAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for JoinNode -->
-	<metamodelType eclass="JoinNode" id="org.eclipse.papyrus.uml.JoinNode"
+	<!-- IMetamodelType for JoinNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.JoinNode" name="UML::JoinNode"
+		eclass="JoinNode" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::JoinNode">
-		<param name="semanticHint" value="UML::JoinNode"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::JoinNode"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Lifeline -->
-	<metamodelType eclass="Lifeline" id="org.eclipse.papyrus.uml.Lifeline"
+	<!-- IMetamodelType for Lifeline -->
+	<metamodelType id="org.eclipse.papyrus.uml.Lifeline" name="UML::Lifeline"
+		eclass="Lifeline" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Lifeline">
-		<param name="semanticHint" value="UML::Lifeline"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Lifeline"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for LinkAction -->
-	<metamodelType eclass="LinkAction" id="org.eclipse.papyrus.uml.LinkAction"
+	<!-- IMetamodelType for LinkAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.LinkAction" name="UML::LinkAction"
+		eclass="LinkAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::LinkAction">
-		<param name="semanticHint" value="UML::LinkAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::LinkAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for LinkEndCreationData -->
-	<metamodelType eclass="LinkEndCreationData" id="org.eclipse.papyrus.uml.LinkEndCreationData"
+	<!-- IMetamodelType for LinkEndCreationData -->
+	<metamodelType id="org.eclipse.papyrus.uml.LinkEndCreationData" name="UML::LinkEndCreationData"
+		eclass="LinkEndCreationData" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::LinkEndCreationData">
-		<param name="semanticHint" value="UML::LinkEndCreationData"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::LinkEndCreationData"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for LinkEndData -->
-	<metamodelType eclass="LinkEndData" id="org.eclipse.papyrus.uml.LinkEndData"
+	<!-- IMetamodelType for LinkEndData -->
+	<metamodelType id="org.eclipse.papyrus.uml.LinkEndData" name="UML::LinkEndData"
+		eclass="LinkEndData" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::LinkEndData">
-		<param name="semanticHint" value="UML::LinkEndData"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::LinkEndData"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for LinkEndDestructionData -->
-	<metamodelType eclass="LinkEndDestructionData" id="org.eclipse.papyrus.uml.LinkEndDestructionData"
+	<!-- IMetamodelType for LinkEndDestructionData -->
+	<metamodelType id="org.eclipse.papyrus.uml.LinkEndDestructionData" name="UML::LinkEndDestructionData"
+		eclass="LinkEndDestructionData" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::LinkEndDestructionData">
-		<param name="semanticHint" value="UML::LinkEndDestructionData"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::LinkEndDestructionData"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for LiteralBoolean -->
-	<metamodelType eclass="LiteralBoolean" id="org.eclipse.papyrus.uml.LiteralBoolean"
+	<!-- IMetamodelType for LiteralBoolean -->
+	<metamodelType id="org.eclipse.papyrus.uml.LiteralBoolean" name="UML::LiteralBoolean"
+		eclass="LiteralBoolean" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::LiteralBoolean">
-		<param name="semanticHint" value="UML::LiteralBoolean"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::LiteralBoolean"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for LiteralInteger -->
-	<metamodelType eclass="LiteralInteger" id="org.eclipse.papyrus.uml.LiteralInteger"
+	<!-- IMetamodelType for LiteralInteger -->
+	<metamodelType id="org.eclipse.papyrus.uml.LiteralInteger" name="UML::LiteralInteger"
+		eclass="LiteralInteger" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::LiteralInteger">
-		<param name="semanticHint" value="UML::LiteralInteger"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::LiteralInteger"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for LiteralNull -->
-	<metamodelType eclass="LiteralNull" id="org.eclipse.papyrus.uml.LiteralNull"
+	<!-- IMetamodelType for LiteralNull -->
+	<metamodelType id="org.eclipse.papyrus.uml.LiteralNull" name="UML::LiteralNull"
+		eclass="LiteralNull" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::LiteralNull">
-		<param name="semanticHint" value="UML::LiteralNull"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::LiteralNull"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for LiteralSpecification -->
-	<metamodelType eclass="LiteralSpecification" id="org.eclipse.papyrus.uml.LiteralSpecification"
+	<!-- IMetamodelType for LiteralSpecification -->
+	<metamodelType id="org.eclipse.papyrus.uml.LiteralSpecification" name="UML::LiteralSpecification"
+		eclass="LiteralSpecification" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::LiteralSpecification">
-		<param name="semanticHint" value="UML::LiteralSpecification"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::LiteralSpecification"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for LiteralString -->
-	<metamodelType eclass="LiteralString" id="org.eclipse.papyrus.uml.LiteralString"
+	<!-- IMetamodelType for LiteralString -->
+	<metamodelType id="org.eclipse.papyrus.uml.LiteralString" name="UML::LiteralString"
+		eclass="LiteralString" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::LiteralString">
-		<param name="semanticHint" value="UML::LiteralString"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::LiteralString"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for LiteralUnlimitedNatural -->
-	<metamodelType eclass="LiteralUnlimitedNatural" id="org.eclipse.papyrus.uml.LiteralUnlimitedNatural"
+	<!-- IMetamodelType for LiteralUnlimitedNatural -->
+	<metamodelType id="org.eclipse.papyrus.uml.LiteralUnlimitedNatural" name="UML::LiteralUnlimitedNatural"
+		eclass="LiteralUnlimitedNatural" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::LiteralUnlimitedNatural">
-		<param name="semanticHint" value="UML::LiteralUnlimitedNatural"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::LiteralUnlimitedNatural"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for LoopNode -->
-	<metamodelType eclass="LoopNode" id="org.eclipse.papyrus.uml.LoopNode"
+	<!-- IMetamodelType for LoopNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.LoopNode" name="UML::LoopNode"
+		eclass="LoopNode" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::LoopNode">
-		<param name="semanticHint" value="UML::LoopNode"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::LoopNode"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Manifestation -->
-	<metamodelType eclass="Manifestation" id="org.eclipse.papyrus.uml.Manifestation"
+	<!-- IMetamodelType for Manifestation -->
+	<metamodelType id="org.eclipse.papyrus.uml.Manifestation" name="UML::Manifestation"
+		eclass="Manifestation" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Manifestation">
-		<param name="semanticHint" value="UML::Manifestation"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Manifestation"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for MergeNode -->
-	<metamodelType eclass="MergeNode" id="org.eclipse.papyrus.uml.MergeNode"
+	<!-- IMetamodelType for MergeNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.MergeNode" name="UML::MergeNode"
+		eclass="MergeNode" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::MergeNode">
-		<param name="semanticHint" value="UML::MergeNode"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::MergeNode"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Message -->
-	<metamodelType eclass="Message" id="org.eclipse.papyrus.uml.Message"
+	<!-- IMetamodelType for Message -->
+	<metamodelType id="org.eclipse.papyrus.uml.Message" name="UML::Message"
+		eclass="Message" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.MessageEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Message">
-		<param name="semanticHint" value="UML::Message"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Message"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for MessageEnd -->
-	<metamodelType eclass="MessageEnd" id="org.eclipse.papyrus.uml.MessageEnd"
+	<!-- IMetamodelType for MessageEnd -->
+	<metamodelType id="org.eclipse.papyrus.uml.MessageEnd" name="UML::MessageEnd"
+		eclass="MessageEnd" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::MessageEnd">
-		<param name="semanticHint" value="UML::MessageEnd"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::MessageEnd"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for MessageEvent -->
-	<metamodelType eclass="MessageEvent" id="org.eclipse.papyrus.uml.MessageEvent"
+	<!-- IMetamodelType for MessageEvent -->
+	<metamodelType id="org.eclipse.papyrus.uml.MessageEvent" name="UML::MessageEvent"
+		eclass="MessageEvent" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::MessageEvent">
-		<param name="semanticHint" value="UML::MessageEvent"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::MessageEvent"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for MessageOccurrenceSpecification -->
-	<metamodelType eclass="MessageOccurrenceSpecification" id="org.eclipse.papyrus.uml.MessageOccurrenceSpecification"
+	<!-- IMetamodelType for MessageOccurrenceSpecification -->
+	<metamodelType id="org.eclipse.papyrus.uml.MessageOccurrenceSpecification" name="UML::MessageOccurrenceSpecification"
+		eclass="MessageOccurrenceSpecification" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::MessageOccurrenceSpecification">
-		<param name="semanticHint" value="UML::MessageOccurrenceSpecification"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::MessageOccurrenceSpecification"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Model -->
-	<metamodelType eclass="Model" id="org.eclipse.papyrus.uml.Model"
+	<!-- IMetamodelType for Model -->
+	<metamodelType id="org.eclipse.papyrus.uml.Model" name="UML::Model"
+		eclass="Model" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Model">
-		<param name="semanticHint" value="UML::Model"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Model"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for MultiplicityElement -->
-	<metamodelType eclass="MultiplicityElement" id="org.eclipse.papyrus.uml.MultiplicityElement"
+	<!-- IMetamodelType for MultiplicityElement -->
+	<metamodelType id="org.eclipse.papyrus.uml.MultiplicityElement" name="UML::MultiplicityElement"
+		eclass="MultiplicityElement" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::MultiplicityElement">
-		<param name="semanticHint" value="UML::MultiplicityElement"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::MultiplicityElement"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for NamedElement -->
-	<metamodelType eclass="NamedElement" id="org.eclipse.papyrus.uml.NamedElement"
+	<!-- IMetamodelType for NamedElement -->
+	<metamodelType id="org.eclipse.papyrus.uml.NamedElement" name="UML::NamedElement"
+		eclass="NamedElement" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::NamedElement">
-		<param name="semanticHint" value="UML::NamedElement"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::NamedElement"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Namespace -->
-	<metamodelType eclass="Namespace" id="org.eclipse.papyrus.uml.Namespace"
+	<!-- IMetamodelType for Namespace -->
+	<metamodelType id="org.eclipse.papyrus.uml.Namespace" name="UML::Namespace"
+		eclass="Namespace" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Namespace">
-		<param name="semanticHint" value="UML::Namespace"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Namespace"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Node -->
-	<metamodelType eclass="Node" id="org.eclipse.papyrus.uml.Node"
+	<!-- IMetamodelType for Node -->
+	<metamodelType id="org.eclipse.papyrus.uml.Node" name="UML::Node"
+		eclass="Node" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Node">
-		<param name="semanticHint" value="UML::Node"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Node"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ObjectFlow -->
-	<metamodelType eclass="ObjectFlow" id="org.eclipse.papyrus.uml.ObjectFlow"
+	<!-- IMetamodelType for ObjectFlow -->
+	<metamodelType id="org.eclipse.papyrus.uml.ObjectFlow" name="UML::ObjectFlow"
+		eclass="ObjectFlow" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ObjectFlow">
-		<param name="semanticHint" value="UML::ObjectFlow"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ObjectFlow"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ObjectNode -->
-	<metamodelType eclass="ObjectNode" id="org.eclipse.papyrus.uml.ObjectNode"
+	<!-- IMetamodelType for ObjectNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.ObjectNode" name="UML::ObjectNode"
+		eclass="ObjectNode" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ObjectNode">
-		<param name="semanticHint" value="UML::ObjectNode"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ObjectNode"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Observation -->
-	<metamodelType eclass="Observation" id="org.eclipse.papyrus.uml.Observation"
+	<!-- IMetamodelType for Observation -->
+	<metamodelType id="org.eclipse.papyrus.uml.Observation" name="UML::Observation"
+		eclass="Observation" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Observation">
-		<param name="semanticHint" value="UML::Observation"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Observation"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for OccurrenceSpecification -->
-	<metamodelType eclass="OccurrenceSpecification" id="org.eclipse.papyrus.uml.OccurrenceSpecification"
+	<!-- IMetamodelType for OccurrenceSpecification -->
+	<metamodelType id="org.eclipse.papyrus.uml.OccurrenceSpecification" name="UML::OccurrenceSpecification"
+		eclass="OccurrenceSpecification" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::OccurrenceSpecification">
-		<param name="semanticHint" value="UML::OccurrenceSpecification"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::OccurrenceSpecification"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for OpaqueAction -->
-	<metamodelType eclass="OpaqueAction" id="org.eclipse.papyrus.uml.OpaqueAction"
+	<!-- IMetamodelType for OpaqueAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.OpaqueAction" name="UML::OpaqueAction"
+		eclass="OpaqueAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::OpaqueAction">
-		<param name="semanticHint" value="UML::OpaqueAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::OpaqueAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for OpaqueBehavior -->
-	<metamodelType eclass="OpaqueBehavior" id="org.eclipse.papyrus.uml.OpaqueBehavior"
+	<!-- IMetamodelType for OpaqueBehavior -->
+	<metamodelType id="org.eclipse.papyrus.uml.OpaqueBehavior" name="UML::OpaqueBehavior"
+		eclass="OpaqueBehavior" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::OpaqueBehavior">
-		<param name="semanticHint" value="UML::OpaqueBehavior"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::OpaqueBehavior"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for OpaqueExpression -->
-	<metamodelType eclass="OpaqueExpression" id="org.eclipse.papyrus.uml.OpaqueExpression"
+	<!-- IMetamodelType for OpaqueExpression -->
+	<metamodelType id="org.eclipse.papyrus.uml.OpaqueExpression" name="UML::OpaqueExpression"
+		eclass="OpaqueExpression" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::OpaqueExpression">
-		<param name="semanticHint" value="UML::OpaqueExpression"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::OpaqueExpression"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Operation -->
-	<metamodelType eclass="Operation" id="org.eclipse.papyrus.uml.Operation"
+	<!-- IMetamodelType for Operation -->
+	<metamodelType id="org.eclipse.papyrus.uml.Operation" name="UML::Operation"
+		eclass="Operation" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Operation">
-		<param name="semanticHint" value="UML::Operation"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Operation"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for OperationTemplateParameter -->
-	<metamodelType eclass="OperationTemplateParameter" id="org.eclipse.papyrus.uml.OperationTemplateParameter"
+	<!-- IMetamodelType for OperationTemplateParameter -->
+	<metamodelType id="org.eclipse.papyrus.uml.OperationTemplateParameter" name="UML::OperationTemplateParameter"
+		eclass="OperationTemplateParameter" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::OperationTemplateParameter">
-		<param name="semanticHint" value="UML::OperationTemplateParameter"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::OperationTemplateParameter"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for OutputPin -->
-	<metamodelType eclass="OutputPin" id="org.eclipse.papyrus.uml.OutputPin"
+	<!-- IMetamodelType for OutputPin -->
+	<metamodelType id="org.eclipse.papyrus.uml.OutputPin" name="UML::OutputPin"
+		eclass="OutputPin" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::OutputPin">
-		<param name="semanticHint" value="UML::OutputPin"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::OutputPin"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Package -->
-	<metamodelType eclass="Package" id="org.eclipse.papyrus.uml.Package"
+	<!-- IMetamodelType for Package -->
+	<metamodelType id="org.eclipse.papyrus.uml.Package" name="UML::Package"
+		eclass="Package" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Package">
-		<param name="semanticHint" value="UML::Package"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Package"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for PackageableElement -->
-	<metamodelType eclass="PackageableElement" id="org.eclipse.papyrus.uml.PackageableElement"
+	<!-- IMetamodelType for PackageImport -->
+	<metamodelType id="org.eclipse.papyrus.uml.PackageImport" name="UML::PackageImport"
+		eclass="PackageImport" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::PackageableElement">
-		<param name="semanticHint" value="UML::PackageableElement"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::PackageImport"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for PackageImport -->
-	<metamodelType eclass="PackageImport" id="org.eclipse.papyrus.uml.PackageImport"
+	<!-- IMetamodelType for PackageMerge -->
+	<metamodelType id="org.eclipse.papyrus.uml.PackageMerge" name="UML::PackageMerge"
+		eclass="PackageMerge" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::PackageImport">
-		<param name="semanticHint" value="UML::PackageImport"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::PackageMerge"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for PackageMerge -->
-	<metamodelType eclass="PackageMerge" id="org.eclipse.papyrus.uml.PackageMerge"
+	<!-- IMetamodelType for PackageableElement -->
+	<metamodelType id="org.eclipse.papyrus.uml.PackageableElement" name="UML::PackageableElement"
+		eclass="PackageableElement" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::PackageMerge">
-		<param name="semanticHint" value="UML::PackageMerge"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::PackageableElement"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Parameter -->
-	<metamodelType eclass="Parameter" id="org.eclipse.papyrus.uml.Parameter"
+	<!-- IMetamodelType for Parameter -->
+	<metamodelType id="org.eclipse.papyrus.uml.Parameter" name="UML::Parameter"
+		eclass="Parameter" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Parameter">
-		<param name="semanticHint" value="UML::Parameter"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Parameter"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ParameterableElement -->
-	<metamodelType eclass="ParameterableElement" id="org.eclipse.papyrus.uml.ParameterableElement"
+	<!-- IMetamodelType for ParameterSet -->
+	<metamodelType id="org.eclipse.papyrus.uml.ParameterSet" name="UML::ParameterSet"
+		eclass="ParameterSet" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ParameterableElement">
-		<param name="semanticHint" value="UML::ParameterableElement"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ParameterSet"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ParameterSet -->
-	<metamodelType eclass="ParameterSet" id="org.eclipse.papyrus.uml.ParameterSet"
+	<!-- IMetamodelType for ParameterableElement -->
+	<metamodelType id="org.eclipse.papyrus.uml.ParameterableElement" name="UML::ParameterableElement"
+		eclass="ParameterableElement" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ParameterSet">
-		<param name="semanticHint" value="UML::ParameterSet"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ParameterableElement"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for PartDecomposition -->
-	<metamodelType eclass="PartDecomposition" id="org.eclipse.papyrus.uml.PartDecomposition"
+	<!-- IMetamodelType for PartDecomposition -->
+	<metamodelType id="org.eclipse.papyrus.uml.PartDecomposition" name="UML::PartDecomposition"
+		eclass="PartDecomposition" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::PartDecomposition">
-		<param name="semanticHint" value="UML::PartDecomposition"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::PartDecomposition"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Pin -->
-	<metamodelType eclass="Pin" id="org.eclipse.papyrus.uml.Pin"
+	<!-- IMetamodelType for Pin -->
+	<metamodelType id="org.eclipse.papyrus.uml.Pin" name="UML::Pin"
+		eclass="Pin" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Pin">
-		<param name="semanticHint" value="UML::Pin"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Pin"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Port -->
-	<metamodelType eclass="Port" id="org.eclipse.papyrus.uml.Port"
+	<!-- IMetamodelType for Port -->
+	<metamodelType id="org.eclipse.papyrus.uml.Port" name="UML::Port"
+		eclass="Port" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.PortEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Port">
-		<param name="semanticHint" value="UML::Port"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Port"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for PrimitiveType -->
-	<metamodelType eclass="PrimitiveType" id="org.eclipse.papyrus.uml.PrimitiveType"
+	<!-- IMetamodelType for PrimitiveType -->
+	<metamodelType id="org.eclipse.papyrus.uml.PrimitiveType" name="UML::PrimitiveType"
+		eclass="PrimitiveType" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::PrimitiveType">
-		<param name="semanticHint" value="UML::PrimitiveType"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::PrimitiveType"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Profile -->
-	<metamodelType eclass="Profile" id="org.eclipse.papyrus.uml.Profile"
+	<!-- IMetamodelType for Profile -->
+	<metamodelType id="org.eclipse.papyrus.uml.Profile" name="UML::Profile"
+		eclass="Profile" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Profile">
-		<param name="semanticHint" value="UML::Profile"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Profile"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ProfileApplication -->
-	<metamodelType eclass="ProfileApplication" id="org.eclipse.papyrus.uml.ProfileApplication"
+	<!-- IMetamodelType for ProfileApplication -->
+	<metamodelType id="org.eclipse.papyrus.uml.ProfileApplication" name="UML::ProfileApplication"
+		eclass="ProfileApplication" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ProfileApplication">
-		<param name="semanticHint" value="UML::ProfileApplication"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ProfileApplication"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Property -->
-	<metamodelType eclass="Property" id="org.eclipse.papyrus.uml.Property"
+	<!-- IMetamodelType for Property -->
+	<metamodelType id="org.eclipse.papyrus.uml.Property" name="UML::Property"
+		eclass="Property" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Property">
-		<param name="semanticHint" value="UML::Property"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Property"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ProtocolConformance -->
-	<metamodelType eclass="ProtocolConformance" id="org.eclipse.papyrus.uml.ProtocolConformance"
+	<!-- IMetamodelType for ProtocolConformance -->
+	<metamodelType id="org.eclipse.papyrus.uml.ProtocolConformance" name="UML::ProtocolConformance"
+		eclass="ProtocolConformance" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ProtocolConformance">
-		<param name="semanticHint" value="UML::ProtocolConformance"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ProtocolConformance"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ProtocolStateMachine -->
-	<metamodelType eclass="ProtocolStateMachine" id="org.eclipse.papyrus.uml.ProtocolStateMachine"
+	<!-- IMetamodelType for ProtocolStateMachine -->
+	<metamodelType id="org.eclipse.papyrus.uml.ProtocolStateMachine" name="UML::ProtocolStateMachine"
+		eclass="ProtocolStateMachine" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ProtocolStateMachine">
-		<param name="semanticHint" value="UML::ProtocolStateMachine"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ProtocolStateMachine"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ProtocolTransition -->
-	<metamodelType eclass="ProtocolTransition" id="org.eclipse.papyrus.uml.ProtocolTransition"
+	<!-- IMetamodelType for ProtocolTransition -->
+	<metamodelType id="org.eclipse.papyrus.uml.ProtocolTransition" name="UML::ProtocolTransition"
+		eclass="ProtocolTransition" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ProtocolTransition">
-		<param name="semanticHint" value="UML::ProtocolTransition"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ProtocolTransition"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Pseudostate -->
-	<metamodelType eclass="Pseudostate" id="org.eclipse.papyrus.uml.Pseudostate"
+	<!-- IMetamodelType for Pseudostate -->
+	<metamodelType id="org.eclipse.papyrus.uml.Pseudostate" name="UML::Pseudostate"
+		eclass="Pseudostate" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Pseudostate">
-		<param name="semanticHint" value="UML::Pseudostate"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Pseudostate"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for QualifierValue -->
-	<metamodelType eclass="QualifierValue" id="org.eclipse.papyrus.uml.QualifierValue"
+	<!-- IMetamodelType for QualifierValue -->
+	<metamodelType id="org.eclipse.papyrus.uml.QualifierValue" name="UML::QualifierValue"
+		eclass="QualifierValue" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::QualifierValue">
-		<param name="semanticHint" value="UML::QualifierValue"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::QualifierValue"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for RaiseExceptionAction -->
-	<metamodelType eclass="RaiseExceptionAction" id="org.eclipse.papyrus.uml.RaiseExceptionAction"
+	<!-- IMetamodelType for RaiseExceptionAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.RaiseExceptionAction" name="UML::RaiseExceptionAction"
+		eclass="RaiseExceptionAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::RaiseExceptionAction">
-		<param name="semanticHint" value="UML::RaiseExceptionAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::RaiseExceptionAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ReadExtentAction -->
-	<metamodelType eclass="ReadExtentAction" id="org.eclipse.papyrus.uml.ReadExtentAction"
+	<!-- IMetamodelType for ReadExtentAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.ReadExtentAction" name="UML::ReadExtentAction"
+		eclass="ReadExtentAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ReadExtentAction">
-		<param name="semanticHint" value="UML::ReadExtentAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ReadExtentAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ReadIsClassifiedObjectAction -->
-	<metamodelType eclass="ReadIsClassifiedObjectAction" id="org.eclipse.papyrus.uml.ReadIsClassifiedObjectAction"
+	<!-- IMetamodelType for ReadIsClassifiedObjectAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.ReadIsClassifiedObjectAction" name="UML::ReadIsClassifiedObjectAction"
+		eclass="ReadIsClassifiedObjectAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ReadIsClassifiedObjectAction">
-		<param name="semanticHint" value="UML::ReadIsClassifiedObjectAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ReadIsClassifiedObjectAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ReadLinkAction -->
-	<metamodelType eclass="ReadLinkAction" id="org.eclipse.papyrus.uml.ReadLinkAction"
+	<!-- IMetamodelType for ReadLinkAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.ReadLinkAction" name="UML::ReadLinkAction"
+		eclass="ReadLinkAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ReadLinkAction">
-		<param name="semanticHint" value="UML::ReadLinkAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ReadLinkAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ReadLinkObjectEndAction -->
-	<metamodelType eclass="ReadLinkObjectEndAction" id="org.eclipse.papyrus.uml.ReadLinkObjectEndAction"
+	<!-- IMetamodelType for ReadLinkObjectEndAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.ReadLinkObjectEndAction" name="UML::ReadLinkObjectEndAction"
+		eclass="ReadLinkObjectEndAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ReadLinkObjectEndAction">
-		<param name="semanticHint" value="UML::ReadLinkObjectEndAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ReadLinkObjectEndAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ReadLinkObjectEndQualifierAction -->
-	<metamodelType eclass="ReadLinkObjectEndQualifierAction" id="org.eclipse.papyrus.uml.ReadLinkObjectEndQualifierAction"
+	<!-- IMetamodelType for ReadLinkObjectEndQualifierAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.ReadLinkObjectEndQualifierAction" name="UML::ReadLinkObjectEndQualifierAction"
+		eclass="ReadLinkObjectEndQualifierAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ReadLinkObjectEndQualifierAction">
-		<param name="semanticHint" value="UML::ReadLinkObjectEndQualifierAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ReadLinkObjectEndQualifierAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ReadSelfAction -->
-	<metamodelType eclass="ReadSelfAction" id="org.eclipse.papyrus.uml.ReadSelfAction"
+	<!-- IMetamodelType for ReadSelfAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.ReadSelfAction" name="UML::ReadSelfAction"
+		eclass="ReadSelfAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ReadSelfAction">
-		<param name="semanticHint" value="UML::ReadSelfAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ReadSelfAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ReadStructuralFeatureAction -->
-	<metamodelType eclass="ReadStructuralFeatureAction" id="org.eclipse.papyrus.uml.ReadStructuralFeatureAction"
+	<!-- IMetamodelType for ReadStructuralFeatureAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.ReadStructuralFeatureAction" name="UML::ReadStructuralFeatureAction"
+		eclass="ReadStructuralFeatureAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ReadStructuralFeatureAction">
-		<param name="semanticHint" value="UML::ReadStructuralFeatureAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ReadStructuralFeatureAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ReadVariableAction -->
-	<metamodelType eclass="ReadVariableAction" id="org.eclipse.papyrus.uml.ReadVariableAction"
+	<!-- IMetamodelType for ReadVariableAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.ReadVariableAction" name="UML::ReadVariableAction"
+		eclass="ReadVariableAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ReadVariableAction">
-		<param name="semanticHint" value="UML::ReadVariableAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ReadVariableAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Realization -->
-	<metamodelType eclass="Realization" id="org.eclipse.papyrus.uml.Realization"
+	<!-- IMetamodelType for Realization -->
+	<metamodelType id="org.eclipse.papyrus.uml.Realization" name="UML::Realization"
+		eclass="Realization" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Realization">
-		<param name="semanticHint" value="UML::Realization"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Realization"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ReceiveOperationEvent -->
-	<metamodelType eclass="ReceiveOperationEvent" id="org.eclipse.papyrus.uml.ReceiveOperationEvent"
+	<!-- IMetamodelType for ReceiveOperationEvent -->
+	<metamodelType id="org.eclipse.papyrus.uml.ReceiveOperationEvent" name="UML::ReceiveOperationEvent"
+		eclass="ReceiveOperationEvent" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ReceiveOperationEvent">
-		<param name="semanticHint" value="UML::ReceiveOperationEvent"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ReceiveOperationEvent"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ReceiveSignalEvent -->
-	<metamodelType eclass="ReceiveSignalEvent" id="org.eclipse.papyrus.uml.ReceiveSignalEvent"
+	<!-- IMetamodelType for ReceiveSignalEvent -->
+	<metamodelType id="org.eclipse.papyrus.uml.ReceiveSignalEvent" name="UML::ReceiveSignalEvent"
+		eclass="ReceiveSignalEvent" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ReceiveSignalEvent">
-		<param name="semanticHint" value="UML::ReceiveSignalEvent"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ReceiveSignalEvent"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Reception -->
-	<metamodelType eclass="Reception" id="org.eclipse.papyrus.uml.Reception"
+	<!-- IMetamodelType for Reception -->
+	<metamodelType id="org.eclipse.papyrus.uml.Reception" name="UML::Reception"
+		eclass="Reception" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Reception">
-		<param name="semanticHint" value="UML::Reception"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Reception"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ReclassifyObjectAction -->
-	<metamodelType eclass="ReclassifyObjectAction" id="org.eclipse.papyrus.uml.ReclassifyObjectAction"
+	<!-- IMetamodelType for ReclassifyObjectAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.ReclassifyObjectAction" name="UML::ReclassifyObjectAction"
+		eclass="ReclassifyObjectAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ReclassifyObjectAction">
-		<param name="semanticHint" value="UML::ReclassifyObjectAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ReclassifyObjectAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for RedefinableElement -->
-	<metamodelType eclass="RedefinableElement" id="org.eclipse.papyrus.uml.RedefinableElement"
+	<!-- IMetamodelType for RedefinableElement -->
+	<metamodelType id="org.eclipse.papyrus.uml.RedefinableElement" name="UML::RedefinableElement"
+		eclass="RedefinableElement" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::RedefinableElement">
-		<param name="semanticHint" value="UML::RedefinableElement"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::RedefinableElement"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for RedefinableTemplateSignature -->
-	<metamodelType eclass="RedefinableTemplateSignature" id="org.eclipse.papyrus.uml.RedefinableTemplateSignature"
+	<!-- IMetamodelType for RedefinableTemplateSignature -->
+	<metamodelType id="org.eclipse.papyrus.uml.RedefinableTemplateSignature" name="UML::RedefinableTemplateSignature"
+		eclass="RedefinableTemplateSignature" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::RedefinableTemplateSignature">
-		<param name="semanticHint" value="UML::RedefinableTemplateSignature"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::RedefinableTemplateSignature"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ReduceAction -->
-	<metamodelType eclass="ReduceAction" id="org.eclipse.papyrus.uml.ReduceAction"
+	<!-- IMetamodelType for ReduceAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.ReduceAction" name="UML::ReduceAction"
+		eclass="ReduceAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ReduceAction">
-		<param name="semanticHint" value="UML::ReduceAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ReduceAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Region -->
-	<metamodelType eclass="Region" id="org.eclipse.papyrus.uml.Region"
+	<!-- IMetamodelType for Region -->
+	<metamodelType id="org.eclipse.papyrus.uml.Region" name="UML::Region"
+		eclass="Region" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Region">
-		<param name="semanticHint" value="UML::Region"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Region"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Relationship -->
-	<metamodelType eclass="Relationship" id="org.eclipse.papyrus.uml.Relationship"
+	<!-- IMetamodelType for Relationship -->
+	<metamodelType id="org.eclipse.papyrus.uml.Relationship" name="UML::Relationship"
+		eclass="Relationship" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Relationship">
-		<param name="semanticHint" value="UML::Relationship"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Relationship"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for RemoveStructuralFeatureValueAction -->
-	<metamodelType eclass="RemoveStructuralFeatureValueAction" id="org.eclipse.papyrus.uml.RemoveStructuralFeatureValueAction"
+	<!-- IMetamodelType for RemoveStructuralFeatureValueAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.RemoveStructuralFeatureValueAction" name="UML::RemoveStructuralFeatureValueAction"
+		eclass="RemoveStructuralFeatureValueAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::RemoveStructuralFeatureValueAction">
-		<param name="semanticHint" value="UML::RemoveStructuralFeatureValueAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::RemoveStructuralFeatureValueAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for RemoveVariableValueAction -->
-	<metamodelType eclass="RemoveVariableValueAction" id="org.eclipse.papyrus.uml.RemoveVariableValueAction"
+	<!-- IMetamodelType for RemoveVariableValueAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.RemoveVariableValueAction" name="UML::RemoveVariableValueAction"
+		eclass="RemoveVariableValueAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::RemoveVariableValueAction">
-		<param name="semanticHint" value="UML::RemoveVariableValueAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::RemoveVariableValueAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ReplyAction -->
-	<metamodelType eclass="ReplyAction" id="org.eclipse.papyrus.uml.ReplyAction"
+	<!-- IMetamodelType for ReplyAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.ReplyAction" name="UML::ReplyAction"
+		eclass="ReplyAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ReplyAction">
-		<param name="semanticHint" value="UML::ReplyAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ReplyAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for SendObjectAction -->
-	<metamodelType eclass="SendObjectAction" id="org.eclipse.papyrus.uml.SendObjectAction"
+	<!-- IMetamodelType for SendObjectAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.SendObjectAction" name="UML::SendObjectAction"
+		eclass="SendObjectAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::SendObjectAction">
-		<param name="semanticHint" value="UML::SendObjectAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::SendObjectAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for SendOperationEvent -->
-	<metamodelType eclass="SendOperationEvent" id="org.eclipse.papyrus.uml.SendOperationEvent"
+	<!-- IMetamodelType for SendOperationEvent -->
+	<metamodelType id="org.eclipse.papyrus.uml.SendOperationEvent" name="UML::SendOperationEvent"
+		eclass="SendOperationEvent" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::SendOperationEvent">
-		<param name="semanticHint" value="UML::SendOperationEvent"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::SendOperationEvent"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for SendSignalAction -->
-	<metamodelType eclass="SendSignalAction" id="org.eclipse.papyrus.uml.SendSignalAction"
+	<!-- IMetamodelType for SendSignalAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.SendSignalAction" name="UML::SendSignalAction"
+		eclass="SendSignalAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::SendSignalAction">
-		<param name="semanticHint" value="UML::SendSignalAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::SendSignalAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for SendSignalEvent -->
-	<metamodelType eclass="SendSignalEvent" id="org.eclipse.papyrus.uml.SendSignalEvent"
+	<!-- IMetamodelType for SendSignalEvent -->
+	<metamodelType id="org.eclipse.papyrus.uml.SendSignalEvent" name="UML::SendSignalEvent"
+		eclass="SendSignalEvent" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::SendSignalEvent">
-		<param name="semanticHint" value="UML::SendSignalEvent"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::SendSignalEvent"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for SequenceNode -->
-	<metamodelType eclass="SequenceNode" id="org.eclipse.papyrus.uml.SequenceNode"
+	<!-- IMetamodelType for SequenceNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.SequenceNode" name="UML::SequenceNode"
+		eclass="SequenceNode" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::SequenceNode">
-		<param name="semanticHint" value="UML::SequenceNode"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::SequenceNode"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Signal -->
-	<metamodelType eclass="Signal" id="org.eclipse.papyrus.uml.Signal"
+	<!-- IMetamodelType for Signal -->
+	<metamodelType id="org.eclipse.papyrus.uml.Signal" name="UML::Signal"
+		eclass="Signal" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Signal">
-		<param name="semanticHint" value="UML::Signal"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Signal"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for SignalEvent -->
-	<metamodelType eclass="SignalEvent" id="org.eclipse.papyrus.uml.SignalEvent"
+	<!-- IMetamodelType for SignalEvent -->
+	<metamodelType id="org.eclipse.papyrus.uml.SignalEvent" name="UML::SignalEvent"
+		eclass="SignalEvent" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::SignalEvent">
-		<param name="semanticHint" value="UML::SignalEvent"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::SignalEvent"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Slot -->
-	<metamodelType eclass="Slot" id="org.eclipse.papyrus.uml.Slot"
+	<!-- IMetamodelType for Slot -->
+	<metamodelType id="org.eclipse.papyrus.uml.Slot" name="UML::Slot"
+		eclass="Slot" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Slot">
-		<param name="semanticHint" value="UML::Slot"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Slot"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for StartClassifierBehaviorAction -->
-	<metamodelType eclass="StartClassifierBehaviorAction" id="org.eclipse.papyrus.uml.StartClassifierBehaviorAction"
+	<!-- IMetamodelType for StartClassifierBehaviorAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.StartClassifierBehaviorAction" name="UML::StartClassifierBehaviorAction"
+		eclass="StartClassifierBehaviorAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::StartClassifierBehaviorAction">
-		<param name="semanticHint" value="UML::StartClassifierBehaviorAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::StartClassifierBehaviorAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for StartObjectBehaviorAction -->
-	<metamodelType eclass="StartObjectBehaviorAction" id="org.eclipse.papyrus.uml.StartObjectBehaviorAction"
+	<!-- IMetamodelType for StartObjectBehaviorAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.StartObjectBehaviorAction" name="UML::StartObjectBehaviorAction"
+		eclass="StartObjectBehaviorAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::StartObjectBehaviorAction">
-		<param name="semanticHint" value="UML::StartObjectBehaviorAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::StartObjectBehaviorAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for State -->
-	<metamodelType eclass="State" id="org.eclipse.papyrus.uml.State"
+	<!-- IMetamodelType for State -->
+	<metamodelType id="org.eclipse.papyrus.uml.State" name="UML::State"
+		eclass="State" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::State">
-		<param name="semanticHint" value="UML::State"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::State"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for StateInvariant -->
-	<metamodelType eclass="StateInvariant" id="org.eclipse.papyrus.uml.StateInvariant"
+	<!-- IMetamodelType for StateInvariant -->
+	<metamodelType id="org.eclipse.papyrus.uml.StateInvariant" name="UML::StateInvariant"
+		eclass="StateInvariant" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::StateInvariant">
-		<param name="semanticHint" value="UML::StateInvariant"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::StateInvariant"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for StateMachine -->
-	<metamodelType eclass="StateMachine" id="org.eclipse.papyrus.uml.StateMachine"
+	<!-- IMetamodelType for StateMachine -->
+	<metamodelType id="org.eclipse.papyrus.uml.StateMachine" name="UML::StateMachine"
+		eclass="StateMachine" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::StateMachine">
-		<param name="semanticHint" value="UML::StateMachine"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::StateMachine"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Stereotype -->
-	<metamodelType eclass="Stereotype" id="org.eclipse.papyrus.uml.Stereotype"
+	<!-- IMetamodelType for Stereotype -->
+	<metamodelType id="org.eclipse.papyrus.uml.Stereotype" name="UML::Stereotype"
+		eclass="Stereotype" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Stereotype">
-		<param name="semanticHint" value="UML::Stereotype"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Stereotype"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for StringExpression -->
-	<metamodelType eclass="StringExpression" id="org.eclipse.papyrus.uml.StringExpression"
+	<!-- IMetamodelType for StringExpression -->
+	<metamodelType id="org.eclipse.papyrus.uml.StringExpression" name="UML::StringExpression"
+		eclass="StringExpression" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::StringExpression">
-		<param name="semanticHint" value="UML::StringExpression"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::StringExpression"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for StructuralFeature -->
-	<metamodelType eclass="StructuralFeature" id="org.eclipse.papyrus.uml.StructuralFeature"
+	<!-- IMetamodelType for StructuralFeature -->
+	<metamodelType id="org.eclipse.papyrus.uml.StructuralFeature" name="UML::StructuralFeature"
+		eclass="StructuralFeature" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::StructuralFeature">
-		<param name="semanticHint" value="UML::StructuralFeature"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::StructuralFeature"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for StructuralFeatureAction -->
-	<metamodelType eclass="StructuralFeatureAction" id="org.eclipse.papyrus.uml.StructuralFeatureAction"
+	<!-- IMetamodelType for StructuralFeatureAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.StructuralFeatureAction" name="UML::StructuralFeatureAction"
+		eclass="StructuralFeatureAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::StructuralFeatureAction">
-		<param name="semanticHint" value="UML::StructuralFeatureAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::StructuralFeatureAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for StructuredActivityNode -->
-	<metamodelType eclass="StructuredActivityNode" id="org.eclipse.papyrus.uml.StructuredActivityNode"
+	<!-- IMetamodelType for StructuredActivityNode -->
+	<metamodelType id="org.eclipse.papyrus.uml.StructuredActivityNode" name="UML::StructuredActivityNode"
+		eclass="StructuredActivityNode" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::StructuredActivityNode">
-		<param name="semanticHint" value="UML::StructuredActivityNode"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::StructuredActivityNode"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for StructuredClassifier -->
-	<metamodelType eclass="StructuredClassifier" id="org.eclipse.papyrus.uml.StructuredClassifier"
+	<!-- IMetamodelType for StructuredClassifier -->
+	<metamodelType id="org.eclipse.papyrus.uml.StructuredClassifier" name="UML::StructuredClassifier"
+		eclass="StructuredClassifier" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::StructuredClassifier">
-		<param name="semanticHint" value="UML::StructuredClassifier"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::StructuredClassifier"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Substitution -->
-	<metamodelType eclass="Substitution" id="org.eclipse.papyrus.uml.Substitution"
+	<!-- IMetamodelType for Substitution -->
+	<metamodelType id="org.eclipse.papyrus.uml.Substitution" name="UML::Substitution"
+		eclass="Substitution" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Substitution">
-		<param name="semanticHint" value="UML::Substitution"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Substitution"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for TemplateableElement -->
-	<metamodelType eclass="TemplateableElement" id="org.eclipse.papyrus.uml.TemplateableElement"
+	<!-- IMetamodelType for TemplateBinding -->
+	<metamodelType id="org.eclipse.papyrus.uml.TemplateBinding" name="UML::TemplateBinding"
+		eclass="TemplateBinding" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::TemplateableElement">
-		<param name="semanticHint" value="UML::TemplateableElement"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::TemplateBinding"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for TemplateBinding -->
-	<metamodelType eclass="TemplateBinding" id="org.eclipse.papyrus.uml.TemplateBinding"
+	<!-- IMetamodelType for TemplateParameter -->
+	<metamodelType id="org.eclipse.papyrus.uml.TemplateParameter" name="UML::TemplateParameter"
+		eclass="TemplateParameter" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::TemplateBinding">
-		<param name="semanticHint" value="UML::TemplateBinding"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::TemplateParameter"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for TemplateParameter -->
-	<metamodelType eclass="TemplateParameter" id="org.eclipse.papyrus.uml.TemplateParameter"
+	<!-- IMetamodelType for TemplateParameterSubstitution -->
+	<metamodelType id="org.eclipse.papyrus.uml.TemplateParameterSubstitution" name="UML::TemplateParameterSubstitution"
+		eclass="TemplateParameterSubstitution" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::TemplateParameter">
-		<param name="semanticHint" value="UML::TemplateParameter"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::TemplateParameterSubstitution"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for TemplateParameterSubstitution -->
-	<metamodelType eclass="TemplateParameterSubstitution" id="org.eclipse.papyrus.uml.TemplateParameterSubstitution"
+	<!-- IMetamodelType for TemplateSignature -->
+	<metamodelType id="org.eclipse.papyrus.uml.TemplateSignature" name="UML::TemplateSignature"
+		eclass="TemplateSignature" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::TemplateParameterSubstitution">
-		<param name="semanticHint" value="UML::TemplateParameterSubstitution"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::TemplateSignature"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for TemplateSignature -->
-	<metamodelType eclass="TemplateSignature" id="org.eclipse.papyrus.uml.TemplateSignature"
+	<!-- IMetamodelType for TemplateableElement -->
+	<metamodelType id="org.eclipse.papyrus.uml.TemplateableElement" name="UML::TemplateableElement"
+		eclass="TemplateableElement" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::TemplateSignature">
-		<param name="semanticHint" value="UML::TemplateSignature"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::TemplateableElement"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for TestIdentityAction -->
-	<metamodelType eclass="TestIdentityAction" id="org.eclipse.papyrus.uml.TestIdentityAction"
+	<!-- IMetamodelType for TestIdentityAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.TestIdentityAction" name="UML::TestIdentityAction"
+		eclass="TestIdentityAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::TestIdentityAction">
-		<param name="semanticHint" value="UML::TestIdentityAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::TestIdentityAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for TimeConstraint -->
-	<metamodelType eclass="TimeConstraint" id="org.eclipse.papyrus.uml.TimeConstraint"
+	<!-- IMetamodelType for TimeConstraint -->
+	<metamodelType id="org.eclipse.papyrus.uml.TimeConstraint" name="UML::TimeConstraint"
+		eclass="TimeConstraint" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::TimeConstraint">
-		<param name="semanticHint" value="UML::TimeConstraint"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::TimeConstraint"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for TimeEvent -->
-	<metamodelType eclass="TimeEvent" id="org.eclipse.papyrus.uml.TimeEvent"
+	<!-- IMetamodelType for TimeEvent -->
+	<metamodelType id="org.eclipse.papyrus.uml.TimeEvent" name="UML::TimeEvent"
+		eclass="TimeEvent" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::TimeEvent">
-		<param name="semanticHint" value="UML::TimeEvent"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::TimeEvent"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for TimeExpression -->
-	<metamodelType eclass="TimeExpression" id="org.eclipse.papyrus.uml.TimeExpression"
+	<!-- IMetamodelType for TimeExpression -->
+	<metamodelType id="org.eclipse.papyrus.uml.TimeExpression" name="UML::TimeExpression"
+		eclass="TimeExpression" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::TimeExpression">
-		<param name="semanticHint" value="UML::TimeExpression"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::TimeExpression"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for TimeInterval -->
-	<metamodelType eclass="TimeInterval" id="org.eclipse.papyrus.uml.TimeInterval"
+	<!-- IMetamodelType for TimeInterval -->
+	<metamodelType id="org.eclipse.papyrus.uml.TimeInterval" name="UML::TimeInterval"
+		eclass="TimeInterval" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::TimeInterval">
-		<param name="semanticHint" value="UML::TimeInterval"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::TimeInterval"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for TimeObservation -->
-	<metamodelType eclass="TimeObservation" id="org.eclipse.papyrus.uml.TimeObservation"
+	<!-- IMetamodelType for TimeObservation -->
+	<metamodelType id="org.eclipse.papyrus.uml.TimeObservation" name="UML::TimeObservation"
+		eclass="TimeObservation" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::TimeObservation">
-		<param name="semanticHint" value="UML::TimeObservation"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::TimeObservation"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Transition -->
-	<metamodelType eclass="Transition" id="org.eclipse.papyrus.uml.Transition"
+	<!-- IMetamodelType for Transition -->
+	<metamodelType id="org.eclipse.papyrus.uml.Transition" name="UML::Transition"
+		eclass="Transition" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Transition">
-		<param name="semanticHint" value="UML::Transition"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Transition"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Trigger -->
-	<metamodelType eclass="Trigger" id="org.eclipse.papyrus.uml.Trigger"
+	<!-- IMetamodelType for Trigger -->
+	<metamodelType id="org.eclipse.papyrus.uml.Trigger" name="UML::Trigger"
+		eclass="Trigger" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Trigger">
-		<param name="semanticHint" value="UML::Trigger"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Trigger"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Type -->
-	<metamodelType eclass="Type" id="org.eclipse.papyrus.uml.Type"
+	<!-- IMetamodelType for Type -->
+	<metamodelType id="org.eclipse.papyrus.uml.Type" name="UML::Type"
+		eclass="Type" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Type">
-		<param name="semanticHint" value="UML::Type"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Type"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for TypedElement -->
-	<metamodelType eclass="TypedElement" id="org.eclipse.papyrus.uml.TypedElement"
+	<!-- IMetamodelType for TypedElement -->
+	<metamodelType id="org.eclipse.papyrus.uml.TypedElement" name="UML::TypedElement"
+		eclass="TypedElement" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::TypedElement">
-		<param name="semanticHint" value="UML::TypedElement"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::TypedElement"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for UnmarshallAction -->
-	<metamodelType eclass="UnmarshallAction" id="org.eclipse.papyrus.uml.UnmarshallAction"
+	<!-- IMetamodelType for UnmarshallAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.UnmarshallAction" name="UML::UnmarshallAction"
+		eclass="UnmarshallAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::UnmarshallAction">
-		<param name="semanticHint" value="UML::UnmarshallAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::UnmarshallAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Usage -->
-	<metamodelType eclass="Usage" id="org.eclipse.papyrus.uml.Usage"
+	<!-- IMetamodelType for Usage -->
+	<metamodelType id="org.eclipse.papyrus.uml.Usage" name="UML::Usage"
+		eclass="Usage" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.UsageEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Usage">
-		<param name="semanticHint" value="UML::Usage"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Usage"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for UseCase -->
-	<metamodelType eclass="UseCase" id="org.eclipse.papyrus.uml.UseCase"
+	<!-- IMetamodelType for UseCase -->
+	<metamodelType id="org.eclipse.papyrus.uml.UseCase" name="UML::UseCase"
+		eclass="UseCase" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::UseCase">
-		<param name="semanticHint" value="UML::UseCase"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::UseCase"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ValuePin -->
-	<metamodelType eclass="ValuePin" id="org.eclipse.papyrus.uml.ValuePin"
+	<!-- IMetamodelType for ValuePin -->
+	<metamodelType id="org.eclipse.papyrus.uml.ValuePin" name="UML::ValuePin"
+		eclass="ValuePin" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ValuePin">
-		<param name="semanticHint" value="UML::ValuePin"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ValuePin"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ValueSpecification -->
-	<metamodelType eclass="ValueSpecification" id="org.eclipse.papyrus.uml.ValueSpecification"
+	<!-- IMetamodelType for ValueSpecification -->
+	<metamodelType id="org.eclipse.papyrus.uml.ValueSpecification" name="UML::ValueSpecification"
+		eclass="ValueSpecification" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ValueSpecification">
-		<param name="semanticHint" value="UML::ValueSpecification"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ValueSpecification"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for ValueSpecificationAction -->
-	<metamodelType eclass="ValueSpecificationAction" id="org.eclipse.papyrus.uml.ValueSpecificationAction"
+	<!-- IMetamodelType for ValueSpecificationAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.ValueSpecificationAction" name="UML::ValueSpecificationAction"
+		eclass="ValueSpecificationAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::ValueSpecificationAction">
-		<param name="semanticHint" value="UML::ValueSpecificationAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::ValueSpecificationAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Variable -->
-	<metamodelType eclass="Variable" id="org.eclipse.papyrus.uml.Variable"
+	<!-- IMetamodelType for Variable -->
+	<metamodelType id="org.eclipse.papyrus.uml.Variable" name="UML::Variable"
+		eclass="Variable" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Variable">
-		<param name="semanticHint" value="UML::Variable"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Variable"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for VariableAction -->
-	<metamodelType eclass="VariableAction" id="org.eclipse.papyrus.uml.VariableAction"
+	<!-- IMetamodelType for VariableAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.VariableAction" name="UML::VariableAction"
+		eclass="VariableAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::VariableAction">
-		<param name="semanticHint" value="UML::VariableAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::VariableAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for Vertex -->
-	<metamodelType eclass="Vertex" id="org.eclipse.papyrus.uml.Vertex"
+	<!-- IMetamodelType for Vertex -->
+	<metamodelType id="org.eclipse.papyrus.uml.Vertex" name="UML::Vertex"
+		eclass="Vertex" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::Vertex">
-		<param name="semanticHint" value="UML::Vertex"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::Vertex"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for WriteLinkAction -->
-	<metamodelType eclass="WriteLinkAction" id="org.eclipse.papyrus.uml.WriteLinkAction"
+	<!-- IMetamodelType for WriteLinkAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.WriteLinkAction" name="UML::WriteLinkAction"
+		eclass="WriteLinkAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::WriteLinkAction">
-		<param name="semanticHint" value="UML::WriteLinkAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::WriteLinkAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for WriteStructuralFeatureAction -->
-	<metamodelType eclass="WriteStructuralFeatureAction" id="org.eclipse.papyrus.uml.WriteStructuralFeatureAction"
+	<!-- IMetamodelType for WriteStructuralFeatureAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.WriteStructuralFeatureAction" name="UML::WriteStructuralFeatureAction"
+		eclass="WriteStructuralFeatureAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::WriteStructuralFeatureAction">
-		<param name="semanticHint" value="UML::WriteStructuralFeatureAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::WriteStructuralFeatureAction"/>
 	</metamodelType>
 	
-	<!-- IElementTypes for WriteVariableAction -->
-	<metamodelType eclass="WriteVariableAction" id="org.eclipse.papyrus.uml.WriteVariableAction"
+	<!-- IMetamodelType for WriteVariableAction -->
+	<metamodelType id="org.eclipse.papyrus.uml.WriteVariableAction" name="UML::WriteVariableAction"
+		eclass="WriteVariableAction" 
 		edithelper="org.eclipse.papyrus.uml.service.types.helper.DefaultUMLEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" name="UML::WriteVariableAction">
-		<param name="semanticHint" value="UML::WriteVariableAction"/>
+		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+			<param name="semanticHint" value="UML::WriteVariableAction"/>
 	</metamodelType>
 	
+	</metamodel>
+</extension>
 
-	<!-- Declaration of AdviceBindings -->
+<!-- Helper advice declarations -->
+<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
+
+	<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
+	
+	<!-- Helper advice for Classifier -->
+	<adviceBinding id="org.eclipse.papyrus.uml.advice.Classifier"
+		class="org.eclipse.papyrus.uml.service.types.helper.advice.ClassifierHelperAdvice"
+		inheritance="all" typeId="org.eclipse.papyrus.uml.Classifier">
+	</adviceBinding>
+	
+	<!-- Helper advice for Collaboration -->
+	<adviceBinding id="org.eclipse.papyrus.uml.advice.Collaboration"
+		class="org.eclipse.papyrus.uml.service.types.helper.advice.CollaborationHelperAdvice"
+		inheritance="none" typeId="org.eclipse.papyrus.uml.Collaboration">
+	</adviceBinding>
+	
+	<!-- Helper advice for CollaborationUse -->
+	<adviceBinding id="org.eclipse.papyrus.uml.advice.CollaborationUse"
+		class="org.eclipse.papyrus.uml.service.types.helper.advice.CollaborationUseHelperAdvice"
+		inheritance="none" typeId="org.eclipse.papyrus.uml.CollaborationUse">
+	</adviceBinding>
+	
+	<!-- Helper advice for ConnectorEnd -->
+	<adviceBinding id="org.eclipse.papyrus.uml.advice.ConnectorEnd"
+		class="org.eclipse.papyrus.uml.service.types.helper.advice.ConnectorEndHelperAdvice"
+		inheritance="none" typeId="org.eclipse.papyrus.uml.ConnectorEnd">
+	</adviceBinding>
+	
+	<!-- Helper advice for DestructionEvent -->
+	<adviceBinding id="org.eclipse.papyrus.uml.advice.DestructionEvent"
+		class="org.eclipse.papyrus.uml.service.types.helper.advice.DestructionEventHelperAdvice"
+		inheritance="all" typeId="org.eclipse.papyrus.uml.DestructionEvent">
+	</adviceBinding>
+	
+	<!-- Helper advice for Element -->
+	<adviceBinding id="org.eclipse.papyrus.uml.advice.ElementUnapplyStereotype"
+		class="org.eclipse.papyrus.uml.service.types.helper.advice.ElementUnapplyStereotypeHelperAdvice"
+		inheritance="all" typeId="org.eclipse.papyrus.uml.Element">
+	</adviceBinding>
+	
+	<!-- Helper advice for ExecutionSpecification -->
+	<adviceBinding id="org.eclipse.papyrus.uml.advice.ExecutionSpecification"
+		class="org.eclipse.papyrus.uml.service.types.helper.advice.ExecutionSpecificationHelperAdvice"
+		inheritance="all" typeId="org.eclipse.papyrus.uml.ExecutionSpecification">
+	</adviceBinding>
+	
+	<!-- Helper advice for Generalization -->
+	<adviceBinding id="org.eclipse.papyrus.uml.advice.Generalization"
+		class="org.eclipse.papyrus.uml.service.types.helper.advice.GeneralizationHelperAdvice"
+		inheritance="none" typeId="org.eclipse.papyrus.uml.Generalization">
+	</adviceBinding>
+	
+	<!-- Helper advice for Lifeline -->
+	<adviceBinding id="org.eclipse.papyrus.uml.advice.Lifeline"
+		class="org.eclipse.papyrus.uml.service.types.helper.advice.LifelineHelperAdvice"
+		inheritance="all" typeId="org.eclipse.papyrus.uml.Lifeline">
+	</adviceBinding>
+	
+	<!-- Helper advice for Message -->
+	<adviceBinding id="org.eclipse.papyrus.uml.advice.Message"
+		class="org.eclipse.papyrus.uml.service.types.helper.advice.MessageHelperAdvice"
+		inheritance="all" typeId="org.eclipse.papyrus.uml.Message">
+	</adviceBinding>
+	
+	<!-- Helper advice for MessageEnd -->
+	<adviceBinding id="org.eclipse.papyrus.uml.advice.MessageEnd"
+		class="org.eclipse.papyrus.uml.service.types.helper.advice.MessageEndHelperAdvice"
+		inheritance="all" typeId="org.eclipse.papyrus.uml.MessageEnd">
+	</adviceBinding>
+	
+	<!-- Helper advice for NamedElement -->
+	<adviceBinding id="org.eclipse.papyrus.uml.advice.NameElementInitializer"
+		class="org.eclipse.papyrus.uml.service.types.helper.advice.NamedElementInitializerHelperAdvice"
+		inheritance="all" typeId="org.eclipse.papyrus.uml.NamedElement">
+	</adviceBinding>
+	
+	<!-- Helper advice for OccurrenceSpecification -->
+	<adviceBinding id="org.eclipse.papyrus.uml.advice.OccurrenceSpecification"
+		class="org.eclipse.papyrus.uml.service.types.helper.advice.OccurrenceSpecificationHelperAdvice"
+		inheritance="all" typeId="org.eclipse.papyrus.uml.OccurrenceSpecification">
+	</adviceBinding>
+	
+	<!-- Helper advice for PartDecomposition -->
+	<adviceBinding id="org.eclipse.papyrus.uml.advice.PartDecomposition"
+		class="org.eclipse.papyrus.uml.service.types.helper.advice.PartDecompositionHelperAdvice"
+		inheritance="none" typeId="org.eclipse.papyrus.uml.PartDecomposition">
+	</adviceBinding>
+	
+	<!-- Helper advice for Property -->
+	<adviceBinding id="org.eclipse.papyrus.uml.advice.Property"
+		class="org.eclipse.papyrus.uml.service.types.helper.advice.PropertyHelperAdvice"
+		inheritance="all" typeId="org.eclipse.papyrus.uml.Property">
+	</adviceBinding>
 	
-   
 	</metamodel>
+</extension>
+
+<!-- UML ElementType bindings to Papyrus shared IClientContext -->
+<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">
 
+	<!-- Bindings declaration -->
+	<binding context="org.eclipse.papyrus.service.edit.TypeContext">
+	
+		<elementType pattern="org.eclipse.papyrus.uml.*" />
+		<advice ref="org.eclipse.papyrus.uml.advice.Classifier" />
+		<advice ref="org.eclipse.papyrus.uml.advice.Collaboration" />
+		<advice ref="org.eclipse.papyrus.uml.advice.CollaborationUse" />
+		<advice ref="org.eclipse.papyrus.uml.advice.ConnectorEnd" />
+		<advice ref="org.eclipse.papyrus.uml.advice.DestructionEvent" />
+		<advice ref="org.eclipse.papyrus.uml.advice.ElementUnapplyStereotype" />
+		<advice ref="org.eclipse.papyrus.uml.advice.ExecutionSpecification" />
+		<advice ref="org.eclipse.papyrus.uml.advice.Generalization" />
+		<advice ref="org.eclipse.papyrus.uml.advice.Lifeline" />
+		<advice ref="org.eclipse.papyrus.uml.advice.Message" />
+		<advice ref="org.eclipse.papyrus.uml.advice.MessageEnd" />
+		<advice ref="org.eclipse.papyrus.uml.advice.NameElementInitializer" />
+		<advice ref="org.eclipse.papyrus.uml.advice.OccurrenceSpecification" />
+		<advice ref="org.eclipse.papyrus.uml.advice.PartDecomposition" />
+		<advice ref="org.eclipse.papyrus.uml.advice.Property" />
+
+	</binding>
+	
 </extension>
 
 </plugin>