898 files changed, 53306 insertions, 56725 deletions

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteConfigurationWizard.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteConfigurationWizard.java
index 3a36a8aa635..a16b2e6ac4c 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteConfigurationWizard.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteConfigurationWizard.java
@@ -25,6 +25,8 @@ import org.eclipse.papyrus.customization.palette.Messages;
 import org.eclipse.papyrus.customization.palette.PaletteConstants;
 import org.eclipse.papyrus.customization.palette.PaletteConstants.PaletteModelContextEnum;
 import org.eclipse.papyrus.customization.palette.utils.PaletteUtils;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
 import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;
 import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
 import org.eclipse.papyrus.uml.diagram.common.Activator;
@@ -186,12 +188,18 @@ public class PaletteConfigurationWizard extends AbstractPaletteConfigurationWiza
 	 */
 	protected void deployElementTypesModels() {
 		// deploy element types configuration files
-		if (!elementTypeSemResource.getContents().isEmpty() && !elementTypeUIResource.getContents().isEmpty()) {
-			ElementTypeSetConfigurationRegistry.getInstance().unload(getClientContext(), ((ElementTypeSetConfiguration) elementTypeSemResource.getContents().get(0)).getIdentifier());
-			ElementTypeSetConfigurationRegistry.getInstance().unload(getClientContext(), ((ElementTypeSetConfiguration) elementTypeUIResource.getContents().get(0)).getIdentifier());
-
-			ElementTypeSetConfigurationRegistry.getInstance().loadElementTypeSetConfiguration(getClientContext(), ((ElementTypeSetConfiguration) elementTypeSemResource.getContents().get(0)));
-			ElementTypeSetConfigurationRegistry.getInstance().loadElementTypeSetConfiguration(getClientContext(), ((ElementTypeSetConfiguration) elementTypeUIResource.getContents().get(0)));
+		try {
+			if (!elementTypeSemResource.getContents().isEmpty() && !elementTypeUIResource.getContents().isEmpty()) {
+				String clientContext = TypeContext.getDefaultContext().getId();
+
+				ElementTypeSetConfigurationRegistry.getInstance().unload(clientContext, ((ElementTypeSetConfiguration) elementTypeSemResource.getContents().get(0)).getIdentifier());
+				ElementTypeSetConfigurationRegistry.getInstance().unload(clientContext, ((ElementTypeSetConfiguration) elementTypeUIResource.getContents().get(0)).getIdentifier());
+	
+				ElementTypeSetConfigurationRegistry.getInstance().loadElementTypeSetConfiguration(clientContext, ((ElementTypeSetConfiguration) elementTypeSemResource.getContents().get(0)));
+				ElementTypeSetConfigurationRegistry.getInstance().loadElementTypeSetConfiguration(clientContext, ((ElementTypeSetConfiguration) elementTypeUIResource.getContents().get(0)));
+			}
+		} catch (ServiceException e) {
+			Activator.log.error(e);
 		}
 	}
 
@@ -256,24 +264,17 @@ public class PaletteConfigurationWizard extends AbstractPaletteConfigurationWiza
 				elementTypeUIResource.save(PaletteUtils.saveOptions);
 				elementTypeSemResource.save(PaletteUtils.saveOptions);
 			} else {
-				ElementTypeSetConfigurationRegistry.getInstance().unload(getClientContext(), ((ElementTypeSetConfiguration) elementTypeSemResource.getContents().get(0)).getIdentifier());
-				ElementTypeSetConfigurationRegistry.getInstance().unload(getClientContext(), ((ElementTypeSetConfiguration) elementTypeUIResource.getContents().get(0)).getIdentifier());
+				String clientContext = TypeContext.getDefaultContext().getId();
+				ElementTypeSetConfigurationRegistry.getInstance().unload(clientContext, ((ElementTypeSetConfiguration) elementTypeSemResource.getContents().get(0)).getIdentifier());
+				ElementTypeSetConfigurationRegistry.getInstance().unload(clientContext, ((ElementTypeSetConfiguration) elementTypeUIResource.getContents().get(0)).getIdentifier());
 				elementTypeUIResource.delete(Collections.EMPTY_MAP);
 				elementTypeSemResource.delete(Collections.EMPTY_MAP);
 			}
 		} catch (IOException e) {
 			Activator.log.error(e);
+		} catch (ServiceException e) {
+			Activator.log.error(e);
 		}
 	}
 
-	/**
-	 * @return The client context of element types.
-	 * 
-	 *         TODO: switch it with point of you context if needed.
-	 */
-	protected String getClientContext() {
-		return "org.eclipse.papyrus.infra.services.edit.TypeContext";//$NON-NLS-1$
-	}
-
-
 }
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/CustomizationDialog.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/CustomizationDialog.java
new file mode 100644
index 00000000000..275c771f8aa
--- /dev/null
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/CustomizationDialog.java
@@ -0,0 +1,335 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - Factor out workspace storage for pluggable storage providers (CDO)
+ *  Christian W. Damus - bug 482927
+ *****************************************************************************/
+package org.eclipse.papyrus.customization.properties.ui;
+
+import java.util.Collection;
+
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.IInputValidator;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.TrayDialog;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.ListViewer;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.customization.properties.Activator;
+import org.eclipse.papyrus.customization.properties.messages.Messages;
+import org.eclipse.papyrus.customization.properties.storage.actions.ContextStorageActionRegistry;
+import org.eclipse.papyrus.customization.properties.storage.actions.IContextCopyAction;
+import org.eclipse.papyrus.customization.properties.storage.actions.IContextDeleteAction;
+import org.eclipse.papyrus.customization.properties.storage.actions.IContextEditAction;
+import org.eclipse.papyrus.customization.properties.storage.actions.IContextStorageActionProvider;
+import org.eclipse.papyrus.infra.properties.contexts.Context;
+import org.eclipse.papyrus.infra.properties.ui.runtime.PropertiesRuntime;
+import org.eclipse.papyrus.infra.widgets.editors.InputDialog;
+import org.eclipse.papyrus.infra.widgets.providers.CollectionContentProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.List;
+import org.eclipse.swt.widgets.Shell;
+
+/**
+ * A Dialog to display the operations available to customize
+ * the property view, such as "Copy", "Edit" or "Delete" an
+ * existing representationKind.
+ *
+ * @author Camille Letavernier
+ */
+public class CustomizationDialog extends TrayDialog implements SelectionListener {
+
+	private final ContextStorageActionRegistry actionRegistry;
+
+	private List availableContexts;
+
+	private ListViewer availableContextsViewer;
+
+	private java.util.List<Button> copyContextButtons;
+
+	private Button editContext;
+
+	private Button removeContext;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param shell
+	 *            The shell in which the dialog will be opened
+	 */
+	public CustomizationDialog(final Shell shell) {
+		super(shell);
+
+		this.actionRegistry = new ContextStorageActionRegistry();
+	}
+
+	@Override
+	public void create() {
+		super.create();
+		super.getShell().setText(Messages.CustomizationDialog_customization);
+		super.getShell().setImage(Activator.getDefault().getImage("/icons/papyrus.png")); //$NON-NLS-1$
+
+		Composite contents = new Composite(getDialogArea(), SWT.NONE);
+		contents.setLayout(new GridLayout(2, false));
+		contents.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+
+		Label label = new Label(contents, SWT.NONE);
+		label.setText(Messages.CustomizationDialog_selectContextToEdit);
+		label.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));
+
+		Collection<Context> contexts = PropertiesRuntime.getConfigurationManager().getCustomizableContexts();
+
+		availableContexts = new List(contents, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
+		availableContexts.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+
+		availableContextsViewer = new ListViewer(availableContexts);
+		availableContextsViewer.setContentProvider(CollectionContentProvider.instance);
+		availableContextsViewer.setLabelProvider(new LabelProvider() {
+
+			@Override
+			public String getText(final Object element) {
+				if (element != null && element instanceof Context) {
+					Context context = (Context) element;
+					return context.getUserLabel() + (PropertiesRuntime.getConfigurationManager().isPlugin(context) ? Messages.CustomizationDialog_plugin : ""); //$NON-NLS-1$
+				}
+				return super.getText(element);
+			}
+		});
+		availableContextsViewer.setInput(contexts);
+		availableContexts.addSelectionListener(this);
+
+		Composite controls = new Composite(contents, SWT.NONE);
+		controls.setLayout(new FillLayout(SWT.VERTICAL));
+
+		Collection<IContextStorageActionProvider> providers = actionRegistry.getStorageActionProviders();
+		copyContextButtons = new java.util.ArrayList<Button>(providers.size());
+		for (IContextStorageActionProvider next : providers) {
+			IContextCopyAction copyAction = next.getContextCopyAction();
+			if (copyAction != null) {
+				Button copyContext = new Button(controls, SWT.PUSH);
+				copyContext.setText(copyAction.getLabel());
+				copyContext.setToolTipText(copyAction.getToolTip());
+				copyContext.setData(copyAction);
+				copyContext.setEnabled(false);
+				copyContext.addSelectionListener(this);
+
+				copyContextButtons.add(copyContext);
+			}
+		}
+		if (copyContextButtons.size() == 1) {
+			// special case: use a simpler label than "Copy to Workspace..."
+			copyContextButtons.get(0).setText(Messages.CustomizationDialog_copy);
+		}
+
+		editContext = new Button(controls, SWT.PUSH);
+		editContext.setText(Messages.CustomizationDialog_edit);
+		editContext.setToolTipText(Messages.CustomizationDialog_editSelectedContext);
+		editContext.setEnabled(false);
+		editContext.addSelectionListener(this);
+
+		removeContext = new Button(controls, SWT.PUSH);
+		removeContext.setText(Messages.CustomizationDialog_delete);
+		removeContext.setToolTipText(Messages.CustomizationDialog_removeSelectedContext);
+		removeContext.setEnabled(false);
+		removeContext.addSelectionListener(this);
+
+		availableContextsViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+
+			@Override
+			public void selectionChanged(final SelectionChangedEvent event) {
+				IStructuredSelection selection = (IStructuredSelection) event.getSelection();
+				boolean activate = false;
+
+				IContextStorageActionProvider provider = null;
+				if (!selection.isEmpty()) {
+					Context context = (Context) selection.getFirstElement();
+					activate = !PropertiesRuntime.getConfigurationManager().isPlugin(context);
+					provider = actionRegistry.getStorageActionProvider(context);
+				}
+
+				editContext.setEnabled(activate);
+				IContextEditAction editAction = provider.getContextEditAction();
+				editContext.setToolTipText((editAction == null) ? null : editAction.getToolTip());
+				for (Button next : copyContextButtons) {
+					next.setEnabled(!selection.isEmpty());
+				}
+				removeContext.setEnabled(activate);
+				IContextDeleteAction deleteAction = provider.getContextDeleteAction();
+				removeContext.setToolTipText((deleteAction == null) ? null : deleteAction.getToolTip());
+			}
+
+		});
+
+		// generateContext = new Button(controls, SWT.PUSH);
+		// generateContext.setText("Generate");
+		// generateContext.setToolTipText("Generates a new Context from a Metamodel");
+		// generateContext.setEnabled(false);
+
+		getShell().pack();
+	}
+
+	protected void editAction() {
+		IStructuredSelection selection = (IStructuredSelection) availableContextsViewer.getSelection();
+		if (selection.isEmpty()) {
+			return;
+		}
+
+		Object element = selection.getFirstElement();
+		if (element instanceof Context) {
+			Context sourceContext = (Context) element;
+
+			IContextEditAction editAction = actionRegistry.getContextEditAction(sourceContext);
+			if (editAction == null) {
+				MessageDialog.openError(getShell(), Messages.CustomizationDialog_0, Messages.CustomizationDialog_1);
+				return;
+			}
+
+			try {
+				EditContextAction action = new EditContextAction(editAction);
+				action.openEditor(sourceContext);
+				close();
+			} catch (Exception ex) {
+				Activator.log.error("An error occured while initializing the customization editor", ex); //$NON-NLS-1$
+				return;
+			}
+		}
+	}
+
+	protected void copyAction(IContextCopyAction copyAction) {
+		IStructuredSelection selection = (IStructuredSelection) availableContextsViewer.getSelection();
+		if (selection.isEmpty()) {
+			return;
+		}
+
+		Object element = selection.getFirstElement();
+		if (element instanceof Context) {
+			Context sourceContext = (Context) element;
+			CopyContextAction action = new CopyContextAction(copyAction);
+
+			try {
+				InputDialog dialog = new InputDialog(getShell(), Messages.CustomizationDialog_enterConfigurationName, Messages.CustomizationDialog_enterConfigurationName, Messages.CustomizationDialog_copyOf + sourceContext.getName(), new IInputValidator() {
+
+					@Override
+					public String isValid(final String newText) {
+						if (newText.trim().equals("")) { //$NON-NLS-1$
+							return Messages.CustomizationDialog_configurationNameNotEmpty;
+						}
+						if (PropertiesRuntime.getConfigurationManager().getContext(newText) != null) {
+							return Messages.CustomizationDialog_configurationWithSameNameExists;
+						}
+						return null;
+					}
+
+				});
+				dialog.setTitle(Messages.CustomizationDialog_configurationName);
+				int result = dialog.open();
+				if (result == Window.OK) {
+					String targetName = dialog.getText();
+					Context newContext = action.copy(sourceContext, targetName, false);
+					if (newContext != null) {
+						availableContextsViewer.setInput(PropertiesRuntime.getConfigurationManager().getContexts());
+						availableContextsViewer.setSelection(new StructuredSelection(newContext), true);
+					}
+				}
+			} catch (Exception ex) {
+				Activator.log.error(ex);
+			}
+		}
+	}
+
+	protected void deleteAction() {
+		IStructuredSelection selection = (IStructuredSelection) availableContextsViewer.getSelection();
+		if (selection.isEmpty()) {
+			return;
+		}
+
+		Object element = selection.getFirstElement();
+		if (element instanceof Context) {
+			Context sourceContext = (Context) element;
+			if (PropertiesRuntime.getConfigurationManager().isPlugin(sourceContext)) {
+				Activator.log.warn(Messages.CustomizationDialog_cannotDeletePluginContext);
+				// Plugin context cannot be deleted
+				return;
+			}
+
+			IContextDeleteAction deleteAction = actionRegistry.getContextDeleteAction(sourceContext);
+			if (deleteAction == null) {
+				MessageDialog.openError(getShell(), Messages.CustomizationDialog_deleteContext, Messages.CustomizationDialog_2);
+				return;
+			}
+
+			MessageDialog dialog = new MessageDialog(getShell(), Messages.CustomizationDialog_deleteContext, null, Messages.CustomizationDialog_deleteContextConfirmation1 + sourceContext.getUserLabel() + Messages.CustomizationDialog_deleteContextConfirmation2,
+					MessageDialog.CONFIRM, new String[] { IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL }, 2);
+			int result = dialog.open();
+			if (result == 0) { // 0 is "Yes" (It is *not* the same 0 as Window.OK)
+				RemoveContextAction action = new RemoveContextAction(deleteAction);
+				action.removeContext(sourceContext);
+				availableContextsViewer.setInput(PropertiesRuntime.getConfigurationManager().getContexts());
+			}
+		}
+	}
+
+	@Override
+	protected int getShellStyle() {
+		return super.getShellStyle() | SWT.RESIZE;
+	}
+
+	@Override
+	protected Composite getDialogArea() {
+		return (Composite) super.getDialogArea();
+	}
+
+
+	@Override
+	public void widgetSelected(final SelectionEvent e) {
+		if (e.widget == editContext) {
+			editAction();
+		} else if (e.widget == removeContext) {
+			deleteAction();
+		} else if (e.widget.getData() instanceof IContextCopyAction) {
+			copyAction((IContextCopyAction) e.widget.getData());
+		}
+	}
+
+	@Override
+	public void widgetDefaultSelected(final SelectionEvent e) {
+		if (e.widget == availableContexts) {
+			IStructuredSelection selection = (IStructuredSelection) availableContextsViewer.getSelection();
+			if (!selection.isEmpty()) {
+				Context context = (Context) selection.getFirstElement();
+				if (PropertiesRuntime.getConfigurationManager().isPlugin(context)) {
+					if (copyContextButtons.size() == 1) {
+						copyAction((IContextCopyAction) copyContextButtons.get(0).getData());
+					}
+				} else {
+					editAction();
+				}
+			}
+		}
+	}
+
+	@Override
+	public boolean isResizable() {
+		return true;
+	}
+}
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/commands/CreateNodeCommand.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/commands/CreateNodeCommand.xtend
index 93db05c6778..ab940ff8036 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/commands/CreateNodeCommand.xtend
+++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/commands/CreateNodeCommand.xtend
@@ -184,7 +184,7 @@ import xpt.diagram.Utils_qvto
 	«ENDIF»
 	
 	org.eclipse.emf.ecore.EObject target = getElementToEdit();
-	org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData data = org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), «MetaClass(metaClass)»);
+	org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData data = org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), «MetaClass(metaClass)»);
 	return data.isPermitted();
 
 	'''
@@ -194,7 +194,7 @@ import xpt.diagram.Utils_qvto
 		«xptMetaModel.NewInstance(it.metaClass, varName)»
 		
 		org.eclipse.emf.ecore.EObject target = getElementToEdit();
-				org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData data = org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker.getCurrent().getChildAddData(diagram, target, «varName»);
+				org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData data = org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker.getFor(target).getChildAddData(diagram, target, «varName»);
 				if (data.isPermitted()) {
 					if (data.isPathDefined()) {
 						if (!data.execute(target, «varName»)) {
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/BaseItemSemanticEditPolicy.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/BaseItemSemanticEditPolicy.xtend
index 5cbb6d18b97..e211ac08408 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/BaseItemSemanticEditPolicy.xtend
+++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/BaseItemSemanticEditPolicy.xtend
@@ -10,7 +10,7 @@
  *    Alexander Shatalin (Borland) - initial API and implementation
  *    Michael Golubev (Montages) - #386838 - migrate to Xtend2
  *    Christian W. Damus - bug 451230
- */

+ */
 package aspects.xpt.diagram.editpolicies
 
 import aspects.xpt.Common
@@ -29,16 +29,16 @@ import xpt.editor.VisualIDRegistry
 import xpt.providers.ElementTypes
 
 //Documentation: PapyrusGenCode
-//This tamplate has been modified in order to allow the moving command

-@Singleton class BaseItemSemanticEditPolicy extends xpt.diagram.editpolicies.BaseItemSemanticEditPolicy {

-	@Inject extension Common;

-	@Inject Activator xptPluginActivator;

-	@Inject extension VisualIDRegistry

-	@Inject ElementTypes xptElementTypes;

-	@Inject extension OclMigrationProblems_qvto;

-	@Inject extension xpt.diagram.editpolicies.Utils_qvto

-	@Inject MetaModel xptMetaModel;

-

+//This tamplate has been modified in order to allow the moving command
+@Singleton class BaseItemSemanticEditPolicy extends xpt.diagram.editpolicies.BaseItemSemanticEditPolicy {
+	@Inject extension Common;
+	@Inject Activator xptPluginActivator;
+	@Inject extension VisualIDRegistry
+	@Inject ElementTypes xptElementTypes;
+	@Inject extension OclMigrationProblems_qvto;
+	@Inject extension xpt.diagram.editpolicies.Utils_qvto
+	@Inject MetaModel xptMetaModel;
+
 	override BaseItemSemanticEditPolicy(GenDiagram it) '''
 «copyright(editorGen)»
 package «packageName(it)»;
@@ -50,9 +50,9 @@ public class «className(it)» extends org.eclipse.gmf.runtime.diagram.ui.editpoli
 	
 	«constructor(it)»
 
-	«generatedMemberComment(

-		'Extended request data key to hold editpart visual id.\n' + 'Add visual id of edited editpart to extended data of the request\n' + 'so command switch can decide what kind of diagram element is being edited.\n' + 'It is done in those cases when it\'s not possible to deduce diagram\n' + 'element kind from domain element.\n' + 'Add the reoriented view to the request extended data so that the view\n ' + 'currently edited can be distinguished from other views of the same element\n ' +

-			'and these latter possibly removed if they become inconsistent after reconnect\n'

+	«generatedMemberComment(
+		'Extended request data key to hold editpart visual id.\n' + 'Add visual id of edited editpart to extended data of the request\n' + 'so command switch can decide what kind of diagram element is being edited.\n' + 'It is done in those cases when it\'s not possible to deduce diagram\n' + 'element kind from domain element.\n' + 'Add the reoriented view to the request extended data so that the view\n ' + 'currently edited can be distinguished from other views of the same element\n ' +
+			'and these latter possibly removed if they become inconsistent after reconnect\n'
 	)»
 	@SuppressWarnings("unchecked")
 	public org.eclipse.gef.commands.Command getCommand(org.eclipse.gef.Request request) {
@@ -88,7 +88,7 @@ public class «className(it)» extends org.eclipse.gmf.runtime.diagram.ui.editpoli
 	«additions(it)»
 }
 '''
-

+
 override def addDestroyShortcutsCommand(GenDiagram it) '''
 	«generatedMemberComment('Clean all shortcuts to the host element from the same diagram')»
 	protected void addDestroyShortcutsCommand(org.eclipse.gmf.runtime.common.core.command.ICompositeCommand cmd, org.eclipse.gmf.runtime.notation.View view) {
@@ -102,17 +102,17 @@ override def addDestroyShortcutsCommand(GenDiagram it) '''
 		}
 	}
 '''
-

-	override attributes(GenDiagram it) '''

+
+	override attributes(GenDiagram it) '''
 		«generatedMemberComment('Extended request data key to hold editpart visual id.')»
 		public static final String VISUAL_ID_KEY = "visual_id"; «nonNLS()»
 		«generatedMemberComment('Extended request data key to hold the edge view during a reconnect request.')»
 		public static final String GRAPHICAL_RECONNECTED_EDGE = "graphical_edge"; «nonNLS»
 		«generatedMemberComment()»
 		private final org.eclipse.gmf.runtime.emf.type.core.IElementType myElementType;
-	'''

-

-	override semanticPart(GenDiagram it) '''

+	'''
+
+	override semanticPart(GenDiagram it) '''
 		«getSemanticCommand(it)»
 		
 		«addDeleteViewCommand(it)»
@@ -148,16 +148,16 @@ override def addDestroyShortcutsCommand(GenDiagram it) '''
 		«getReorientRelationshipCommand(it)»
 		
 		«getGEFWrapper(it)»
-	'''

-

-	override getContextElementType(GenDiagram it) '''

+	'''
+
+	override getContextElementType(GenDiagram it) '''
 		«generatedMemberComment()»
 		protected org.eclipse.gmf.runtime.emf.type.core.IElementType getContextElementType(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest request) {
 			org.eclipse.gmf.runtime.emf.type.core.IElementType requestContextElementType = «xptElementTypes.qualifiedClassName(it)».getElementType(getVisualID(request));
 			return requestContextElementType != null ? requestContextElementType : myElementType;
 		}
-	'''

-

+	'''
+
 	override getCreateRelationshipCommand(GenDiagram it) '''
 «generatedMemberComment()»
 protected org.eclipse.gef.commands.Command getCreateRelationshipCommand(org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest req) {
@@ -167,7 +167,7 @@ protected org.eclipse.gef.commands.Command getCreateRelationshipCommand(org.ecli
 	«IF it.eResource.allContents.filter(typeof(GenerateUsingElementTypeCreationCommand)).size() > 0»
 	org.eclipse.papyrus.infra.services.edit.service.IElementEditService commandService = org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils.getCommandProvider(((org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart)getHost()).resolveSemanticElement());
 	if(req.getElementType() != null) {
-		commandService = org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils.getCommandProvider(req.getElementType());
+		commandService = org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils.getCommandProvider(req.getElementType(), req.getClientContext());
 	}
 
 	if(commandService == null) {
@@ -182,8 +182,8 @@ protected org.eclipse.gef.commands.Command getCreateRelationshipCommand(org.ecli
 	return org.eclipse.gef.commands.UnexecutableCommand.INSTANCE;
 	«ENDIF»
 }
-'''

-

+'''
+
 	override getCreateCommand(GenDiagram it) '''
 «generatedMemberComment()»
 	protected org.eclipse.gef.commands.Command getCreateCommand(org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest req) {
@@ -199,9 +199,9 @@ protected org.eclipse.gef.commands.Command getCreateRelationshipCommand(org.ecli
 		}
 		return null;
 	}
-'''

-

-

+'''
+
+
 	override getMoveCommand(GenDiagram it) '''
 «generatedMemberComment()»
 protected org.eclipse.gef.commands.Command getMoveCommand(org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest req) {
@@ -223,15 +223,15 @@ protected org.eclipse.gef.commands.Command getMoveCommand(org.eclipse.gmf.runtim
 	««« END: PapyrusGenCode
 	
 }
-'''

-

+'''
+
 	/**
  *		FIXME need to check constraint's provider to ensure we don't generate a field
  *		for e.g. Java (or Literal, which is unlikely, though) expressions
  * 
  * 		[Papyrus Quick Fix] Do not generate field when the expression is provided
  * 		by a GenJavaExpressionProvider.
- */

+ */
 	override linkConstraints(GenDiagram it) '''
 
 	«generatedMemberComment()»
@@ -259,15 +259,15 @@ public static class «getLinkCreationConstraintsClassName()» {
 	«canExist(nextLink)»
 	«ENDFOR»
 }
-'''

-

+'''
+
 	/**
  * [MG] extracted from LET statement, @see checkEMFConstraints(TypeLinkModelFacet)
- */

-	private def checkChildFeatureBounds(TypeLinkModelFacet it) {

-		childMetaFeature != containmentMetaFeature && !isUnbounded(childMetaFeature.ecoreFeature)

-	}

-

+ */
+	private def checkChildFeatureBounds(TypeLinkModelFacet it) {
+		childMetaFeature != containmentMetaFeature && !isUnbounded(childMetaFeature.ecoreFeature)
+	}
+
 	def checkEMFConstraints(TypeLinkModelFacet it) '''
 «IF containmentMetaFeature.ecoreFeature != null»
 		«IF ! isUnbounded(containmentMetaFeature.ecoreFeature) || checkChildFeatureBounds(it)»
@@ -279,8 +279,8 @@ public static class «getLinkCreationConstraintsClassName()» {
 			}
 		«ENDIF»
 «ENDIF»
-'''

-

+'''
+
 	override checkEMFConstraints(GenFeature it, TypeLinkModelFacet modelFacet) '''
 «IF modelFacet.containmentMetaFeature.ecoreFeature != null»
 «IF ! isUnbounded(ecoreFeature)»
@@ -289,8 +289,8 @@ if («featureBoundComparator(it, getContainerVariable(modelFacet), modelFacet.get
 }
 «ENDIF»
 «ENDIF»
-'''

-

+'''
+
 	override canCreate(GenLink it) '''
 «generatedMemberComment()»
 public boolean canCreate«stringUniqueIdentifier()»(
@@ -307,8 +307,8 @@ public boolean canCreate«stringUniqueIdentifier()»(
 	«ENDIF»
 	);
 }
-'''

-

+'''
+
 	override featureBoundsConditionClause(GenFeature it, String targetVar, GenClass targetType) '''
 «««Checking upper bounds if was specified in MM
 «IF ecoreFeature != null»
@@ -318,17 +318,17 @@ public boolean canCreate«stringUniqueIdentifier()»(
 	«««	Checking uniqueness in if upper bounds !- 1
 	«IF ! isSingleValued(ecoreFeature)»«featureUniquenessComparator(it, targetVar, targetType)»«ENDIF»
 «ENDIF»
-'''

-

-	override featureBoundComparator(GenFeature it, String featureVar, GenClass featureVarGenClass) '''

+'''
+
+	override featureBoundComparator(GenFeature it, String featureVar, GenClass featureVarGenClass) '''
 		«xptMetaModel.getFeatureValue(it, featureVar, featureVarGenClass)»
-		«IF ecoreFeature.upperBound == 1»

+		«IF ecoreFeature.upperBound == 1»
 			!= null
-		«ELSE»

+		«ELSE»
 			.size() >= «ecoreFeature.upperBound»
-		«ENDIF»

-	'''

-

+		«ENDIF»
+	'''
+
 	// Generate generic method if using semantic creation command based on element types framework.
 	def getCreateSemanticServiceEditCommand(GenDiagram it) '''
 «IF it.eResource.allContents.filter(typeof(GenerateUsingElementTypeCreationCommand)).size > 0»
@@ -341,8 +341,8 @@ public boolean canCreate«stringUniqueIdentifier()»(
 		return commandService.getEditCommand(req);
 	}
 «ENDIF»	
-'''

-

+'''
+
 	/**
  *		XXX for now, both constraints are injected into single method
  *			which may not be suitable for modification especially when mixing
@@ -350,32 +350,32 @@ public boolean canCreate«stringUniqueIdentifier()»(
  *		Better approach would be:
  *			if either is non-null and providers are not the same - introduce two methods, 
  *			to check source and target separately. Otherwize, do it inplace.
-*/

-	override canExist(GenLink it) '''

+*/
+	override canExist(GenLink it) '''
 		«generatedMemberComment()»
 			public boolean canExist«stringUniqueIdentifier()»(
-		«IF !it.sansDomain»

+		«IF !it.sansDomain»
 			«canExistParameters(it.modelFacet)»
-		«ENDIF»

+		«ENDIF»
 		) {
-		«IF creationConstraints != null && creationConstraints.isValid() && it.diagram.editorGen.expressionProviders != null»

+		«IF creationConstraints != null && creationConstraints.isValid() && it.diagram.editorGen.expressionProviders != null»
 			try {
-			«IF creationConstraints.sourceEnd != null»

+			«IF creationConstraints.sourceEnd != null»
 				«checkAdditionalConstraint(creationConstraints.sourceEnd.provider, creationConstraints.sourceEnd, 'source', 'target', creationConstraints.getSourceEndContextClass(), creationConstraints.getTargetEndContextClass())»
-			«ENDIF»

-			«IF creationConstraints.targetEnd != null»

+			«ENDIF»
+			«IF creationConstraints.targetEnd != null»
 				«checkAdditionalConstraint(creationConstraints.targetEnd.provider, creationConstraints.targetEnd, 'target', 'source', creationConstraints.getTargetEndContextClass(), creationConstraints.getSourceEndContextClass())»
-			«ENDIF»

+			«ENDIF»
 			return true;
 			} catch(Exception e) {	
 				«xptPluginActivator.instanceAccess(it.diagram.editorGen)».logError("Link constraint evaluation error", e); «nonNLS()»
 				return false;
 			}
-		«ELSE»

+		«ELSE»
 			return true;
-		«ENDIF»

+		«ENDIF»
 		}
-	'''

+	'''
 
     override def getGEFWrapper(GenDiagram it) '''
         «generatedMemberComment()»
@@ -383,5 +383,5 @@ public boolean canCreate«stringUniqueIdentifier()»(
             return (cmd == null) ? org.eclipse.gef.commands.UnexecutableCommand.INSTANCE : new org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy(cmd);
         }
     '''
-

-}

+
+}
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.dev.types/META-INF/MANIFEST.MF
index cc3ee8f94d9..aa3527abd1c 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.dev.types/META-INF/MANIFEST.MF
@@ -7,7 +7,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
  org.eclipse.xtend.lib;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.core.filesystem;bundle-version="[1.6.0,2.0.0)",
- org.eclipse.m2m.qvt.oml;bundle-version="[3.6.0,4.0.0)"
+ org.eclipse.m2m.qvt.oml;bundle-version="[3.6.0,4.0.0)",
+ org.eclipse.papyrus.infra.architecture;bundle-version="1.0.0"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 3.0.0.qualifier
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/handlers/ElementTypeInfo.java b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/handlers/ElementTypeInfo.java
index 883f8d3c5eb..692f8220f1c 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/handlers/ElementTypeInfo.java
+++ b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/handlers/ElementTypeInfo.java
@@ -25,7 +25,7 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.handlers.HandlerUtil;
 
@@ -52,7 +52,7 @@ public class ElementTypeInfo extends AbstractHandler {
 				EObject adapted = ((IAdaptable) selectedElement).getAdapter(EObject.class);
 				if (adapted != null) {
 					try {
-						IElementType[] types = ElementTypeRegistry.getInstance().getAllTypesMatching(adapted, TypeContext.getContext());
+						IElementType[] types = ElementTypeRegistry.getInstance().getAllTypesMatching(adapted, TypeContext.getContext(adapted));
 						String result = "";
 						for (IElementType iElementType : types) {
 							result += iElementType.getId() + "\n";
diff --git a/plugins/developer/org.eclipse.papyrus.releng.main.release/release.xml b/plugins/developer/org.eclipse.papyrus.releng.main.release/release.xml
index 4481a708268..8448fb29fae 100755
--- a/plugins/developer/org.eclipse.papyrus.releng.main.release/release.xml
+++ b/plugins/developer/org.eclipse.papyrus.releng.main.release/release.xml
@@ -4,13 +4,13 @@
 		<plugin name="org.eclipse.papyrus.cdo.ui.doc" version="1.2.0"/>
 		<plugin name="org.eclipse.papyrus.copypaste.ui.doc" version="1.2.0"/>
 		<plugin name="org.eclipse.papyrus.dsml.validation.doc" version="1.2.0"/>
+		<plugin name="org.eclipse.papyrus.infra.architecture.doc" version="1.2.0"/>
 		<plugin name="org.eclipse.papyrus.infra.gmfdiag.common.doc" version="1.2.0"/>
 		<plugin name="org.eclipse.papyrus.infra.gmfdiag.css.doc" version="1.2.0"/>
 		<plugin name="org.eclipse.papyrus.infra.internationalization.doc" version="1.0.0"/>
 		<plugin name="org.eclipse.papyrus.infra.nattable.doc" version="1.2.0"/>
 		<plugin name="org.eclipse.papyrus.infra.newchild.doc" version="1.2.0"/>
 		<plugin name="org.eclipse.papyrus.infra.services.controlmode.doc" version="1.2.0"/>
-		<plugin name="org.eclipse.papyrus.infra.viewpoints.doc" version="1.2.0"/>
 		<plugin name="org.eclipse.papyrus.infra.types.doc" version="3.0.0"/>
 		<plugin name="org.eclipse.papyrus.layers.documentation" version="1.2.0"/>
 		<plugin name="org.eclipse.papyrus.req.reqif.doc" version="1.2.0"/>
@@ -75,8 +75,15 @@
 		<plugin name="org.eclipse.papyrus.emf.facet.widgets.celleditors" version="1.2.0"/>
 		<plugin name="org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore" version="1.2.0"/>
 	</feature>
+	<feature name="org.eclipse.papyrus.infra.architecture.feature" version="1.0.0">
+		<plugin name="org.eclipse.papyrus.infra.architecture" version="1.0.0"/>
+		<plugin name="org.eclipse.papyrus.infra.architecture.representation" version="1.0.0"/>
+		<plugin name="org.eclipse.papyrus.infra.architecture.representation.edit" version="1.0.0"/>
+	</feature>
 	<feature name="org.eclipse.papyrus.infra.core.feature" version="2.0.0">
 		<plugin name="org.eclipse.papyrus.infra.core" version="2.3.0"/>
+		<plugin name="org.eclipse.papyrus.infra.core.architecture" version="1.0.0"/>
+		<plugin name="org.eclipse.papyrus.infra.core.architecture.edit" version="1.0.0"/>
 		<plugin name="org.eclipse.papyrus.infra.core.log" version="1.2.0"/>
 		<plugin name="org.eclipse.papyrus.infra.core.sasheditor" version="2.0.0"/>
 		<plugin name="org.eclipse.papyrus.infra.core.sasheditor.di" version="2.0.0"/>
@@ -154,6 +161,10 @@
 		<plugin name="org.eclipse.papyrus.infra.gmfdiag.canonical" version="2.0.0"/>
 		<plugin name="org.eclipse.papyrus.infra.gmfdiag.welcome" version="1.2.0"/>
 		<plugin name="org.eclipse.papyrus.infra.gmfdiag.tooling.runtime" version="3.0.0"/>
+		<plugin name="org.eclipse.papyrus.infra.gmfdiag.representation" version="1.0.0"/>
+		<plugin name="org.eclipse.papyrus.infra.gmfdiag.representation.edit" version="1.0.0"/>
+		<plugin name="org.eclipse.papyrus.infra.gmfdiag.style" version="1.0.0"/>
+		<plugin name="org.eclipse.papyrus.infra.gmfdiag.style.edit" version="1.0.0"/>
 	</feature>
 	<feature name="org.eclipse.papyrus.infra.internationalization.feature" version="1.0.0">
 		<plugin name="org.eclipse.papyrus.infra.internationalization" version="1.0.0"/>
@@ -181,8 +192,11 @@
 		<plugin name="org.eclipse.nebula.widgets.nattable.core" version="1.4.0"/>
 		<plugin name="ca.odell.glazedlists" version="1.9.0"/>
 		<plugin name="org.eclipse.nebula.widgets.nattable.extension.glazedlists" version="1.4.0"/>
+		<plugin name="org.eclipse.papyrus.infra.nattable.representation" version="1.0.0"/>
+		<plugin name="org.eclipse.papyrus.infra.nattable.representation.edit" version="1.0.0"/>
 	</feature>
 	<feature name="org.eclipse.papyrus.infra.services.feature" version="3.0.0">
+		<plugin name="org.eclipse.papyrus.infra.services.architecture" version="1.0.0"/>
 		<plugin name="org.eclipse.papyrus.infra.services.controlmode" version="1.5.0"/>
 		<plugin name="org.eclipse.papyrus.infra.services.controlmode.history" version="1.2.0"/>
 		<plugin name="org.eclipse.papyrus.infra.services.decoration" version="1.2.0"/>
@@ -200,6 +214,7 @@
 	</feature>
 	<feature name="org.eclipse.papyrus.infra.ui.feature" version="3.0.0">
 		<plugin name="org.eclipse.papyrus.infra.ui" version="2.0.0"/>
+		<plugin name="org.eclipse.papyrus.infra.ui.architecture" version="1.0.0"/>
 		<plugin name="org.eclipse.papyrus.infra.onefile.ui" version="1.2.0"/>
 		<plugin name="org.eclipse.papyrus.infra.ui.emf" version="2.0.0"/>
 		<plugin name="org.eclipse.papyrus.infra.ui.resources" version="1.2.0"/>
@@ -215,14 +230,7 @@
 		<plugin name="org.eclipse.papyrus.infra.newchild.editor" version="1.2.0"/>
 	</feature>
 	<feature name="org.eclipse.papyrus.infra.viewpoints.feature" version="2.0.0">
-		<plugin name="org.eclipse.papyrus.infra.viewpoints.configuration" version="2.0.0"/>
-		<plugin name="org.eclipse.papyrus.infra.viewpoints.configuration.edit" version="2.0.0"/>
-		<plugin name="org.eclipse.papyrus.infra.viewpoints.configuration.editor" version="1.2.0"/>
-		<plugin name="org.eclipse.papyrus.infra.viewpoints.doc" version="1.2.0"/>
-		<plugin name="org.eclipse.papyrus.infra.viewpoints.iso42010" version="1.2.0"/>
-		<plugin name="org.eclipse.papyrus.infra.viewpoints.iso42010.edit" version="1.2.0"/>
 		<plugin name="org.eclipse.papyrus.infra.viewpoints.policy" version="1.2.0"/>
-		<plugin name="org.eclipse.papyrus.infra.viewpoints.preferences" version="1.2.0"/>
 	</feature>
 	<feature name="org.eclipse.papyrus.infra.widget.feature" version="3.0.0">
 		<plugin name="org.eclipse.papyrus.infra.widgets" version="3.0.0"/>
@@ -284,6 +292,9 @@
 		<plugin name="org.eclipse.papyrus.sysml.service.types" version="2.0.0"/>
 		<plugin name="org.eclipse.papyrus.sysml.edit" version="1.2.0"/>
 	</feature>
+	<feature name="org.eclipse.papyrus.sysml.architecture.feature" version="1.0.0">
+		<plugin name="org.eclipse.papyrus.sysml.architecture" version="1.0.0"/>
+	</feature>
 	<feature name="org.eclipse.papyrus.sysml.modelexplorer.feature" version="1.2.0">
 		<plugin name="org.eclipse.papyrus.sysml.modelexplorer" version="1.2.0"/>
 	</feature>
@@ -306,6 +317,9 @@
 		<plugin name="org.eclipse.papyrus.uml.alf.to.fuml" version="1.2.0"/>
 		<plugin name="org.eclipse.papyrus.uml.alf.ui" version="3.0.0"/>
 	</feature>
+	<feature name="org.eclipse.papyrus.uml.architecture.feature" version="1.0.0">
+		<plugin name="org.eclipse.papyrus.uml.architecture" version="1.0.0"/>
+	</feature>
 	<feature name="org.eclipse.papyrus.uml.assistants.feature" version="3.0.0">
 		<plugin name="org.eclipse.papyrus.uml.profile.assistants.generator" version="3.0.0"/>
 		<plugin name="org.eclipse.papyrus.uml.profile.assistants.generator.ui" version="1.2.0"/>
@@ -646,14 +660,7 @@
 	<plugin name="org.eclipse.papyrus.infra.ui" version="2.0.0"/>
 	<plugin name="org.eclipse.papyrus.infra.ui.emf" version="2.0.0"/>
 	<plugin name="org.eclipse.papyrus.infra.ui.resources" version="1.2.0"/>
-	<plugin name="org.eclipse.papyrus.infra.viewpoints.configuration" version="2.0.0"/>
-	<plugin name="org.eclipse.papyrus.infra.viewpoints.configuration.edit" version="2.0.0"/>
-	<plugin name="org.eclipse.papyrus.infra.viewpoints.configuration.editor" version="1.2.0"/>
-	<plugin name="org.eclipse.papyrus.infra.viewpoints.doc" version="1.2.0"/>
-	<plugin name="org.eclipse.papyrus.infra.viewpoints.iso42010" version="1.2.0"/>
-	<plugin name="org.eclipse.papyrus.infra.viewpoints.iso42010.edit" version="1.2.0"/>
 	<plugin name="org.eclipse.papyrus.infra.viewpoints.policy" version="1.2.0"/>
-	<plugin name="org.eclipse.papyrus.infra.viewpoints.preferences" version="1.2.0"/>
 	<plugin name="org.eclipse.papyrus.infra.widgets" version="3.0.0"/>
 	<plugin name="org.eclipse.papyrus.infra.widgets.toolbox" version="1.2.0"/>
 	<plugin name="org.eclipse.papyrus.layers.documentation" version="1.2.0"/>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.project b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/.project
index e12fea36a32..26a212622f3 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.papyrus.infra.viewpoints.doc</name>
+	<name>org.eclipse.papyrus.infra.architecture.doc</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/.settings/org.eclipse.core.resources.prefs b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000000..96ade9ab932
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding//target/generated-eclipse-help/architecture-toc.xml=utf-8
+encoding//target/generated-eclipse-help/architecture.html=UTF-8
+encoding/<project>=UTF-8
diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/.settings/org.eclipse.jdt.core.prefs
index 4d72ad12656..4d72ad12656 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.jdt.ui.prefs b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/.settings/org.eclipse.m2e.core.prefs
index f897a7f1cb2..f897a7f1cb2 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.m2e.core.prefs
+++ b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/.settings/org.eclipse.m2e.core.prefs
diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.pde.api.tools.prefs b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/.settings/org.eclipse.pde.api.tools.prefs
index 23fb95e120f..23fb95e120f 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.pde.api.tools.prefs
+++ b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/META-INF/MANIFEST.MF
index 9e0c1a84c78..54394cd388a 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.help;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.papyrus.infra.doc;bundle-version="[1.2.0,2.0.0)"
 Bundle-Vendor: %providerName
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.doc;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.infra.architecture.doc;singleton:=true
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/about.html b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/about.html
index dd02e0be168..a2fd79d9556 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/about.html
+++ b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/about.html
@@ -1,28 +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>December 2, 2009</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>

+<!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>January 1, 2017</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/doc/org.eclipse.papyrus.infra.viewpoints.doc/build.properties b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/build.properties
index f33d8fa50e2..934d404535a 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/build.properties
+++ b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/build.properties
@@ -1,8 +1,8 @@
-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               about.html,\

-               plugin.properties,\

-               target/generated-eclipse-help/** 

-src.includes = about.html,\

+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               about.html,\
+               plugin.properties,\
+               target/generated-eclipse-help/** 
+src.includes = about.html,\
 				resources/
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/plugin.properties b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/plugin.properties
index 5fca0146e99..180703a144e 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/plugin.properties
+++ b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/plugin.properties
@@ -1,16 +1,16 @@
-##########################################################################################

-# Copyright (c) 2013 CEA LIST.

-# 

-#     

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#  Laurent Wouters (CEA LIST) laurent.wouters@cea.fr - Initial API and implementation

-#

-########################################################################################

-

-pluginName = Papyrus Viewpoints Preferences

-providerName = Eclipse Modeling Project

+##########################################################################################
+# Copyright (c) 2013 CEA LIST.
+# 
+#     
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#  Laurent Wouters (CEA LIST) laurent.wouters@cea.fr - Initial API and implementation
+#
+########################################################################################
+
+pluginName = Papyrus Architecture Documentation
+providerName = Eclipse Modeling Project
diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/plugin.xml b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/plugin.xml
index b2f43bb1684..376a2583f70 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/plugin.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/plugin.xml
@@ -4,11 +4,11 @@
    <extension
          point="org.eclipse.help.toc">
       <toc
-            file="target/generated-eclipse-help/viewpoints-main-toc.xml"
+            file="target/generated-eclipse-help/architecture-main-toc.xml"
             primary="false">
       </toc>          
       <toc
-            file="target/generated-eclipse-help/viewpoints-toc.xml"
+            file="target/generated-eclipse-help/architecture-toc.xml"
             primary="false">
       </toc>
    </extension>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/pom.xml
index 5c7ab73a2f2..53cf545dc9c 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/pom.xml
@@ -7,8 +7,8 @@
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<artifactId>org.eclipse.papyrus.infra.viewpoints.doc</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
+	<artifactId>org.eclipse.papyrus.infra.architecture.doc</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<build>
 		<plugins>
@@ -44,5 +44,5 @@
 			</plugin>
 		</plugins>
 	</build>
-	<name>Papyrus Infra Viewpoints doc</name>
+	<name>Papyrus Infra Architecture doc</name>
 </project>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/resources/architecture-main-toc.xml b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/resources/architecture-main-toc.xml
new file mode 100644
index 00000000000..bc5fb8bbb42
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/resources/architecture-main-toc.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<toc label="Architecture" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocCustom">
+   <topic href="target/generated-eclipse-help/architecture.html" label="Architecture Contexts">
+      <link toc="target/generated-eclipse-help/architecture-toc.xml"/>
+      <anchor id="ArchitectureID"/>
+   </topic>
+</toc>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/resources/architecture.mediawiki b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/resources/architecture.mediawiki
new file mode 100644
index 00000000000..a49efca82b9
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/resources/architecture.mediawiki
@@ -0,0 +1,193 @@
+<!--
+ Copyright (c) 2017 CEA LIST.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+  Maged E. Elaasar (melaasar@gmail.com) - Initial API and implementation
+-->
+
+=Introduction=
+
+An architecture context is a method for customizing Papyrus for a given domain. It defines a regime for editing a Papyrus model semantically and notationally. The semantic editing is defined by a set of  element type set configurations (from some domain), while the notational side is defined by a set of viewpoints consisting of a set of representation kinds (e.g., diagram kinds and table kinds) and other notational configurations.
+
+An architecture context is composed within an architecture domain (a namespace) and satisfies a set of concerns that belong to a set of stakeholders, both of which are composed in (the same or another) architecture domain. An architecture domain can be specified by one or more architecture models. In the latter case, all of these models are dynamically merged at runtime. 
+
+An architecture context can either be an architecture description language or an architecture framework. In the former case, it can own its own set of representation kinds, while in the latter, it cannot. However, in both cases, a context can own a set of viewpoints that reference representation kinds owned by any description language.
+
+Each model in Papyrus is created using a specific architecture context, although this context may later be switched, possibly resulting in the model details being changed. A model also specifies a subset of its context's viewpoints as enabled at creation time, although this set may later be switched as well. When a viewpoint is enabled on a model, a user can create representations, based on this viewpoint's referenced representation kinds, and see them in model explorer. When a viewpoint is disabled, its representations become invisible, unless another enabled viewpoint references their representation kinds.
+
+=Architecture Context Preference Page=
+
+Papyrus is typically deployed with one or more architecture models that are registered through platform extensions. The architecture contexts contributed by these models can be seen in the Architecture Context Preference Page:
+
+[[Image:images/preferences.png]] 
+
+A user can choose to enable or disable those architecture contexts in the workbench by toggling their checkboxes, set one of them as a default context (using the Make Default button), or extend existing contexts or add to them at runtime by specifying other architecture models from the file system or the workspace (using the Other Architecture Models button):
+
+[[Image:images/othermodels.png]] 
+
+=Architecture Context UI Elements=
+
+The enabling of architecture contexts in a workbench has some impacts on the following UI elements in Papyrus:
+
+* The '''Select Architecture Context''' page of the '''New Papyrus Model''' wizard allows for selecting one of the enabled architecture contexts to create the model in. It also allows for enabling/disabling on the model the set of viewpoints that are provided by the context.
+
+[[Image:images/selectarchitecture.png]]
+
+
+* The '''Initialization Information''' in the '''New Papyrus Model''' wizard has a '''Select a Representation Kind''' section that is populated with only the diagrams and tables that are available in the enabled viewpoints.
+
+[[Image:images/diagramkind.png]]
+
+* The '''Switch Architecture Context...''' context menu action in the Model Explorer view allows for switching the model's architecture context and/or viewpoints. Similarly, the '''Switch Architecture Viewpoints''' context menu allows for quickly enabling/disabling a viewpoint.
+
+[[Image:images/switchmenus.png]]
+
+* The '''Unsupported Diagrams/Tables''' filter in the Model Explorer view hides diagrams/tables whose kinds are not supported by the viewpoints currently enabled on the model.
+
+* The '''New Diagram''' and '''New Table''' contextual menus for the model elements in the Model Explorer view provides only the diagrams and tables that are available in the enabled viewpoints and are applicable to the currently selected model element. For example, when a UML Activity is selected, the '''New Diagram''' context menu will not offer to create a Package diagram, or a class diagram. The same holds for the toolbar elements for the creation of diagrams and tables.
+
+[[Image:images/contextmenu.png]]
+
+* The diagrams properties show the following information:
+
+[[Image:images/properties.png]]
+
+* '''Diagram Type''' or '''Table Kind''' is the qualified name of the representation kind. It gives an indication of which architecture context is providing it.
+* The '''Owner''' attribute is the model element that syntactically contains the representation in the model explorer. It can be different from the root element.
+* The '''Root''' element attribute is the model element that is the representation's root semantic element.
+
+=Definition of New Architecture Models=
+
+Papyrus supports the definition of new architecture models that can subsequently be used by selecting them as other models in the Papyrus Architecture Context preference page, as presented above. Papyrus architecture models are defined in files with the *.architecture extension. They are really just Ecore models that can be edited with the specialized architecture model editor provided by Papyrus.
+
+==Basic Concepts==
+
+The architecture metamodel in Papyrus is implemented as a realization and an extension to the ISO 42010 standard for architecture of systems. Hence many concepts present in the metamodel are derived from those presented in the ISO 42010 standard. However, the standard has been extended with Papyrus-specific concepts and properties.
+* A ''domain'' is the root of the architecture model. It can contains a collection of ''concerns'', ''stakeholders'', as well as ''contexts'' (which can be ''description languages'' and/or ''frameworks'').
+* A ''concern'' (from ISO 42010) represents in Papyrus a matter of interest to some stakeholder.
+* A ''stakeholder'' (from ISO 42010) represents in Papyrus an archetype of users. It references a set of its ''concerns''.
+* A ''description language'' (from ISO 42010) represents in Papyrus a modeling language (e.g., UML, SysML). It has a unique ''id' that corresponds to that of an ''IClientContext'' from GMF. It references a ''metamodel'', a set of ''profiles'', a set of ''element type set configurations'', a ''creation command'' (creates a model of this language), a ''conversion command'' (converts a model to this language), and and ''icon''. It also has an optional ''extension prefix'' for its models. It can also contain a set of ''representation kinds'' (which can be either ''diagrams'' or ''tables'') and a set of ''viewpoints''.
+* A ''framework'' (from ISO 42010) represents in Papyrus a modeling framework (e.g., DoDAF). It has a unique ''id' that corresponds to that of an ''IClientContext'' from GMF. It references a set of ''element type set configurations'', a ''creation command'' (creates a model of this framework), a ''conversion command'' (converts a model to this framework), and an ''icon''. It also has an optional ''extension prefix'' for its models. It can also contain a set of ''viewpoints''.
+* A ''viewpoint'' (from ISO 42010) in Papyrus references set of ''representation kinds'', which can be ''diagrams'' or ''tables''.
+* A ''diagram'' in this context does not represent a single instance (for example the diagram named X in model Y), but the specification (or prototype) of future diagrams of this kind. For example the ''UML Class Diagram''.
+* A ''table'' is another kind of view in Papyrus that enables the presentation of models in a tabular format.
+
+==Walkthrough==
+
+The definition of an architecture model in Papyrus starts with the selection of the ''Architecture Model''  option in the Eclipse ''New'' creation wizard under the ''Papyrus'' category. The top element of the file should be a ''Architecture Domain'' element.
+
+<u>Step 1</u>: Specify the ''Name'' and ''Description'' of the ''Architecture Domain'' (the root element).
+
+<u>Step 2</u>: Right click on the domain to add one or more ''Concerns''. In the properties view, specify the following for each concern: a ''Name'' and a ''Description''.
+
+<u>Step 3</u>: Right click on the domain to add one or more ''Stakeholders''. In the properties view, specify the following for each stakeholder: a ''Name'', a ''Description'', and one or more references to ''Concerns''.
+
+<u>Step 4</u>: Right click on the domain to add one or more ''Architecture Description Languages''. In the properties view, specify for each language: a ''Name'', a ''Description'', a unique ''Id'' (e.g., org.eclipse.uml2.UML), an ''Extension Prefix'' if desired (e.g., profile), an ''Icon'' using a platform URI (e.g., platform:/plugin/project/icons/xxx.png), a ''Metamodel'' as a reference to an ''EPackage'' (load the Ecore model first), one or more ''Profiles'' as references to ''EPackages'' (load the Ecore models first), one or more ''Element Types'' as references to ''ElementTypeSetConfigurations'' (load the *.elementtypesetconfiguration models first), a creation command using a fully qualified of a Java class implementing the IModelCreationCommand interface, and an optional conversion command using a fully qualified of a Java class implementing the IModelConversionCommand interface.
+
+<u>Step 4A</u>: Right click on the description language to add one or more representation kinds, i.e., ''Papyrus Diagram'', ''Papyrus Table'' or ''Papyrus Sync Table'' (see details below).
+
+<u>Step 5</u>: Right click on the domain to add one or more ''Architecture Framework''. In the properties view, specify for each framework: a ''Name'', a ''Description'', a unique ''Id'' (e.g., org.eclipse.dodaf), an ''Extension Prefix'' if desired (e.g., profile), an ''Icon'' using a platform URI (e.g., platform:/plugin/project/icons/xxx.png), and one or more ''Element Types'' as references to ''ElementTypeSetConfigurations'' (load the *.elementtypesetconfiguration models first). 
+
+<u>Step 6</u>: Right click on the description language (step 4) or framework (step 5) to add one or more ''Architecture Viewpoints''. In the properties view, specify for each viewpoint: a ''Name'', a ''Description'',  a unique ''Id'' (e.g., org.eclipse.uml.design), one ore more references to ''Concerns'', and one or more references to ''Representation Kinds''.
+
+<u>Step 7</u>: Deploy the model. The new architecture file can be deployed in an Eclipse plugin and registered through an extension point. The extension point to use is <code>org.eclipse.papyrus.infra.architecture.models</code>. Alternatively, the model can be deployed using the ''Other Architecture Model'' button in the ''Architecture Contexts'' preference page.
+
+==Papyrus Diagram Specification==
+
+Once a ''Papyrus Diagram'' is created, in the properties view, specify for it:
+* A ''Name'' (required) that is the user-visible name of the diagram. It will appear in the creation menus and property panel.
+* An ''Icon'' (required), as an URI of the form <code>platform:/plugin/...</code>.
+* An ''Implementation ID'' (required) which selects the physical (hard-coded) diagram in Papyrus that will be used as a base. The possible values for this property are summarized in the following table.
+* An optional ''Parent'' that specifies a parent viewpoint-defined diagram to inherit from. Essentially, the inheriting diagram will defer to its parent�s rules (see below) when its own are not sufficient to take a decision.
+* An optional ''Custom Style'' as an URI of the form <code>platform:/plugin/...</code>. It must point to a CSS file that will then be automatically applied to the diagram.
+* An optional ''Custom Palette'' as an URI of the form <code>platform:/plugin/...</code>. It must point a palette definition in XML that will be automatically applied to the diagram.
+* Other attributes are inherited from the ISO 42010 implementation and are currently not used in Papyrus.
+
+{| border="solid 1px grey"
+! Implementation ID
+! Description
+|-
+| '''PapyrusUMLActivityDiagram'''
+| UML Activity Diagram
+|-
+| '''PapyrusUMLClassDiagram'''
+| UML Class Diagram
+|-
+| '''PapyrusUMLCommunicationDiagram'''
+| UML Communication Diagram
+|-
+| '''PapyrusUMLComponentDiagram'''
+| UML Component Diagram
+|-
+| '''CompositeStructure'''
+| UML Composite Diagram
+|-
+| '''PapyrusUMLDeploymentDiagram'''
+| UML Deployment Diagram
+|-
+| '''PapyrusUMLProfileDiagram'''
+| UML Profile Diagram
+|-
+| '''PapyrusUMLSequenceDiagram'''
+| UML Sequence Diagram
+|-
+| '''PapyrusUMLStateMachineDiagram'''
+| UML State Machine Diagram
+|-
+| '''PapyrusUMLTimingDiagram'''
+| UML Timing Diagram
+|-
+| '''UseCase'''
+| UML Use Case Diagram
+|-
+| '''PapyrusUMLInteractionOverviewDiagram'''
+| UML Interaction Overview Diagram
+|-
+| '''BlockDefinition'''
+| SysML Block Definition Diagram
+|-
+| '''InternalBlock'''
+| SysML Internal Block Diagram
+|-
+| '''Parametric'''
+| SysML Parametric Diagram
+|-
+| '''RequirementDiagram'''
+| SysML Requirements Diagram
+|}
+
+Once a diagram has been created it is possible to constraint it using rules. There are four kinds of rules:
+* Model rules constrain the type of the (root) model elements that can be visualized through this view. Hence model rules control what model elements can be selected for the ''Root element'' property of the diagrams, as shown in the capture below.
+* Owning rules constrain the type of the model elements that can own the diagram itself. In practice this materializes as the type of model elements under which the diagrams can appear in the model explorer. Owning rules control what model elements can be selected for the ''Owner'' property of the diagrams, as shown in the capture below.
+* Child rules constrain the type of the model elements that can be dropped within this diagram.
+* Palette rules constrain the display of the diagram's palette elements.
+
+[[Image:images/properties.png]]
+
+Each rule has a ''Permit'' property that specify whether the rule authorizes or forbids the action it represents. Otherwise, the properties of the rules are as follow:
+* ''Model Rules''
+** ''Element'' (required) represents the type of the model elements to apply the rule on.
+** ''Multiplicity'' (required, default is -1) represents the maximum number of this kind of diagram that can be created for the referenced model element. -1 represents an unbounded number.
+** ''Stereotypes'' represents the set of stereotypes that must be applied in the model element for the rule to match. The stereotypes can be picked from the classifiers of the ''Profiles'' defined in the parent diagram.
+* ''Owning Rules''
+** ''Element'' (required) represents the type of the model elements to apply the rule on.
+** ''Multiplicity'' (required, default is -1) represents the maximum number of this kind of diagram that can be created for the referenced model element. -1 represents an unbounded number.
+** ''Stereotypes'' represents the set of stereotypes that must be applied in the model element for the rule to match. The stereotypes can be picked from the classifiers of the ''Profiles'' defined in the parent diagram.
+* ''Child Rules''
+** ''Element'' (required) represents the type of the model elements begin dropped.
+** ''Stereotypes'' represents the set of stereotypes that must be applied in the model element for the rule to match. The stereotypes can be picked from the classifiers of the ''Profiles'' defined in the parent diagram.
+** ''Origin'' (required) represents the type of the model elements that are the target of the drop. It is usually one of the type defined in the ''Model Rules''.
+** Additionally, ''Child Rules'' can be completed with children called ''Path Elements'' using the '''New Child''' contextual menu. ''Path Elements'' defines a path of properties that must be used from the ''Origin'' to insert the new ''Element'' in the model.
+* ''Palette Rules''
+** ''Element'' (required) represents a pattern to match for the identifier of a palette element.
+*** If the value ends with '*', it will match any palette element with the prefix specified before the '*'.
+*** If the value is '*', it will match any palette element.
+
+The minimal required rules for a diagram specification to work are:
+* A model rule that allows the diagram to be created for a model element. For example, a model rule with ''Element'' set to UML Package, ''Multiplicity'' to -1 and ''Permit'' to true; meaning this diagram can be created for UML Packages and an unlimited number of diagrams can be created for each UML Package.
+* An owning rule that allows the diagram to be owned by a model element (appear under an element in the model explorer). For example, an owning rule with ''Element'' set to UML Package, ''Multiplicity'' set to -1 and ''Permit'' to true; meaning an unlimited number of diagrams of this kind can be placed under each UML Package element in the model explorer.
+* A child rule that allows the dropping of any element in the diagram, expressed with the ''Permit'' attribute set to true and other attributes left empty.
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/resources/images/contextmenu.png b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/resources/images/contextmenu.png
new file mode 100644
index 00000000000..78dfa84bb2f
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/resources/images/contextmenu.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/resources/images/diagramkind.png b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/resources/images/diagramkind.png
new file mode 100644
index 00000000000..704e2377977
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/resources/images/diagramkind.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/resources/images/othermodels.png b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/resources/images/othermodels.png
new file mode 100644
index 00000000000..e885cd157c5
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/resources/images/othermodels.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/resources/images/preferences.png b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/resources/images/preferences.png
new file mode 100644
index 00000000000..c506cf07b0f
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/resources/images/preferences.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/resources/images/properties.png b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/resources/images/properties.png
new file mode 100644
index 00000000000..4e49e0e8d66
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/resources/images/properties.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/resources/images/selectarchitecture.png b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/resources/images/selectarchitecture.png
new file mode 100644
index 00000000000..07634253128
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/resources/images/selectarchitecture.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/resources/images/switchmenus.png b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/resources/images/switchmenus.png
new file mode 100644
index 00000000000..da1f1ee584c
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/resources/images/switchmenus.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.core.resources.prefs b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0203a..00000000000
--- a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/plugin.properties b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/plugin.properties
deleted file mode 100644
index 31cbfddf591..00000000000
--- a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-##########################################################################################

-# Copyright (c) 2013 CEA LIST.

-# 

-#     

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#  Laurent Wouters (CEA LIST) laurent.wouters@cea.fr - Initial API and implementation

-#

-########################################################################################

-

-pluginName = Papyrus Viewpoints Documentation

-providerName = Eclipse Modeling Project

diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/images/explorer.png b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/images/explorer.png
deleted file mode 100644
index f412ac7f575..00000000000
--- a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/images/explorer.png
+++ /dev/null
diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/images/preferences.png b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/images/preferences.png
deleted file mode 100644
index d0270ff1ff8..00000000000
--- a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/images/preferences.png
+++ /dev/null
diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/images/properties.png b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/images/properties.png
deleted file mode 100644
index 9663d824ce5..00000000000
--- a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/images/properties.png
+++ /dev/null
diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints-main-toc.xml b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints-main-toc.xml
deleted file mode 100644
index 287f135aebe..00000000000
--- a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints-main-toc.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<toc label="Viewpoints" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocCustom">
-   <topic href="target/generated-eclipse-help/viewpoints.html" label="Viewpoints in Papyrus">
-      <link toc="target/generated-eclipse-help/viewpoints-toc.xml"/>
-      <anchor id="ViewpointsID"/>
-   </topic>
-</toc>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints.mediawiki b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints.mediawiki
deleted file mode 100644
index 3877aa6b98a..00000000000
--- a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints.mediawiki
+++ /dev/null
@@ -1,195 +0,0 @@
-<!--

- Copyright (c) 2013 CEA LIST.

- All rights reserved. This program and the accompanying materials

- are made available under the terms of the Eclipse Public License v1.0

- which accompanies this distribution, and is available at

- http://www.eclipse.org/legal/epl-v10.html

-

- Contributors:

-  Laurent Wouters (CEA LIST) laurent.wouters@cea.fr - Initial API and implementation

--->

-

-=Introduction=

-Viewpoints in Papyrus enable the specialization and customization of the user experience by constraining what can be seen and interacted with in Papyrus diagrams and tables. Viewpoints can be used for the following purposes in Papyrus:

-* Constrain the set  of diagrams and tables that are available to a particular class of users

-* Define new kinds of diagrams with custom names, icons, figures and palette in order to implement domain-specific views in Papyrus, based on the classical UML and SysML diagrams.

-

-

-=Configuration Options for Viewpoints=

-

-At any given time, there can only be one viewpoint that is currently applied to an Eclipse instance. Users are free to select any viewpoint that is provided to them. Papyrus itself comes with a default viewpoint that is automatically selected when to other viewpoint is specified.

-

-All the viewpoints-related configuration options available to the users are provided in the ''Papyrus > Viewpoints Configuration'' preference page of Eclipse:

-

-[[Image:images/preferences.png]]

-

-The first available option is the ''Configuration selection''. It determines how the current viewpoint is selected. The possible options are:

-

-* '''Default (Papyrus built-in configuration)'''. This option forces the selection of the default viewpoint provided by Papyrus. This default viewpoint exposes all the UML and SysML diagrams and tables implemented in Papyrus and does not restrict their use.

-* '''Deployed through the extension point'''. This option allows Papyrus to choose the viewpoint with the highest priority provided through the appropriate extension point. This option is typically chosen when 3rd party viewpoints are provided through the extension point. In this way they are automatically applied. When no custom viewpoint is provide through the extension point the default Papyrus viewpoint is applied instead.

-* '''Manual configuration selection'''. This option allows the user to force the application of a specific viewpoint that is manually selected. When this option is chosen the second part of the preference page becomes available. The appropriate configuration file containing the viewpoint can be selected through 3 possible schemes:

-** '''Absolute path''': The absolute path a file in the local file system.

-** '''Workspace file''': The selection of a file in the current Eclipse workspace

-** '''Embedded in a plugin''': The selection of a file contained within a plugin that has been loaded by the current Eclipse instance.

-

-In the case where multiple viewpoints are available through the current configuration options as explained above the specific viewpoint to be applied can be chosen through the two drop-down lists:

-

-* '''Stakeholder'''. The class of user that is associated to a list of possible viewpoints.

-* '''Viewpoint'''. The viewpoint will be applied. The list is populated based on the Stakeholder field.

-

-In addition, the checkbox '''Multiplicity''' can be activated so that at most one diagram or table of the each kind defined in the applied viewpoint can be created for each model element. For example, at most one class diagram per package, etc.

-

-It is possible at any time to see the details of the diagrams and tables offered by the currently used viewpoint in the ''Viewpoint Explorer'' view in Eclipse. This view is available in ''Window > Show View > Other'', and then selecting ''Papyrus > Viewpoint Explorer''.

-

-[[Image:images/explorer.png]]

-

-This view summarizes the currently available diagrams and tables, as well as the conditions for their availability.

-

-

-=Viewpoints-Related UI Elements=

-

-The application of a viewpoint has some impacts on the following UI elements in Papyrus:

-* The diagram selection window in the '''New Model''' wizard is populated with only the diagrams and tables that are available in the current viewpoint.

-* The '''New Diagram''' and '''New Table''' contextual menus for the model elements provides only the diagrams and tables that are available in the current viewpoint and are applicable to the currently selected model element. For example, when a UML Activity is selected, the '''New Diagram''' context menu will not offer to create a Package diagram, or a class diagram.

-* The same holds for the toolbar elements for the creation of diagrams and tables.

-* The diagrams properties show the following information:

-

-[[Image:images/properties.png]]

-

-* '''View Type''' is the qualified name of the diagram�s type. It gives an indication of which viewpoint is providing it.

-* The '''Owner''' attribute is the model element that syntactically contains the diagram in the model explorer. It can be different from the root element.

-* The '''Root''' element attribute is the model element that is the diagram�s root semantic element.

-

-

-=Definition of New Viewpoints=

-

-Papyrus supports the definition of new viewpoints that can subsequently be used by selecting them in the Papyrus Viewpoints preference panel, as presented above. Papyrus viewpoints are defined in configuration files with the �.configuration� extension. They are really just an ECore model that can be edited with the specialized viewpoint configuration editor provided by Papyrus.

-

-==Basic Concepts==

-

-Viewpoints in Papyrus are implemented as an extension to the ISO 42010 standard for architecture description framework. Hence many concepts presented here are derived from those presented in the ISO 42010 standard. However, the standard has been extended with Papyrus-specific concepts and properties.

-* A ''configuration'' is a top element of a configuration file. It contains can contains ''viewpoints'' specifications, ''stakeholders'', as well as ''view categories''.

-* A ''stakeholder'' (from ISO 42010) represents in Papyrus an archetype of users. They can be attributed ''viewpoints'', thus defining what users of this kind can see.

-* A ''viewpoint'' (from ISO 42010) in Papyrus is simply set of ''views'', which can be ''diagrams'' or ''tables''.

-* A ''diagram'' in this context does not represent a single instance (for example the diagram named X in model Y), but the specification (or prototype) of future diagrams of this kind. For example the ''UML Class Diagram''.

-* A ''table'' is another kind of view in Papyrus that enables the presentation of models in a tabular format.

-

-==Walkthrough==

-

-The definition of a new viewpoint in Papyrus starts with the creation of a new configuration file: ''Viewpoint s configuration'' in the Papyrus folder of the Eclipse new element creation dialog. The top element of the file should be a ''Papyrus Configuration'' element.

-

-<u>Step 1</u>: Select the metamodel that is applicable to this configuration. Generally, this should be UML. The metamodel is selected as the ''metamodel'' property of the ''Papyrus Configuration'' root element. The drop-down value selection is automatically filled with the currently metamodel currently loaded in Eclipse. For UML select, "http://www.eclipse.org/uml2/5.0.0/UML".

-

-<u>Step 2</u>: Add the basic elements. The setting of the elements below is required for the configuration to work correctly.

-* Right click on the ''Papyrus Configuration'' root element to a new ''Stakeholder'' child.

-* Give it an appropriate name

-* Right click on the ''Papyrus Configuration'' root element to a new ''Viewpoint'' child.

-* Give it an appropriate name

-* In the properties of the new stakeholder, add the new viewpoint to the ''viewpoints'' property to specify that this stakeholder will have to the specified viewpoint.

-* In the properties of the ''Papyrus Configuration'' root element, select the new stakeholder in the ''Default Stakeholder'' property.

-Notes:

-* Stakeholder attributes other than ''viewpoints'' and ''name'' are inherited from the ISO 42010 implementation and are currently not used in Papyrus.

-* Viewpoint attributes other than ''parent'' and ''name'' are inherited from the ISO 42010 implementation and are currently not used in Papyrus.

-

-<u>Step 3</u>: Complete the viewpoint with new diagrams and tables. Those elements can be added by right clicking on the viewpoint element, in the ''New child'' menu. Refer to the sections below for more information on the specification of diagrams and tables.

-

-<u>Step 4</u>: Deploy the configuration. The new configuration file can be deployed in an Eclipse plugin and registered through an extension point. The extension point to use is <code>org.eclipse.papyrus.infra.viewpoints.policy.custom</code>. It comes in two flavors that are the possible child elements for it:

-* The ''configuration'' element lets you register a configuration file and give it a priority. The configuration file is selected with the ''file'' property. Giving an URI of the form <code>platform:/plugin/my.plugin.name/path/myconfig.configuration</code> is a good practice. The ''priority'' is a value between 0 and 100, 100 is the highest priority. This value will be used to select the configuration with the highest priority when the user selects the ''Deployed through the extension point'' option in the configuration page as explained above. In this mode, the deployed configuration replaces the default Papyrus configuration and its viewpoint. This means that unless the provided viewpoint extends the default one or replicate it, the UML and SysML diagrams and tables will not be available.

-* The ''contribution'' elements lets you specifies a configuration file as an extension of another one. The custom configuration file is selected with the ''file'' property. The ''original'' property is used to select the configuration file that is extended. To extend the default Papyrus configuration, this value must be <code>platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration</code>. In this mode the custom viewpoints must have the same name as the extended on in the original configuration file. In essence, the diagrams and tables defined in the new custom viewpoint will be available along the one in the original viewpoints, instead of replacing them. This mode is used by RobotML to add the RobotML diagrams to the default Papyrus viewpoint.

-

-==Diagram Specification==

-

-A diagram has the following attributes:

-* A ''name'' (required) that is the user-visible name of the diagram. It will appear in the creation menus and property panel.

-* An ''icon'' (required), as an URI of the form <code>platform:/plugin/...</code>.

-* An ''implementation ID'' (required) which selects the physical (hard-coded) diagram in Papyrus that will be used as a base. The possible values for this property are summarized in the following table.

-* An optional ''parent'' that specifies a parent viewpoint-defined diagram to inherit from. Essentially, the inheriting diagram will defer to its parent�s rules (see below) when its own are not sufficient to take a decision.

-* An optional list of ''profiles'' that must be applied on the model for this diagram to be available. The possible values are automatically populated from the loaded EPackages.

-* An optional ''custom style'' as an URI of the form <code>platform:/plugin/...</code>. It must point to a CSS file that will then be automatically applied to the diagram.

-* An optional ''custom palette'' as an URI of the form <code>platform:/plugin/...</code>. It must point a palette definition in XML that will be automatically applied to the diagram.

-* Other attributes are inherited from the ISO 42010 implementation and are currently not used in Papyrus.

-

-{| border="solid 1px grey"

-! Implementation ID

-! Description

-|-

-| '''PapyrusUMLActivityDiagram'''

-| UML Activity Diagram

-|-

-| '''PapyrusUMLClassDiagram'''

-| UML Class Diagram

-|-

-| '''PapyrusUMLCommunicationDiagram'''

-| UML Communication Diagram

-|-

-| '''PapyrusUMLComponentDiagram'''

-| UML Component Diagram

-|-

-| '''CompositeStructure'''

-| UML Composite Diagram

-|-

-| '''PapyrusUMLDeploymentDiagram'''

-| UML Deployment Diagram

-|-

-| '''PapyrusUMLProfileDiagram'''

-| UML Profile Diagram

-|-

-| '''PapyrusUMLSequenceDiagram'''

-| UML Sequence Diagram

-|-

-| '''PapyrusUMLStateMachineDiagram'''

-| UML State Machine Diagram

-|-

-| '''PapyrusUMLTimingDiagram'''

-| UML Timing Diagram

-|-

-| '''UseCase'''

-| UML Use Case Diagram

-|-

-| '''PapyrusUMLInteractionOverviewDiagram'''

-| UML Interaction Overview Diagram

-|-

-| '''BlockDefinition'''

-| SysML Block Definition Diagram

-|-

-| '''InternalBlock'''

-| SysML Internal Block Diagram

-|-

-| '''Parametric'''

-| SysML Parametric Diagram

-|-

-| '''RequirementDiagram'''

-| SysML Requirements Diagram

-|}

-

-Once a diagram has been created it is possible to constraint it using rules. There are four kinds of rules:

-* Model rules constrain the type of the (root) model elements that can be visualized through this view. Hence model rules control what model elements can be selected for the ''Root element'' property of the diagrams, as shown in the capture below.

-* Owning rules constrain the type of the model elements that can own the diagram itself. In practice this materializes as the type of model elements under which the diagrams can appear in the model explorer. Owning rules control what model elements can be selected for the ''Owner'' property of the diagrams, as shown in the capture below.

-* Child rules constrain the type of the model elements that can be dropped within this diagram.

-* Palette rules constrain the display of the diagram's palette elements.

-

-[[Image:images/properties.png]]

-

-Each rule has a ''permit'' property that specify whether the rule authorizes or forbids the action it represents. Otherwise, the properties of the rules are as follow:

-* ''Model rules''

-** ''element'' (required) represents the type of the model elements to apply the rule on.

-** ''multiplicity'' (required, default is -1) represents the maximum number of this kind of diagram that can be created for the referenced model element. -1 represents an unbounded number.

-** ''stereotypes'' represents the set of stereotypes that must be applied in the model element for the rule to match. The stereotypes can be picked from the classifiers of the ''profiles'' defined in the parent diagram.

-* ''Owning rules''

-** ''element'' (required) represents the type of the model elements to apply the rule on.

-** ''multiplicity'' (required, default is -1) represents the maximum number of this kind of diagram that can be created for the referenced model element. -1 represents an unbounded number.

-** ''stereotypes'' represents the set of stereotypes that must be applied in the model element for the rule to match. The stereotypes can be picked from the classifiers of the ''profiles'' defined in the parent diagram.

-* ''Child rules''

-** ''element'' (required) represents the type of the model elements begin dropped.

-** ''stereotypes'' represents the set of stereotypes that must be applied in the model element for the rule to match. The stereotypes can be picked from the classifiers of the ''profiles'' defined in the parent diagram.

-** ''origin'' (required) represents the type of the model elements that are the target of the drop. It is usually one of the type defined in the ''model rules''.

-** Additionally, ''child rules'' can be completed with children called ''path elements'' using the '''New Child''' contextual menu. ''Path elements'' defines a path of properties that must be used from the ''origin'' to insert the new ''element'' in the model.

-* ''Palette rules''

-** ''element'' (required) represents a pattern to match for the identifier of a palette element.

-*** If the value ends with '*', it will match any palette element with the prefix specified before the '*'.

-*** If the value is '*', it will match any palette element.

-

-The minimal required rules for a diagram specification to work are:

-* A model rule that allows the diagram to be created for a model element. For example, a model rule with ''element'' set to UML Package, ''multiplicity'' to -1 and ''permit'' to true; meaning this diagram can be created for UML Packages and an unlimited number of diagrams can be created for each UML Package.

-* An owning rule that allows the diagram to be owned by a model element (appear under an element in the model explorer). For example, an owning rule with ''element'' set to UML Package, ''multiplicity'' set to -1 and ''permit'' to true; meaning an unlimited number of diagrams of this kind can be placed under each UML Package element in the model explorer.

-* A child rule that allows the dropping of any element in the diagram, expressed with the ''permit'' attribute set to true and other attributes left empty.
\ No newline at end of file
diff --git a/plugins/doc/pom.xml b/plugins/doc/pom.xml
index cc42eecec19..820a43e0a59 100644
--- a/plugins/doc/pom.xml
+++ b/plugins/doc/pom.xml
@@ -21,7 +21,7 @@
 		<module>org.eclipse.papyrus.infra.nattable.doc</module>
 		<module>org.eclipse.papyrus.infra.newchild.doc</module>
 		<module>org.eclipse.papyrus.infra.services.controlmode.doc</module>
-		<module>org.eclipse.papyrus.infra.viewpoints.doc</module>
+		<module>org.eclipse.papyrus.infra.architecture.doc</module>
 		<module>org.eclipse.papyrus.infra.types.doc</module>
 		<module>org.eclipse.papyrus.layers.documentation</module>
 		<module>org.eclipse.papyrus.req.reqif.doc</module>
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/plugin.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/plugin.properties
index 0974c1f71d9..c50aadf45aa 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/plugin.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/plugin.properties
@@ -1,14 +1,14 @@
-#  Copyright (c) 2011 Mia-Software.

-#  

-#  All rights reserved. This program and the accompanying materials

-#  are made available under the terms of the Eclipse Public License v1.0

-#  which accompanies this distribution, and is available at

-#  http://www.eclipse.org/legal/epl-v10.html

-# 

-#  Contributors:

-#  	Nicolas Guyomar (Mia-Software) - Bug 334615 - Java Query for EMF Facet

-#  	Emmanuelle Rouillé (Mia-Software) - Bug 352618 - To be able to use non derived facet structural features and save them values. 

-#  

-

-pluginName = JavaQuery2 Model

-providerName = www.example.org

+#  Copyright (c) 2011 Mia-Software.
+#  
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+# 
+#  Contributors:
+#  	Nicolas Guyomar (Mia-Software) - Bug 334615 - Java Query for EMF Facet
+#  	Emmanuelle Rouillé (Mia-Software) - Bug 352618 - To be able to use non derived facet structural features and save them values. 
+#  
+
+pluginName = JavaQuery2 Model
+providerName=Eclipse Modeling Project
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/.classpath b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/.classpath
index ea6aae6dedb..2534a1484b3 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/.classpath
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/.classpath
@@ -1,8 +1,8 @@
 <?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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/.project b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/.project
new file mode 100644
index 00000000000..171b0fe340f
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.architecture.representation.edit</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.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/META-INF/MANIFEST.MF b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..f43a8742c3b
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/META-INF/MANIFEST.MF
@@ -0,0 +1,21 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.infra.architecture.representation.edit;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Activator: org.eclipse.papyrus.infra.architecture.representation.provider.RepresentationEditPlugin$Implementation
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.papyrus.infra.architecture.representation.provider
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.architecture.representation;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.core.architecture.edit;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.constraints.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.types.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
+Bundle-ActivationPolicy: lazy
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/about.html b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/about.html
index dd02e0be168..bbf2bd6aac7 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/about.html
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/about.html
@@ -1,28 +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>December 2, 2009</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>

+<!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>January 30, 2017</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/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/build.properties b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/build.properties
new file mode 100644
index 00000000000..7fcb9ee906a
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/build.properties
@@ -0,0 +1,21 @@
+* Copyright (c) 2017 CEA LIST.
+# 
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#  
+#  Contributors:
+#  Maged Elaasar - Initial API and implementation
+#  
+# 
+
+bin.includes = .,\
+               icons/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties
+jars.compile.order = .
+source.. = src-gen/,\
+           src/
+output.. = bin/
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureDescription_concerns_Concern.gif b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/icons/full/ctool16/CreateOwningRule_newModelPath_ModelAutoCreate.gif
index 47ec394ad6b..fb95b9aa0cf 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureDescription_concerns_Concern.gif
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/icons/full/ctool16/CreateOwningRule_newModelPath_ModelAutoCreate.gif
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureDescription_correspondences_Correspondence.gif b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/icons/full/ctool16/CreateOwningRule_selectDiagramRoot_RootAutoSelect.gif
index dfe521b7dc1..ee3c4a99628 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureDescription_correspondences_Correspondence.gif
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/icons/full/ctool16/CreateOwningRule_selectDiagramRoot_RootAutoSelect.gif
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureDescription_decisions_ArchitectureDecision.gif b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/icons/full/ctool16/CreatePapyrusRepresentationKind_modelRules_ModelRule.gif
index acf9c16a0fd..4e7f8d9ecc7 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureDescription_decisions_ArchitectureDecision.gif
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/icons/full/ctool16/CreatePapyrusRepresentationKind_modelRules_ModelRule.gif
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureDescription_expresses_Architecture.gif b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/icons/full/ctool16/CreatePapyrusRepresentationKind_owningRules_OwningRule.gif
index c0d8f24198b..c3d4aed100c 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureDescription_expresses_Architecture.gif
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/icons/full/ctool16/CreatePapyrusRepresentationKind_owningRules_OwningRule.gif
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/obj16/PathElement.png b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/icons/full/obj16/ModelAutoCreate.gif
index c4295364c97..c4295364c97 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/obj16/PathElement.png
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/icons/full/obj16/ModelAutoCreate.gif
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/obj16/ModelRule.png b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/icons/full/obj16/ModelRule.gif
index 844429c8c64..844429c8c64 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/obj16/ModelRule.png
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/icons/full/obj16/ModelRule.gif
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/obj16/OwningRule.png b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/icons/full/obj16/OwningRule.gif
index 8eb92f5266e..8eb92f5266e 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/obj16/OwningRule.png
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/icons/full/obj16/OwningRule.gif
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/obj16/RootAutoSelect.png b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/icons/full/obj16/RootAutoSelect.gif
index c4295364c97..c4295364c97 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/obj16/RootAutoSelect.png
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/icons/full/obj16/RootAutoSelect.gif
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/plugin.properties b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/plugin.properties
index 3a22d3e508e..2b10a04920b 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/plugin.properties
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/plugin.properties
@@ -1,20 +1,17 @@
-##########################################################################################
-# Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
+* Copyright (c) 2017 CEA LIST.
+# 
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#  
+#  Contributors:
+#  Maged Elaasar - Initial API and implementation
+#  
 # 
-#     
-# 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:
-#  Laurent Wouters (CEA LIST) laurent.wouters@cea.fr - Initial API and implementation
-#  Christian W. Damus - bug 463156
-#
-########################################################################################
 
-pluginName = Papyrus Viewpoints Configuration - Edit
-providerName = Eclipse Modeling Project
+pluginName = Representation Edit Support
+providerName=Eclipse Modeling Project
 
 _UI_CreateChild_text = {0}
 _UI_CreateChild_text2 = {1} {0}
@@ -25,83 +22,55 @@ _UI_CreateSibling_description = Create a new sibling of type {0} for the selecte
 
 _UI_PropertyDescriptor_description = The {0} of the {1}
 
-_UI_PapyrusConfiguration_type = Papyrus Configuration
-_UI_PapyrusViewpoint_type = Papyrus Viewpoint
-_UI_PapyrusView_type = Papyrus View
+_UI_PapyrusRepresentationKind_type = Papyrus Representation Kind
 _UI_PapyrusDiagram_type = Papyrus Diagram
-_UI_DiagramCreationRule_type = Diagram Creation Rule
+_UI_PapyrusSyncTable_type = Papyrus Sync Table
+_UI_PapyrusTable_type = Papyrus Table
+_UI_Rule_type = Rule
 _UI_ModelRule_type = Model Rule
+_UI_OwningRule_type = Owning Rule
+_UI_ChildRule_type = Child Rule
 _UI_PaletteRule_type = Palette Rule
-_UI_Rule_type = Rule
 _UI_PathElement_type = Path Element
+_UI_ModelAutoCreate_type = Model Auto Create
+_UI_RootAutoSelect_type = Root Auto Select
+_UI_AssistantRule_type = Assistant Rule
 _UI_Unknown_type = Object
 
 _UI_Unknown_datatype= Value
 
-_UI_PapyrusConfiguration_defaultStakeholder_feature = Default Stakeholder
-_UI_PapyrusConfiguration_metamodel_feature = Metamodel
-_UI_PapyrusViewpoint_parent_feature = Parent
-_UI_PapyrusDiagram_creationRules_feature = Creation Rules
-_UI_PapyrusDiagram_modelRules_feature = Model Rules
+_UI_PapyrusRepresentationKind_parent_feature = Parent
+_UI_PapyrusRepresentationKind_modelRules_feature = Model Rules
+_UI_PapyrusRepresentationKind_owningRules_feature = Owning Rules
+_UI_PapyrusRepresentationKind_implementationID_feature = Implementation ID
+_UI_PapyrusDiagram_customPalette_feature = Custom Palette
+_UI_PapyrusDiagram_customStyle_feature = Custom Style
+_UI_PapyrusDiagram_childRules_feature = Child Rules
 _UI_PapyrusDiagram_paletteRules_feature = Palette Rules
-_UI_DiagramCreationRule_element_feature = Element
-_UI_DiagramCreationRule_multiplicity_feature = Multiplicity
-_UI_ModelRule_element_feature = Element
-_UI_ModelRule_origin_feature = Origin
-_UI_ModelRule_insertionPath_feature = Insertion Path
-_UI_PaletteRule_element_feature = Element
+_UI_PapyrusDiagram_assistantRules_feature = Assistant Rules
+_UI_PapyrusTable_configuration_feature = Configuration
 _UI_Rule_permit_feature = Permit
-_UI_PathElement_feature_feature = Feature
-_UI_PathElement_origin_feature = Origin
-_UI_PathElement_target_feature = Target
-_UI_Unknown_feature = Unspecified
-
-_UI_OwningRule_type = Owning Rule
-_UI_ChildRule_type = Child Rule
-_UI_PapyrusView_modelRules_feature = Model Rules
-_UI_PapyrusView_owningRules_feature = Owning Rules
-_UI_PapyrusDiagram_childRules_feature = Child Rules
+_UI_ModelRule_element_feature = Element
+_UI_ModelRule_stereotypes_feature = Stereotypes
 _UI_ModelRule_multiplicity_feature = Multiplicity
 _UI_OwningRule_element_feature = Element
+_UI_OwningRule_stereotypes_feature = Stereotypes
 _UI_OwningRule_multiplicity_feature = Multiplicity
+_UI_OwningRule_newModelPath_feature = New Model Path
+_UI_OwningRule_selectDiagramRoot_feature = Select Diagram Root
 _UI_ChildRule_element_feature = Element
+_UI_ChildRule_stereotypes_feature = Stereotypes
 _UI_ChildRule_origin_feature = Origin
 _UI_ChildRule_insertionPath_feature = Insertion Path
-_UI_PapyrusView_implementationID_feature = Implementation ID
-_UI_PapyrusView_parent_feature = Parent
-_UI_PapyrusConfiguration_profiles_feature = Profiles
-_UI_PapyrusView_icon_feature = Icon
-_UI_ModelRule_stereotypes_feature = Stereotypes
-_UI_OwningRule_stereotypes_feature = Stereotypes
-_UI_ChildRule_stereotypes_feature = Stereotypes
-_UI_PapyrusView_profiles_feature = Profiles
-_UI_PapyrusSyncTable_type = Papyrus Sync Table
-_UI_PapyrusTable_type = Papyrus Table
-_UI_PapyrusTable_configuration_feature = Configuration
-_UI_PapyrusDiagram_customPalette_feature = Custom Palette
-_UI_PapyrusDiagram_customStyle_feature = Custom Style
-_UI_PapyrusView_category_feature = Category
-_UI_Category_type = View Category
-_UI_PapyrusView_categories_feature = Categories
-_UI_Category_name_feature = Name
-_UI_PapyrusConfiguration_categories_feature = View Categories
-_UI_ElementImport_type = Element Import
-_UI_PapyrusDiagram_imports_feature = Imports
-_UI_ElementImport_from_feature = From
-_UI_ElementImport_element_feature = Element
-_UI_ModelRule_autoSelectPath_feature = Auto Select Path
-_UI_ModelAutoCreate_type = Model Auto Create
-_UI_OwningRule_newModelPath_feature = New Model Path
+_UI_PaletteRule_element_feature = Element
+_UI_PathElement_feature_feature = Feature
+_UI_PathElement_origin_feature = Origin
+_UI_PathElement_target_feature = Target
 _UI_ModelAutoCreate_feature_feature = Feature
 _UI_ModelAutoCreate_origin_feature = Origin
 _UI_ModelAutoCreate_creationType_feature = Creation Type
-_UI_RootAutoSelect_type = Root Auto Select
-_UI_OwningRule_selectDiagramRoot_feature = Select Diagram Root
 _UI_RootAutoSelect_feature_feature = Feature
-_UI_RootAutoSelect_origin_feature = Origin
-_UI_AssistantRule_type = Assistant Rule
-_UI_AssistantRule_label = Assistant: {0} => {1}
 _UI_AssistantRule_elementTypeID_feature = Element Type ID
-_UI_PapyrusDiagram_assistantRules_feature = Assistant Rules
-_UI_allow = allow
-_UI_deny = deny
+_UI_Unknown_feature = Unspecified
+
+_UI_PapyrusDiagram_creationCommandClass_feature = Creation Command Class
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/plugin.xml b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/plugin.xml
new file mode 100644
index 00000000000..9c884712e5e
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/plugin.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+* Copyright (c) 2017 CEA LIST.
+ 
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/legal/epl-v10.html
+  
+  Contributors:
+  Maged Elaasar - Initial API and implementation
+  
+ 
+-->
+
+<plugin>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated Representation -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/infra/core/architecture/representation"
+            class="org.eclipse.papyrus.infra.architecture.representation.provider.RepresentationItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/pom.xml b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/pom.xml
new file mode 100644
index 00000000000..45b95e5cf0d
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.papyrus</groupId>
+		<artifactId>org.eclipse.papyrus.infra-architecture</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.architecture.representation.edit</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/ModelAutoCreateItemProvider.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src-gen/org/eclipse/papyrus/infra/architecture/representation/provider/ModelAutoCreateItemProvider.java
index 49fd7039bba..d5a8c2607dc 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/ModelAutoCreateItemProvider.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src-gen/org/eclipse/papyrus/infra/architecture/representation/provider/ModelAutoCreateItemProvider.java
@@ -1,18 +1,17 @@
 /**
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
+* Copyright (c) 2017 CEA LIST.
+ * 
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
  *  which accompanies this distribution, and is available at
  *  http://www.eclipse.org/legal/epl-v10.html
- *
+ *  
  *  Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
  */
-package org.eclipse.papyrus.infra.viewpoints.configuration.provider;
+package org.eclipse.papyrus.infra.architecture.representation.provider;
 
 
 import java.util.Collection;
@@ -34,20 +33,18 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ComplexTypePropertyDescriptor;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.viewpoints.configuration.EReferencePropertyDescriptor;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ModelAutoCreate;
+import org.eclipse.papyrus.infra.architecture.representation.ModelAutoCreate;
+import org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.viewpoints.configuration.ModelAutoCreate} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.architecture.representation.ModelAutoCreate} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class ModelAutoCreateItemProvider
-		extends ItemProviderAdapter
-		implements
+public class ModelAutoCreateItemProvider 
+	extends ItemProviderAdapter
+	implements
 		IEditingDomainItemProvider,
 		IStructuredItemContentProvider,
 		ITreeItemContentProvider,
@@ -85,15 +82,16 @@ public class ModelAutoCreateItemProvider
 	 * This adds a property descriptor for the Feature feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated NOT
 	 */
 	protected void addFeaturePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new EReferencePropertyDescriptor(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
+		itemPropertyDescriptors.add(new EReferencePropertyDescriptor(
+			createItemPropertyDescriptor
+				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
 				getString("_UI_ModelAutoCreate_feature_feature"),
 				getString("_UI_PropertyDescriptor_description", "_UI_ModelAutoCreate_feature_feature", "_UI_ModelAutoCreate_type"),
-				ConfigurationPackage.Literals.MODEL_AUTO_CREATE__FEATURE,
+				RepresentationPackage.Literals.MODEL_AUTO_CREATE__FEATURE,
 				true,
 				false,
 				true,
@@ -109,24 +107,25 @@ public class ModelAutoCreateItemProvider
 	 * @generated
 	 */
 	protected void addOriginPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_ModelAutoCreate_origin_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_ModelAutoCreate_origin_feature", "_UI_ModelAutoCreate_type"),
-				ConfigurationPackage.Literals.MODEL_AUTO_CREATE__ORIGIN,
-				false,
-				false,
-				false,
-				null,
-				null,
-				null));
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ModelAutoCreate_origin_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_ModelAutoCreate_origin_feature", "_UI_ModelAutoCreate_type"),
+				 RepresentationPackage.Literals.MODEL_AUTO_CREATE__ORIGIN,
+				 false,
+				 false,
+				 false,
+				 null,
+				 null,
+				 null));
 	}
 
 	/**
 	 * This adds a property descriptor for the Creation Type feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated NOT
 	 */
 	protected void addCreationTypePropertyDescriptor(Object object) {
@@ -134,7 +133,7 @@ public class ModelAutoCreateItemProvider
 				getResourceLocator(),
 				getString("_UI_ModelAutoCreate_creationType_feature"),
 				getString("_UI_PropertyDescriptor_description", "_UI_ModelAutoCreate_creationType_feature", "_UI_ModelAutoCreate_type"),
-				ConfigurationPackage.Literals.MODEL_AUTO_CREATE__CREATION_TYPE,
+				RepresentationPackage.Literals.MODEL_AUTO_CREATE__CREATION_TYPE,
 				true,
 				false,
 				false,
@@ -147,22 +146,11 @@ public class ModelAutoCreateItemProvider
 	 * This returns ModelAutoCreate.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @generated NOT - Custom Image
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/PathElement.png"));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
-	protected boolean shouldComposeCreationImage() {
-		return true;
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ModelAutoCreate"));
 	}
 
 	/**
@@ -184,7 +172,7 @@ public class ModelAutoCreateItemProvider
 		builder.append(target != null ? target : "?");
 		return builder.toString();
 	}
-
+	
 
 	/**
 	 * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -198,9 +186,9 @@ public class ModelAutoCreateItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(ModelAutoCreate.class)) {
-		case ConfigurationPackage.MODEL_AUTO_CREATE__CREATION_TYPE:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
+			case RepresentationPackage.MODEL_AUTO_CREATE__CREATION_TYPE:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -225,7 +213,7 @@ public class ModelAutoCreateItemProvider
 	 */
 	@Override
 	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender) adapterFactory).getResourceLocator();
+		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
 	}
 
 }
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/ModelRuleItemProvider.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src-gen/org/eclipse/papyrus/infra/architecture/representation/provider/ModelRuleItemProvider.java
index 6786709fd53..b423bf321f4 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/ModelRuleItemProvider.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src-gen/org/eclipse/papyrus/infra/architecture/representation/provider/ModelRuleItemProvider.java
@@ -1,18 +1,17 @@
-/*****************************************************************************
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.viewpoints.configuration.provider;
+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.architecture.representation.provider;
 
 
 import java.util.Collection;
@@ -27,19 +26,16 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.papyrus.infra.constraints.ConstraintsFactory;
 import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.viewpoints.configuration.EClassPropertyDescriptor;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ModelRule;
-import org.eclipse.papyrus.infra.viewpoints.configuration.StereotypePropertyDescriptor;
+import org.eclipse.papyrus.infra.architecture.representation.ModelRule;
+import org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.viewpoints.configuration.ModelRule} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.architecture.representation.ModelRule} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class ModelRuleItemProvider
-		extends RuleItemProvider {
+public class ModelRuleItemProvider extends RuleItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
@@ -76,24 +72,25 @@ public class ModelRuleItemProvider
 	 * @generated
 	 */
 	protected void addElementMultiplicityPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_DisplayUnit_elementMultiplicity_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_DisplayUnit_elementMultiplicity_feature", "_UI_DisplayUnit_type"),
-				ConstraintsPackage.Literals.DISPLAY_UNIT__ELEMENT_MULTIPLICITY,
-				true,
-				false,
-				false,
-				ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-				null,
-				null));
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_DisplayUnit_elementMultiplicity_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_DisplayUnit_elementMultiplicity_feature", "_UI_DisplayUnit_type"),
+				 ConstraintsPackage.Literals.DISPLAY_UNIT__ELEMENT_MULTIPLICITY,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+				 null,
+				 null));
 	}
 
 	/**
 	 * This adds a property descriptor for the Element feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated NOT
 	 */
 	protected void addElementPropertyDescriptor(Object object) {
@@ -101,7 +98,7 @@ public class ModelRuleItemProvider
 				getResourceLocator(),
 				getString("_UI_ModelRule_element_feature"),
 				getString("_UI_PropertyDescriptor_description", "_UI_ModelRule_element_feature", "_UI_ModelRule_type"),
-				ConfigurationPackage.Literals.MODEL_RULE__ELEMENT,
+				RepresentationPackage.Literals.MODEL_RULE__ELEMENT,
 				true,
 				false,
 				true,
@@ -114,7 +111,6 @@ public class ModelRuleItemProvider
 	 * This adds a property descriptor for the Stereotypes feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated NOT
 	 */
 	protected void addStereotypesPropertyDescriptor(Object object) {
@@ -122,7 +118,7 @@ public class ModelRuleItemProvider
 				getResourceLocator(),
 				getString("_UI_ModelRule_stereotypes_feature"),
 				getString("_UI_PropertyDescriptor_description", "_UI_ModelRule_stereotypes_feature", "_UI_ModelRule_type"),
-				ConfigurationPackage.Literals.MODEL_RULE__STEREOTYPES,
+				RepresentationPackage.Literals.MODEL_RULE__STEREOTYPES,
 				true,
 				false,
 				true,
@@ -138,17 +134,19 @@ public class ModelRuleItemProvider
 	 * @generated
 	 */
 	protected void addMultiplicityPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_ModelRule_multiplicity_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_ModelRule_multiplicity_feature", "_UI_ModelRule_type"),
-				ConfigurationPackage.Literals.MODEL_RULE__MULTIPLICITY,
-				true,
-				false,
-				false,
-				ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-				null,
-				null));
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ModelRule_multiplicity_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_ModelRule_multiplicity_feature", "_UI_ModelRule_type"),
+				 RepresentationPackage.Literals.MODEL_RULE__MULTIPLICITY,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+				 null,
+				 null));
 	}
 
 	/**
@@ -185,22 +183,11 @@ public class ModelRuleItemProvider
 	 * This returns ModelRule.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @generated NOT - Custom Image
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ModelRule.png"));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
-	protected boolean shouldComposeCreationImage() {
-		return true;
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ModelRule"));
 	}
 
 	/**
@@ -242,13 +229,13 @@ public class ModelRuleItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(ModelRule.class)) {
-		case ConfigurationPackage.MODEL_RULE__ELEMENT_MULTIPLICITY:
-		case ConfigurationPackage.MODEL_RULE__MULTIPLICITY:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		case ConfigurationPackage.MODEL_RULE__CONSTRAINTS:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-			return;
+			case RepresentationPackage.MODEL_RULE__ELEMENT_MULTIPLICITY:
+			case RepresentationPackage.MODEL_RULE__MULTIPLICITY:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+			case RepresentationPackage.MODEL_RULE__CONSTRAINTS:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+				return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -264,11 +251,15 @@ public class ModelRuleItemProvider
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add(createChildParameter(ConstraintsPackage.Literals.DISPLAY_UNIT__CONSTRAINTS,
-				ConstraintsFactory.eINSTANCE.createSimpleConstraint()));
+		newChildDescriptors.add
+			(createChildParameter
+				(ConstraintsPackage.Literals.DISPLAY_UNIT__CONSTRAINTS,
+				 ConstraintsFactory.eINSTANCE.createSimpleConstraint()));
 
-		newChildDescriptors.add(createChildParameter(ConstraintsPackage.Literals.DISPLAY_UNIT__CONSTRAINTS,
-				ConstraintsFactory.eINSTANCE.createCompositeConstraint()));
+		newChildDescriptors.add
+			(createChildParameter
+				(ConstraintsPackage.Literals.DISPLAY_UNIT__CONSTRAINTS,
+				 ConstraintsFactory.eINSTANCE.createCompositeConstraint()));
 	}
 
 }
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/OwningRuleItemProvider.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src-gen/org/eclipse/papyrus/infra/architecture/representation/provider/OwningRuleItemProvider.java
index e89dd7fd771..b96674f3ada 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/OwningRuleItemProvider.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src-gen/org/eclipse/papyrus/infra/architecture/representation/provider/OwningRuleItemProvider.java
@@ -1,18 +1,17 @@
-/*****************************************************************************
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.viewpoints.configuration.provider;
+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.architecture.representation.provider;
 
 
 import java.util.Collection;
@@ -25,20 +24,17 @@ import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationFactory;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.viewpoints.configuration.EClassPropertyDescriptor;
-import org.eclipse.papyrus.infra.viewpoints.configuration.OwningRule;
-import org.eclipse.papyrus.infra.viewpoints.configuration.StereotypePropertyDescriptor;
+import org.eclipse.papyrus.infra.architecture.representation.OwningRule;
+import org.eclipse.papyrus.infra.architecture.representation.RepresentationFactory;
+import org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.viewpoints.configuration.OwningRule} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.architecture.representation.OwningRule} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class OwningRuleItemProvider
-		extends RuleItemProvider {
+public class OwningRuleItemProvider extends RuleItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
@@ -53,6 +49,7 @@ public class OwningRuleItemProvider
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @generated
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
@@ -70,7 +67,6 @@ public class OwningRuleItemProvider
 	 * This adds a property descriptor for the Element feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated NOT
 	 */
 	protected void addElementPropertyDescriptor(Object object) {
@@ -78,7 +74,7 @@ public class OwningRuleItemProvider
 				getResourceLocator(),
 				getString("_UI_OwningRule_element_feature"),
 				getString("_UI_PropertyDescriptor_description", "_UI_OwningRule_element_feature", "_UI_OwningRule_type"),
-				ConfigurationPackage.Literals.OWNING_RULE__ELEMENT,
+				RepresentationPackage.Literals.OWNING_RULE__ELEMENT,
 				true,
 				false,
 				true,
@@ -91,7 +87,6 @@ public class OwningRuleItemProvider
 	 * This adds a property descriptor for the Stereotypes feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated NOT
 	 */
 	protected void addStereotypesPropertyDescriptor(Object object) {
@@ -99,7 +94,7 @@ public class OwningRuleItemProvider
 				getResourceLocator(),
 				getString("_UI_OwningRule_stereotypes_feature"),
 				getString("_UI_PropertyDescriptor_description", "_UI_OwningRule_stereotypes_feature", "_UI_OwningRule_type"),
-				ConfigurationPackage.Literals.OWNING_RULE__STEREOTYPES,
+				RepresentationPackage.Literals.OWNING_RULE__STEREOTYPES,
 				true,
 				false,
 				true,
@@ -115,17 +110,19 @@ public class OwningRuleItemProvider
 	 * @generated
 	 */
 	protected void addMultiplicityPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_OwningRule_multiplicity_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_OwningRule_multiplicity_feature", "_UI_OwningRule_type"),
-				ConfigurationPackage.Literals.OWNING_RULE__MULTIPLICITY,
-				true,
-				false,
-				false,
-				ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-				null,
-				null));
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_OwningRule_multiplicity_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_OwningRule_multiplicity_feature", "_UI_OwningRule_type"),
+				 RepresentationPackage.Literals.OWNING_RULE__MULTIPLICITY,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+				 null,
+				 null));
 	}
 
 	/**
@@ -140,8 +137,8 @@ public class OwningRuleItemProvider
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(ConfigurationPackage.Literals.OWNING_RULE__NEW_MODEL_PATH);
-			childrenFeatures.add(ConfigurationPackage.Literals.OWNING_RULE__SELECT_DIAGRAM_ROOT);
+			childrenFeatures.add(RepresentationPackage.Literals.OWNING_RULE__NEW_MODEL_PATH);
+			childrenFeatures.add(RepresentationPackage.Literals.OWNING_RULE__SELECT_DIAGRAM_ROOT);
 		}
 		return childrenFeatures;
 	}
@@ -163,22 +160,11 @@ public class OwningRuleItemProvider
 	 * This returns OwningRule.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @generated NOT - Custom Image
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/OwningRule.png"));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
-	protected boolean shouldComposeCreationImage() {
-		return true;
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/OwningRule"));
 	}
 
 	/**
@@ -207,7 +193,7 @@ public class OwningRuleItemProvider
 		builder.append(rule.isPermit() ? "allow" : "deny");
 		return builder.toString();
 	}
-
+	
 	/**
 	 * 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}.
@@ -220,13 +206,13 @@ public class OwningRuleItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(OwningRule.class)) {
-		case ConfigurationPackage.OWNING_RULE__MULTIPLICITY:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		case ConfigurationPackage.OWNING_RULE__NEW_MODEL_PATH:
-		case ConfigurationPackage.OWNING_RULE__SELECT_DIAGRAM_ROOT:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-			return;
+			case RepresentationPackage.OWNING_RULE__MULTIPLICITY:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+			case RepresentationPackage.OWNING_RULE__NEW_MODEL_PATH:
+			case RepresentationPackage.OWNING_RULE__SELECT_DIAGRAM_ROOT:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+				return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -242,11 +228,15 @@ public class OwningRuleItemProvider
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add(createChildParameter(ConfigurationPackage.Literals.OWNING_RULE__NEW_MODEL_PATH,
-				ConfigurationFactory.eINSTANCE.createModelAutoCreate()));
+		newChildDescriptors.add
+			(createChildParameter
+				(RepresentationPackage.Literals.OWNING_RULE__NEW_MODEL_PATH,
+				 RepresentationFactory.eINSTANCE.createModelAutoCreate()));
 
-		newChildDescriptors.add(createChildParameter(ConfigurationPackage.Literals.OWNING_RULE__SELECT_DIAGRAM_ROOT,
-				ConfigurationFactory.eINSTANCE.createRootAutoSelect()));
+		newChildDescriptors.add
+			(createChildParameter
+				(RepresentationPackage.Literals.OWNING_RULE__SELECT_DIAGRAM_ROOT,
+				 RepresentationFactory.eINSTANCE.createRootAutoSelect()));
 	}
 
 }
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src-gen/org/eclipse/papyrus/infra/architecture/representation/provider/PapyrusRepresentationKindItemProvider.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src-gen/org/eclipse/papyrus/infra/architecture/representation/provider/PapyrusRepresentationKindItemProvider.java
new file mode 100644
index 00000000000..e159b0a91e5
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src-gen/org/eclipse/papyrus/infra/architecture/representation/provider/PapyrusRepresentationKindItemProvider.java
@@ -0,0 +1,215 @@
+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.architecture.representation.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.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage;
+import org.eclipse.papyrus.infra.core.architecture.provider.RepresentationKindItemProvider;
+import org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind;
+import org.eclipse.papyrus.infra.architecture.representation.RepresentationFactory;
+import org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class PapyrusRepresentationKindItemProvider extends RepresentationKindItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public PapyrusRepresentationKindItemProvider(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);
+
+			addParentPropertyDescriptor(object);
+			addImplementationIDPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Parent feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addParentPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_PapyrusRepresentationKind_parent_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_PapyrusRepresentationKind_parent_feature", "_UI_PapyrusRepresentationKind_type"),
+				 RepresentationPackage.Literals.PAPYRUS_REPRESENTATION_KIND__PARENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Implementation ID feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addImplementationIDPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_PapyrusRepresentationKind_implementationID_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_PapyrusRepresentationKind_implementationID_feature", "_UI_PapyrusRepresentationKind_type"),
+				 RepresentationPackage.Literals.PAPYRUS_REPRESENTATION_KIND__IMPLEMENTATION_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(RepresentationPackage.Literals.PAPYRUS_REPRESENTATION_KIND__MODEL_RULES);
+			childrenFeatures.add(RepresentationPackage.Literals.PAPYRUS_REPRESENTATION_KIND__OWNING_RULES);
+		}
+		return childrenFeatures;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
+
+		return super.getChildFeature(object, child);
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((PapyrusRepresentationKind)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_PapyrusRepresentationKind_type") :
+			getString("_UI_PapyrusRepresentationKind_type") + " " + label;
+	}
+	
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 */
+	protected static String getTextFor(PapyrusRepresentationKind view) {
+		ArchitectureDescriptionLanguage lang = (ArchitectureDescriptionLanguage) view.eContainer();
+		if (view.getName() == null) {
+			return (lang.getName() + " :: <natural> [" + view.getImplementationID() + "]");
+		}
+		return (lang.getName() + " :: " + view.getName());
+	}
+
+
+	/**
+	 * 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(PapyrusRepresentationKind.class)) {
+			case RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__IMPLEMENTATION_ID:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+			case RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__MODEL_RULES:
+			case RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__OWNING_RULES:
+				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
+				(RepresentationPackage.Literals.PAPYRUS_REPRESENTATION_KIND__MODEL_RULES,
+				 RepresentationFactory.eINSTANCE.createModelRule()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(RepresentationPackage.Literals.PAPYRUS_REPRESENTATION_KIND__OWNING_RULES,
+				 RepresentationFactory.eINSTANCE.createOwningRule()));
+	}
+
+}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/Iso42010EditPlugin.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src-gen/org/eclipse/papyrus/infra/architecture/representation/provider/RepresentationEditPlugin.java
index 9f92c680c51..6aecd4e8cc9 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/Iso42010EditPlugin.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src-gen/org/eclipse/papyrus/infra/architecture/representation/provider/RepresentationEditPlugin.java
@@ -1,106 +1,105 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010.provider;

-

-import org.eclipse.emf.common.EMFPlugin;

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

-

-/**

- * This is the central singleton for the Iso42010 edit plugin.

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

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

- *

- * @generated

- */

-public final class Iso42010EditPlugin extends EMFPlugin {

-	/**

-	 * Keep track of the singleton.

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

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

-	 *

-	 * @generated

-	 */

-	public static final Iso42010EditPlugin INSTANCE = new Iso42010EditPlugin();

-

-	/**

-	 * Keep track of the singleton.

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

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

-	 *

-	 * @generated

-	 */

-	private static Implementation plugin;

-

-	/**

-	 * Create the instance.

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

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

-	 *

-	 * @generated

-	 */

-	public Iso42010EditPlugin() {

-		super(new ResourceLocator[] {

-				});

-	}

-

-	/**

-	 * Returns the singleton instance of the Eclipse plugin.

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

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

-	 *

-	 * @return the singleton instance.

-	 * @generated

-	 */

-	@Override

-	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 EclipsePlugin {

-		/**

-		 * Creates an instance.

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

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

-		 *

-		 * @generated

-		 */

-		public Implementation() {

-			super();

-

-			// Remember the static instance.

-			//

-			plugin = this;

-		}

-	}

-

-}

+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.architecture.representation.provider;
+
+import org.eclipse.emf.common.EMFPlugin;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.papyrus.infra.constraints.provider.ConstraintsEditPlugin;
+import org.eclipse.papyrus.infra.core.architecture.provider.ArchitectureEditPlugin;
+import org.eclipse.papyrus.infra.types.provider.TypesConfigurationsEditPlugin;
+
+/**
+ * This is the central singleton for the Representation edit plugin.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public final class RepresentationEditPlugin extends EMFPlugin {
+	/**
+	 * Keep track of the singleton.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final RepresentationEditPlugin INSTANCE = new RepresentationEditPlugin();
+
+	/**
+	 * Keep track of the singleton.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static Implementation plugin;
+
+	/**
+	 * Create the instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RepresentationEditPlugin() {
+		super
+		  (new ResourceLocator [] {
+		     ArchitectureEditPlugin.INSTANCE,
+		     ConstraintsEditPlugin.INSTANCE,
+		     TypesConfigurationsEditPlugin.INSTANCE,
+		   });
+	}
+
+	/**
+	 * Returns the singleton instance of the Eclipse plugin.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the singleton instance.
+	 * @generated
+	 */
+	@Override
+	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 EclipsePlugin {
+		/**
+		 * Creates an instance.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public Implementation() {
+			super();
+
+			// Remember the static instance.
+			//
+			plugin = this;
+		}
+	}
+
+}
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src-gen/org/eclipse/papyrus/infra/architecture/representation/provider/RepresentationItemProviderAdapterFactory.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src-gen/org/eclipse/papyrus/infra/architecture/representation/provider/RepresentationItemProviderAdapterFactory.java
new file mode 100644
index 00000000000..1fd81305a2c
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src-gen/org/eclipse/papyrus/infra/architecture/representation/provider/RepresentationItemProviderAdapterFactory.java
@@ -0,0 +1,321 @@
+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.architecture.representation.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.provider.ChangeNotifier;
+import org.eclipse.emf.edit.provider.ChildCreationExtenderManager;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IChangeNotifier;
+import org.eclipse.emf.edit.provider.IChildCreationExtender;
+import org.eclipse.emf.edit.provider.IDisposable;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.INotifyChangedListener;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage;
+import org.eclipse.papyrus.infra.architecture.representation.util.RepresentationAdapterFactory;
+
+/**
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * Note that most of the adapters are shared among multiple instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class RepresentationItemProviderAdapterFactory extends RepresentationAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable, IChildCreationExtender {
+	/**
+	 * This keeps track of the root adapter factory that delegates to this adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory parentAdapterFactory;
+
+	/**
+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IChangeNotifier changeNotifier = new ChangeNotifier();
+
+	/**
+	 * This helps manage the child creation extenders.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(RepresentationEditPlugin.INSTANCE, RepresentationPackage.eNS_URI);
+
+	/**
+	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Object> supportedTypes = new ArrayList<Object>();
+
+	/**
+	 * This constructs an instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RepresentationItemProviderAdapterFactory() {
+		supportedTypes.add(IEditingDomainItemProvider.class);
+		supportedTypes.add(IStructuredItemContentProvider.class);
+		supportedTypes.add(ITreeItemContentProvider.class);
+		supportedTypes.add(IItemLabelProvider.class);
+		supportedTypes.add(IItemPropertySource.class);
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.architecture.representation.ModelRule} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ModelRuleItemProvider modelRuleItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.architecture.representation.ModelRule}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createModelRuleAdapter() {
+		if (modelRuleItemProvider == null) {
+			modelRuleItemProvider = new ModelRuleItemProvider(this);
+		}
+
+		return modelRuleItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.architecture.representation.OwningRule} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected OwningRuleItemProvider owningRuleItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.architecture.representation.OwningRule}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createOwningRuleAdapter() {
+		if (owningRuleItemProvider == null) {
+			owningRuleItemProvider = new OwningRuleItemProvider(this);
+		}
+
+		return owningRuleItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.architecture.representation.ModelAutoCreate} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ModelAutoCreateItemProvider modelAutoCreateItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.architecture.representation.ModelAutoCreate}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createModelAutoCreateAdapter() {
+		if (modelAutoCreateItemProvider == null) {
+			modelAutoCreateItemProvider = new ModelAutoCreateItemProvider(this);
+		}
+
+		return modelAutoCreateItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.architecture.representation.RootAutoSelect} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected RootAutoSelectItemProvider rootAutoSelectItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.architecture.representation.RootAutoSelect}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createRootAutoSelectAdapter() {
+		if (rootAutoSelectItemProvider == null) {
+			rootAutoSelectItemProvider = new RootAutoSelectItemProvider(this);
+		}
+
+		return rootAutoSelectItemProvider;
+	}
+
+	/**
+	 * This returns the root adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ComposeableAdapterFactory getRootAdapterFactory() {
+		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
+	}
+
+	/**
+	 * This sets the composed adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
+		this.parentAdapterFactory = parentAdapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object type) {
+		return supportedTypes.contains(type) || super.isFactoryForType(type);
+	}
+
+	/**
+	 * This implementation substitutes the factory itself as the key for the adapter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter adapt(Notifier notifier, Object type) {
+		return super.adapt(notifier, this);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object adapt(Object object, Object type) {
+		if (isFactoryForType(type)) {
+			Object adapter = super.adapt(object, type);
+			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
+				return adapter;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public List<IChildCreationExtender> getChildCreationExtenders() {
+		return childCreationExtenderManager.getChildCreationExtenders();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Collection<?> getNewChildDescriptors(Object object, EditingDomain editingDomain) {
+		return childCreationExtenderManager.getNewChildDescriptors(object, editingDomain);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ResourceLocator getResourceLocator() {
+		return childCreationExtenderManager;
+	}
+
+	/**
+	 * This adds a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void addListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.addListener(notifyChangedListener);
+	}
+
+	/**
+	 * This removes a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void removeListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.removeListener(notifyChangedListener);
+	}
+
+	/**
+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void fireNotifyChanged(Notification notification) {
+		changeNotifier.fireNotifyChanged(notification);
+
+		if (parentAdapterFactory != null) {
+			parentAdapterFactory.fireNotifyChanged(notification);
+		}
+	}
+
+	/**
+	 * This disposes all of the item providers created by this factory. 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void dispose() {
+		if (modelRuleItemProvider != null) modelRuleItemProvider.dispose();
+		if (owningRuleItemProvider != null) owningRuleItemProvider.dispose();
+		if (modelAutoCreateItemProvider != null) modelAutoCreateItemProvider.dispose();
+		if (rootAutoSelectItemProvider != null) rootAutoSelectItemProvider.dispose();
+	}
+
+}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/RootAutoSelectItemProvider.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src-gen/org/eclipse/papyrus/infra/architecture/representation/provider/RootAutoSelectItemProvider.java
index 5eead0e08c1..4d42a3d3833 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/RootAutoSelectItemProvider.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src-gen/org/eclipse/papyrus/infra/architecture/representation/provider/RootAutoSelectItemProvider.java
@@ -1,18 +1,17 @@
 /**
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
+* Copyright (c) 2017 CEA LIST.
+ * 
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
  *  which accompanies this distribution, and is available at
  *  http://www.eclipse.org/legal/epl-v10.html
- *
+ *  
  *  Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
  */
-package org.eclipse.papyrus.infra.viewpoints.configuration.provider;
+package org.eclipse.papyrus.infra.architecture.representation.provider;
 
 
 import java.util.Collection;
@@ -20,9 +19,7 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IChildCreationExtender;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
@@ -32,18 +29,17 @@ 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.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
+import org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.viewpoints.configuration.RootAutoSelect} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.architecture.representation.RootAutoSelect} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class RootAutoSelectItemProvider
-		extends ItemProviderAdapter
-		implements
+public class RootAutoSelectItemProvider 
+	extends ItemProviderAdapter
+	implements
 		IEditingDomainItemProvider,
 		IStructuredItemContentProvider,
 		ITreeItemContentProvider,
@@ -82,38 +78,30 @@ public class RootAutoSelectItemProvider
 	 * @generated
 	 */
 	protected void addFeaturePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_RootAutoSelect_feature_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_RootAutoSelect_feature_feature", "_UI_RootAutoSelect_type"),
-				ConfigurationPackage.Literals.ROOT_AUTO_SELECT__FEATURE,
-				true,
-				false,
-				true,
-				null,
-				null,
-				null));
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_RootAutoSelect_feature_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_RootAutoSelect_feature_feature", "_UI_RootAutoSelect_type"),
+				 RepresentationPackage.Literals.ROOT_AUTO_SELECT__FEATURE,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
 	}
 
 	/**
 	 * This returns RootAutoSelect.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated NOT - Custom Image
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/RootAutoSelect.png"));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
-	protected boolean shouldComposeCreationImage() {
-		return true;
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/RootAutoSelect"));
 	}
 
 	/**
@@ -126,7 +114,7 @@ public class RootAutoSelectItemProvider
 	public String getText(Object object) {
 		return getString("_UI_RootAutoSelect_type");
 	}
-
+	
 
 	/**
 	 * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -161,7 +149,7 @@ public class RootAutoSelectItemProvider
 	 */
 	@Override
 	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender) adapterFactory).getResourceLocator();
+		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
 	}
 
 }
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/CorrespondenceRuleItemProvider.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src-gen/org/eclipse/papyrus/infra/architecture/representation/provider/RuleItemProvider.java
index ed0be4ead22..4568ace215f 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/CorrespondenceRuleItemProvider.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src-gen/org/eclipse/papyrus/infra/architecture/representation/provider/RuleItemProvider.java
@@ -1,162 +1,154 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010.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.ItemProviderAdapter;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.viewpoints.iso42010.CorrespondenceRule} object.

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

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

- *

- * @generated

- */

-public class CorrespondenceRuleItemProvider

-		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 CorrespondenceRuleItemProvider(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);

-

-			addGovernsPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	protected void addGovernsPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_CorrespondenceRule_governs_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_CorrespondenceRule_governs_feature", "_UI_CorrespondenceRule_type"),

-						Iso42010Package.Literals.CORRESPONDENCE_RULE__GOVERNS,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

-	 * This returns CorrespondenceRule.gif.

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

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

-	}

-

-	/**

-	 * 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_CorrespondenceRule_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);

-	}

-

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return Iso42010EditPlugin.INSTANCE;

-	}

-

-}

+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.architecture.representation.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.IChildCreationExtender;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage;
+import org.eclipse.papyrus.infra.architecture.representation.Rule;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.architecture.representation.Rule} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class RuleItemProvider 
+	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 RuleItemProvider(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);
+
+			addPermitPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Permit feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addPermitPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_Rule_permit_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_Rule_permit_feature", "_UI_Rule_type"),
+				 RepresentationPackage.Literals.RULE__PERMIT,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.BOOLEAN_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) {
+		Rule rule = (Rule)object;
+		return getString("_UI_Rule_type") + " " + rule.isPermit();
+	}
+	
+
+	/**
+	 * 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(Rule.class)) {
+			case RepresentationPackage.RULE__PERMIT:
+				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 ((IChildCreationExtender)adapterFactory).getResourceLocator();
+	}
+
+}
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src/org/eclipse/papyrus/infra/architecture/representation/provider/ComplexTypePropertyDescriptor.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src/org/eclipse/papyrus/infra/architecture/representation/provider/ComplexTypePropertyDescriptor.java
new file mode 100644
index 00000000000..fdad8254577
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src/org/eclipse/papyrus/infra/architecture/representation/provider/ComplexTypePropertyDescriptor.java
@@ -0,0 +1,71 @@
+/*****************************************************************************
+ * Copyright (c) 2014 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:
+ *  Maged Elaasar - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.architecture.representation.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.gmf.runtime.emf.type.core.ClientContextManager;
+import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage;
+import org.eclipse.papyrus.infra.core.architecture.provider.SurrogateItemPropertyDescriptor;
+import org.eclipse.papyrus.infra.architecture.representation.ModelAutoCreate;
+import org.eclipse.papyrus.infra.architecture.representation.OwningRule;
+import org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind;
+
+/**
+ * This is used for the ModelAutoCreate.target property because we may want to create stereotyped elements
+ *
+ * @author Laurent Wouters
+ */
+public class ComplexTypePropertyDescriptor extends SurrogateItemPropertyDescriptor {
+	/**
+	 * Constructor.
+	 *
+	 * @param inner
+	 */
+	public ComplexTypePropertyDescriptor(IItemPropertyDescriptor inner) {
+		super(inner);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.architecture.representation.provider.SurrogateItemPropertyDescriptor#getChoiceOfValues(java.lang.Object)
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public Collection<?> getChoiceOfValues(Object object) {
+		ModelAutoCreate rule = (ModelAutoCreate) object;
+		OwningRule owningRule = (OwningRule) rule.eContainer();
+		PapyrusRepresentationKind repKind = (PapyrusRepresentationKind) owningRule.eContainer();
+		ArchitectureDescriptionLanguage language = repKind.getLanguage();
+
+		List<String> result = new ArrayList<String>();
+		IClientContext context = ClientContextManager.getInstance().getClientContext(language.getId());
+		IElementType[] types = ElementTypeRegistry.getInstance().getElementTypes(context);
+		if (types != null) {
+			for (IElementType type : types) {
+				result.add(type.getId());
+			}
+		}
+		Collections.sort(result);
+		return result;
+	}
+}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/EClassPropertyDescriptor.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src/org/eclipse/papyrus/infra/architecture/representation/provider/EClassPropertyDescriptor.java
index 1797237a54c..c371046190e 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/EClassPropertyDescriptor.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src/org/eclipse/papyrus/infra/architecture/representation/provider/EClassPropertyDescriptor.java
@@ -8,10 +8,10 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *  Maged Elaasar - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.infra.viewpoints.configuration;
+package org.eclipse.papyrus.infra.architecture.representation.provider;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -22,6 +22,8 @@ import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage;
+import org.eclipse.papyrus.infra.core.architecture.provider.SurrogateItemPropertyDescriptor;
 
 /**
  * Represents a descriptor for properties of type EClass
@@ -41,7 +43,7 @@ public class EClassPropertyDescriptor extends SurrogateItemPropertyDescriptor {
 	}
 
 	/**
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.SurrogateItemPropertyDescriptor#getChoiceOfValues(java.lang.Object)
+	 * @see org.eclipse.papyrus.infra.architecture.representation.provider.SurrogateItemPropertyDescriptor#getChoiceOfValues(java.lang.Object)
 	 *
 	 * @param object
 	 * @return
@@ -49,13 +51,13 @@ public class EClassPropertyDescriptor extends SurrogateItemPropertyDescriptor {
 	@Override
 	public Collection<?> getChoiceOfValues(Object object) {
 		EObject current = (EObject) object;
-		while (current != null && !(current instanceof PapyrusConfiguration)) {
+		while (current != null && !(current instanceof ArchitectureDescriptionLanguage)) {
 			current = current.eContainer();
 		}
 		if (current == null) {
 			return empty;
 		}
-		PapyrusConfiguration conf = (PapyrusConfiguration) current;
+		ArchitectureDescriptionLanguage conf = (ArchitectureDescriptionLanguage) current;
 		List<EClass> result = new ArrayList<EClass>();
 		EPackage p = conf.getMetamodel();
 		if (p == null) {
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src/org/eclipse/papyrus/infra/architecture/representation/provider/EReferencePropertyDescriptor.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src/org/eclipse/papyrus/infra/architecture/representation/provider/EReferencePropertyDescriptor.java
new file mode 100644
index 00000000000..7a435e24b48
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src/org/eclipse/papyrus/infra/architecture/representation/provider/EReferencePropertyDescriptor.java
@@ -0,0 +1,49 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.architecture.representation.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.infra.core.architecture.provider.SurrogateItemPropertyDescriptor;
+import org.eclipse.papyrus.infra.architecture.representation.ModelAutoCreate;
+
+/**
+ * Represents a descriptor for properties of type EReference
+ *
+ * @author Laurent Wouters
+ */
+public class EReferencePropertyDescriptor extends SurrogateItemPropertyDescriptor {
+	private static final Collection<?> empty = new ArrayList<EReference>();
+
+	public EReferencePropertyDescriptor(IItemPropertyDescriptor inner) {
+		super(inner);
+	}
+
+	@Override
+	public Collection<?> getChoiceOfValues(Object object) {
+		if (object instanceof ModelAutoCreate) {
+			ModelAutoCreate pe = (ModelAutoCreate) object;
+			EClass origin = pe.getOrigin();
+			if (origin == null) {
+				return empty;
+			}
+			return origin.getEAllReferences();
+		}
+		return empty;
+	}
+}
\ No newline at end of file
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/StereotypePropertyDescriptor.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src/org/eclipse/papyrus/infra/architecture/representation/provider/StereotypePropertyDescriptor.java
index 5466762995c..8c833508b50 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/StereotypePropertyDescriptor.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/src/org/eclipse/papyrus/infra/architecture/representation/provider/StereotypePropertyDescriptor.java
@@ -1,116 +1,118 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *  Benoit Maggi benoit.maggi@cea.fr - Bug 473366 : get stereotype recursively

- *****************************************************************************/

-package org.eclipse.papyrus.infra.viewpoints.configuration;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.List;

-

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

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

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

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

-

-/**

- * Represents a descriptor for stereotype properties

- *

- * @author Laurent Wouters

- */

-public class StereotypePropertyDescriptor extends SurrogateItemPropertyDescriptor {

-	private static final Collection<EObject> empty = new ArrayList<EObject>();

-

-	public StereotypePropertyDescriptor(IItemPropertyDescriptor inner) {

-		super(inner);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.SurrogateItemPropertyDescriptor#getChoiceOfValues(java.lang.Object)

-	 *

-	 * @param object

-	 * @return

-	 */

-	@Override

-	public Collection<?> getChoiceOfValues(Object object) {

-		EObject current = (EObject) object;

-		while (current != null && !(current instanceof PapyrusView)) {

-			current = current.eContainer();

-		}

-		if (current == null) {

-			return empty;

-		}

-		PapyrusView conf = (PapyrusView) current;

-		List<EClass> result = new ArrayList<EClass>();

-		for (EPackage p : conf.getProfiles()) { 

-			result.addAll(getAllStereotypes(p));

-		}

-		return result;

-	}

-

-

-	/**

-	 * Get all stereotype contained (even in sub package)

-	 * @param ePackage

-	 * @return

-	 */

-	protected List<EClass> getAllStereotypes(EPackage ePackage) {

-		List<EClass> result = new ArrayList<EClass>();

-		for (EClassifier clazz : ePackage.getEClassifiers()) {

-			if (clazz instanceof EClass) {

-				result.add((EClass) clazz);

-			}

-		}

-		for (EPackage subPackage : ePackage.getESubpackages()) {

-			result.addAll(getAllStereotypes(subPackage));

-		}

-		return result;

-	}

-

-	@Override

-	public IItemLabelProvider getLabelProvider(Object object) {

-		return new IItemLabelProvider() {

-			public String getText(Object object) {

-				if (object instanceof EClass) {

-					return eClassToString((EClass) object);

-				}

-				if (object instanceof EList<?>) {

-					EList<?> list = (EList<?>) object;

-					if (list.isEmpty()) {

-						return "";

-					}

-					StringBuilder builder = new StringBuilder("{");

-					for (int i = 0; i != list.size(); i++) {

-						if (i != 0) {

-							builder.append(", ");

-						}

-						builder.append(eClassToString((EClass) list.get(i)));

-					}

-					builder.append("}");

-					return builder.toString();

-				}

-				return "";

-			}

-

-			public Object getImage(Object object) {

-				return null;

-			}

-		};

-	}

-

-	private String eClassToString(EClass item) {

-		return item.getEPackage().getNsPrefix() + "#" + item.getName();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  Benoit Maggi benoit.maggi@cea.fr - Bug 473366 : get stereotype recursively
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.architecture.representation.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage;
+import org.eclipse.papyrus.infra.core.architecture.provider.SurrogateItemPropertyDescriptor;
+
+/**
+ * Represents a descriptor for stereotype properties
+ *
+ * @author Laurent Wouters
+ */
+public class StereotypePropertyDescriptor extends SurrogateItemPropertyDescriptor {
+	private static final Collection<EObject> empty = new ArrayList<EObject>();
+
+	public StereotypePropertyDescriptor(IItemPropertyDescriptor inner) {
+		super(inner);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.architecture.representation.provider.SurrogateItemPropertyDescriptor#getChoiceOfValues(java.lang.Object)
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public Collection<?> getChoiceOfValues(Object object) {
+		EObject current = (EObject) object;
+		while (current != null && !(current instanceof ArchitectureDescriptionLanguage)) {
+			current = current.eContainer();
+		}
+		if (current == null) {
+			return empty;
+		}
+		ArchitectureDescriptionLanguage conf = (ArchitectureDescriptionLanguage) current;
+		List<EClass> result = new ArrayList<EClass>();
+		for (EPackage p : conf.getProfiles()) { 
+			result.addAll(getAllStereotypes(p));
+		}
+		return result;
+	}
+
+
+	/**
+	 * Get all stereotype contained (even in sub package)
+	 * @param ePackage
+	 * @return
+	 */
+	protected List<EClass> getAllStereotypes(EPackage ePackage) {
+		List<EClass> result = new ArrayList<EClass>();
+		for (EClassifier clazz : ePackage.getEClassifiers()) {
+			if (clazz instanceof EClass) {
+				result.add((EClass) clazz);
+			}
+		}
+		for (EPackage subPackage : ePackage.getESubpackages()) {
+			result.addAll(getAllStereotypes(subPackage));
+		}
+		return result;
+	}
+
+	@Override
+	public IItemLabelProvider getLabelProvider(Object object) {
+		return new IItemLabelProvider() {
+			public String getText(Object object) {
+				if (object instanceof EClass) {
+					return eClassToString((EClass) object);
+				}
+				if (object instanceof EList<?>) {
+					EList<?> list = (EList<?>) object;
+					if (list.isEmpty()) {
+						return "";
+					}
+					StringBuilder builder = new StringBuilder("{");
+					for (int i = 0; i != list.size(); i++) {
+						if (i != 0) {
+							builder.append(", ");
+						}
+						builder.append(eClassToString((EClass) list.get(i)));
+					}
+					builder.append("}");
+					return builder.toString();
+				}
+				return "";
+			}
+
+			public Object getImage(Object object) {
+				return null;
+			}
+		};
+	}
+
+	private String eClassToString(EClass item) {
+		return item.getEPackage().getNsPrefix() + "#" + item.getName();
+	}
+}
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/.classpath b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/.classpath
new file mode 100644
index 00000000000..f0c55498599
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/.classpath
@@ -0,0 +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/JavaSE-1.8"/>
+	<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/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/.project b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/.project
new file mode 100644
index 00000000000..d630a445dcd
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.architecture.representation</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/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/.settings/org.eclipse.core.resources.prefs b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000000..7ec365db4eb
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding//model/Representation.ecore_diagram=UTF-8
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..0c68a61dca8
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/META-INF/MANIFEST.MF b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..fd9fe5cc24b
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/META-INF/MANIFEST.MF
@@ -0,0 +1,18 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.infra.architecture.representation;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.papyrus.infra.architecture.representation,
+ org.eclipse.papyrus.infra.architecture.representation.impl,
+ org.eclipse.papyrus.infra.architecture.representation.util
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.types;visibility:=reexport,
+ org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
+Bundle-ActivationPolicy: lazy
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/about.html b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/about.html
index dd02e0be168..bbf2bd6aac7 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/about.html
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/about.html
@@ -1,28 +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>December 2, 2009</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>

+<!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>January 30, 2017</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/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/build.properties b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/build.properties
new file mode 100644
index 00000000000..0e30cb6a26e
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/build.properties
@@ -0,0 +1,21 @@
+* Copyright (c) 2017 CEA LIST.
+# 
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#  
+#  Contributors:
+#  Maged Elaasar - Initial API and implementation
+#  
+# 
+
+bin.includes = .,\
+               model/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties
+jars.compile.order = .
+source.. = src-gen/,\
+           src/
+output.. = bin/
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/model/Representation.ecore b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/model/Representation.ecore
new file mode 100755
index 00000000000..5b891670fbb
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/model/Representation.ecore
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="representation" nsURI="http://www.eclipse.org/papyrus/infra/core/architecture/representation"
+    nsPrefix="representation">
+  <eClassifiers xsi:type="ecore:EClass" name="PapyrusRepresentationKind" abstract="true"
+      eSuperTypes="../../org.eclipse.papyrus.infra.core.architecture/model/Architecture.ecore#//RepresentationKind">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="parent" eType="#//PapyrusRepresentationKind"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="modelRules" lowerBound="1"
+        upperBound="-1" eType="#//ModelRule" containment="true">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="These rules determine which model elements can be the semantic element behind this diagram"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="owningRules" lowerBound="1"
+        upperBound="-1" eType="#//OwningRule" containment="true">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="These rules determine which elements can be the syntactic owner of this diagram"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="implementationID" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Rule" abstract="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="permit" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ModelRule" eSuperTypes="#//Rule ../../org.eclipse.papyrus.infra.constraints/Model/Constraints.ecore#//DisplayUnit">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="element" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="stereotypes" upperBound="-1"
+        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="multiplicity" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" defaultValueLiteral="-1"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="OwningRule" eSuperTypes="#//Rule">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="element" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="stereotypes" upperBound="-1"
+        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="multiplicity" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" defaultValueLiteral="-1"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="newModelPath" upperBound="-1"
+        eType="#//ModelAutoCreate" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="selectDiagramRoot" upperBound="-1"
+        eType="#//RootAutoSelect" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ModelAutoCreate">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="feature" lowerBound="1"
+        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EReference"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="origin" lowerBound="1"
+        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass" changeable="false"
+        volatile="true" transient="true" derived="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="creationType" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="RootAutoSelect">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="feature" lowerBound="1"
+        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EReference"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/model/Representation.ecore_diagram b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/model/Representation.ecore_diagram
new file mode 100644
index 00000000000..2e73b597ddf
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/model/Representation.ecore_diagram
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_5ux9gMRoEeaCrrNUITTDvQ" type="Ecore" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_6FZGsMRoEeaCrrNUITTDvQ" type="2001" fontName=".SF NS Text">
+    <children xmi:type="notation:DecorationNode" xmi:id="_6FiQoMRoEeaCrrNUITTDvQ" type="5001"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_6Fi3sMRoEeaCrrNUITTDvQ" type="7001">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_6Fi3scRoEeaCrrNUITTDvQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_6Fi3ssRoEeaCrrNUITTDvQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_6Fi3s8RoEeaCrrNUITTDvQ" type="7002">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_6Fi3tMRoEeaCrrNUITTDvQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_6Fi3tcRoEeaCrrNUITTDvQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_6Fi3tsRoEeaCrrNUITTDvQ" type="7003">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_6Fi3t8RoEeaCrrNUITTDvQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_6Fi3uMRoEeaCrrNUITTDvQ"/>
+    </children>
+    <element xmi:type="ecore:EClass" href="Representation.ecore#//PapyrusRepresentationKind"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6FZtwMRoEeaCrrNUITTDvQ" x="90" y="9"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_6Fl7AMRoEeaCrrNUITTDvQ" type="2001" fontName=".SF NS Text">
+    <children xmi:type="notation:DecorationNode" xmi:id="_6Fl7AsRoEeaCrrNUITTDvQ" type="5001"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_6Fl7A8RoEeaCrrNUITTDvQ" type="7001">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_6Fl7BMRoEeaCrrNUITTDvQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_6Fl7BcRoEeaCrrNUITTDvQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_6Fl7BsRoEeaCrrNUITTDvQ" type="7002">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_6Fl7B8RoEeaCrrNUITTDvQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_6Fl7CMRoEeaCrrNUITTDvQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_6Fl7CcRoEeaCrrNUITTDvQ" type="7003">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_6Fl7CsRoEeaCrrNUITTDvQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_6Fl7C8RoEeaCrrNUITTDvQ"/>
+    </children>
+    <element xmi:type="ecore:EClass" href="Representation.ecore#//Rule"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6Fl7AcRoEeaCrrNUITTDvQ" x="107" y="135"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_6FmiEMRoEeaCrrNUITTDvQ" type="2001" fontName=".SF NS Text">
+    <children xmi:type="notation:DecorationNode" xmi:id="_6FmiEsRoEeaCrrNUITTDvQ" type="5001"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_6FnJIMRoEeaCrrNUITTDvQ" type="7001">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_6FnJIcRoEeaCrrNUITTDvQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_6FnJIsRoEeaCrrNUITTDvQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_6FnJI8RoEeaCrrNUITTDvQ" type="7002">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_6FnJJMRoEeaCrrNUITTDvQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_6FnJJcRoEeaCrrNUITTDvQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_6FnJJsRoEeaCrrNUITTDvQ" type="7003">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_6FnJJ8RoEeaCrrNUITTDvQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_6FnJKMRoEeaCrrNUITTDvQ"/>
+    </children>
+    <element xmi:type="ecore:EClass" href="Representation.ecore#//ModelRule"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6FmiEcRoEeaCrrNUITTDvQ" x="45" y="270"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_6FnJKcRoEeaCrrNUITTDvQ" type="2001" fontName=".SF NS Text">
+    <children xmi:type="notation:DecorationNode" xmi:id="_6FnwMMRoEeaCrrNUITTDvQ" type="5001"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_6FnwMcRoEeaCrrNUITTDvQ" type="7001">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_6FnwMsRoEeaCrrNUITTDvQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_6FnwM8RoEeaCrrNUITTDvQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_6FnwNMRoEeaCrrNUITTDvQ" type="7002">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_6FnwNcRoEeaCrrNUITTDvQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_6FnwNsRoEeaCrrNUITTDvQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_6FnwN8RoEeaCrrNUITTDvQ" type="7003">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_6FnwOMRoEeaCrrNUITTDvQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_6FnwOcRoEeaCrrNUITTDvQ"/>
+    </children>
+    <element xmi:type="ecore:EClass" href="Representation.ecore#//OwningRule"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6FnJKsRoEeaCrrNUITTDvQ" x="171" y="270"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_6Fqzg8RoEeaCrrNUITTDvQ" type="2001" fontName=".SF NS Text">
+    <children xmi:type="notation:DecorationNode" xmi:id="_6FqzhcRoEeaCrrNUITTDvQ" type="5001"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_6FqzhsRoEeaCrrNUITTDvQ" type="7001">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_6Fqzh8RoEeaCrrNUITTDvQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_6FqziMRoEeaCrrNUITTDvQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_6FqzicRoEeaCrrNUITTDvQ" type="7002">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_6FqzisRoEeaCrrNUITTDvQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_6Fqzi8RoEeaCrrNUITTDvQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_6FrakMRoEeaCrrNUITTDvQ" type="7003">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_6FrakcRoEeaCrrNUITTDvQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_6FraksRoEeaCrrNUITTDvQ"/>
+    </children>
+    <element xmi:type="ecore:EClass" href="Representation.ecore#//ModelAutoCreate"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6FqzhMRoEeaCrrNUITTDvQ" x="225" y="387"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_6Frak8RoEeaCrrNUITTDvQ" type="2001" fontName=".SF NS Text">
+    <children xmi:type="notation:DecorationNode" xmi:id="_6FralcRoEeaCrrNUITTDvQ" type="5001"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_6FralsRoEeaCrrNUITTDvQ" type="7001">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_6Fral8RoEeaCrrNUITTDvQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_6FramMRoEeaCrrNUITTDvQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_6FramcRoEeaCrrNUITTDvQ" type="7002">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_6FramsRoEeaCrrNUITTDvQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_6Fram8RoEeaCrrNUITTDvQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_6FsBoMRoEeaCrrNUITTDvQ" type="7003">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_6FsBocRoEeaCrrNUITTDvQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_6FsBosRoEeaCrrNUITTDvQ"/>
+    </children>
+    <element xmi:type="ecore:EClass" href="Representation.ecore#//RootAutoSelect"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6FralMRoEeaCrrNUITTDvQ" x="126" y="387"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_5ux9gcRoEeaCrrNUITTDvQ"/>
+  <element xmi:type="ecore:EPackage" href="Representation.ecore#/"/>
+  <edges xmi:type="notation:Connector" xmi:id="_6K2OcMRoEeaCrrNUITTDvQ" type="4002" source="_6FZGsMRoEeaCrrNUITTDvQ" target="_6FZGsMRoEeaCrrNUITTDvQ" routing="Rectilinear">
+    <children xmi:type="notation:DecorationNode" xmi:id="_6K3ckMRoEeaCrrNUITTDvQ" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_6K3ckcRoEeaCrrNUITTDvQ" x="5" y="45"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_6K3cksRoEeaCrrNUITTDvQ" type="6003">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_6K3ck8RoEeaCrrNUITTDvQ" x="11" y="-14"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_6K2OccRoEeaCrrNUITTDvQ" fontName=".SF NS Text"/>
+    <element xmi:type="ecore:EReference" href="Representation.ecore#//PapyrusRepresentationKind/parent"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6K2OcsRoEeaCrrNUITTDvQ" points="[70, -19, 70, -19]$[132, -19, 132, -19]$[132, 17, 132, 17]$[70, 17, 70, 17]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_6LlOQMRoEeaCrrNUITTDvQ" type="4003" source="_6FZGsMRoEeaCrrNUITTDvQ" target="_6FmiEMRoEeaCrrNUITTDvQ" routing="Rectilinear">
+    <children xmi:type="notation:DecorationNode" xmi:id="_6LlOQ8RoEeaCrrNUITTDvQ" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_6LlORMRoEeaCrrNUITTDvQ" x="127" y="30"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_6LlORcRoEeaCrrNUITTDvQ" type="6004">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_6LlORsRoEeaCrrNUITTDvQ" x="29" y="-17"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_6LlOQcRoEeaCrrNUITTDvQ" fontName=".SF NS Text"/>
+    <element xmi:type="ecore:EReference" href="Representation.ecore#//PapyrusRepresentationKind/modelRules"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6LlOQsRoEeaCrrNUITTDvQ" points="[27, 0, 47, -202]$[27, 49, 47, -153]$[-50, 49, -30, -153]$[-50, 202, -30, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6OZRs8RoEeaCrrNUITTDvQ" id="(0.16546762589928057,1.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6OZRtMRoEeaCrrNUITTDvQ" id="(0.4948453608247423,0.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_6Lu_QMRoEeaCrrNUITTDvQ" type="4003" source="_6FZGsMRoEeaCrrNUITTDvQ" target="_6FnJKcRoEeaCrrNUITTDvQ" routing="Rectilinear">
+    <children xmi:type="notation:DecorationNode" xmi:id="_6Lu_Q8RoEeaCrrNUITTDvQ" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_6Lu_RMRoEeaCrrNUITTDvQ" x="130" y="-35"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_6Lu_RcRoEeaCrrNUITTDvQ" type="6004">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_6LvmUMRoEeaCrrNUITTDvQ" x="30" y="19"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_6Lu_QcRoEeaCrrNUITTDvQ" fontName=".SF NS Text"/>
+    <element xmi:type="ecore:EReference" href="Representation.ecore#//PapyrusRepresentationKind/owningRules"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6Lu_QsRoEeaCrrNUITTDvQ" points="[22, 0, -61, -202]$[22, 40, -61, -162]$[107, 40, 24, -162]$[107, 202, 24, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6OZRscRoEeaCrrNUITTDvQ" id="(0.33093525179856115,1.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6OZRssRoEeaCrrNUITTDvQ" id="(0.4948453608247423,0.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_6ME9gMRoEeaCrrNUITTDvQ" type="4004" source="_6FmiEMRoEeaCrrNUITTDvQ" target="_6Fl7AMRoEeaCrrNUITTDvQ" routing="Tree">
+    <styles xmi:type="notation:FontStyle" xmi:id="_6ME9gcRoEeaCrrNUITTDvQ" fontName=".SF NS Text"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6ME9gsRoEeaCrrNUITTDvQ" points="[33, -59, -50, 135]$[33, -103, -50, 91]$[65, -103, -18, 91]$[65, -135, -18, 59]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6ObG4MRoEeaCrrNUITTDvQ" id="(0.4948453608247423,1.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6ObG4cRoEeaCrrNUITTDvQ" id="(0.6764705882352942,0.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_6MGysMRoEeaCrrNUITTDvQ" type="4003" source="_6FnJKcRoEeaCrrNUITTDvQ" target="_6Fqzg8RoEeaCrrNUITTDvQ" routing="Rectilinear">
+    <children xmi:type="notation:DecorationNode" xmi:id="_6MGys8RoEeaCrrNUITTDvQ" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_6MGytMRoEeaCrrNUITTDvQ" x="16" y="-40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_6MGytcRoEeaCrrNUITTDvQ" type="6004">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_6MGytsRoEeaCrrNUITTDvQ" x="-4" y="19"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_6MGyscRoEeaCrrNUITTDvQ" fontName=".SF NS Text"/>
+    <element xmi:type="ecore:EReference" href="Representation.ecore#//OwningRule/newModelPath"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6MGyssRoEeaCrrNUITTDvQ" points="[-3, 3, -33, -58]$[-3, 61, -33, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6OYDksRoEeaCrrNUITTDvQ" id="(0.865979381443299,0.9491525423728814)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6OYqoMRoEeaCrrNUITTDvQ" id="(0.49586776859504134,0.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_6MLEIMRoEeaCrrNUITTDvQ" type="4003" source="_6FnJKcRoEeaCrrNUITTDvQ" target="_6Frak8RoEeaCrrNUITTDvQ" routing="Rectilinear">
+    <children xmi:type="notation:DecorationNode" xmi:id="_6MLEI8RoEeaCrrNUITTDvQ" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_6MLEJMRoEeaCrrNUITTDvQ" x="16" y="51"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_6MLEJcRoEeaCrrNUITTDvQ" type="6004">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_6MLEJsRoEeaCrrNUITTDvQ" x="-4" y="-17"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_6MLEIcRoEeaCrrNUITTDvQ" fontName=".SF NS Text"/>
+    <element xmi:type="ecore:EReference" href="Representation.ecore#//OwningRule/selectDiagramRoot"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6MLEIsRoEeaCrrNUITTDvQ" points="[-54, 0, 22, -58]$[-54, 58, 22, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6OYqocRoEeaCrrNUITTDvQ" id="(0.7422680412371134,1.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6OYqosRoEeaCrrNUITTDvQ" id="(0.4939759036144578,0.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_6MOHcMRoEeaCrrNUITTDvQ" type="4004" source="_6FnJKcRoEeaCrrNUITTDvQ" target="_6Fl7AMRoEeaCrrNUITTDvQ" routing="Tree">
+    <styles xmi:type="notation:FontStyle" xmi:id="_6MOHccRoEeaCrrNUITTDvQ" fontName=".SF NS Text"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6MOHcsRoEeaCrrNUITTDvQ" points="[0, -59, 101, 126]$[0, -86, 101, 99]$[-135, -86, -34, 99]$[-135, -126, -34, 59]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6OYqo8RoEeaCrrNUITTDvQ" id="(0.24742268041237114,1.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6OYqpMRoEeaCrrNUITTDvQ" id="(0.8333333333333334,0.0)"/>
+  </edges>
+</notation:Diagram>
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/model/Representation.genmodel b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/model/Representation.genmodel
new file mode 100644
index 00000000000..dec16cb1457
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/model/Representation.genmodel
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2016 CEA LIST.&#xD;&#xA;&#xD;&#xA; All rights reserved. This program and the accompanying materials&#xD;&#xA; are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA; which accompanies this distribution, and is available at&#xD;&#xA; http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA; &#xD;&#xA; Contributors:&#xD;&#xA; Maged Elaasar - Initial API and implementation&#xD;&#xA; &#xD;&#xA;"
+    modelDirectory="/org.eclipse.papyrus.infra.architecture.representation/src-gen"
+    editDirectory="/org.eclipse.papyrus.infra.architecture.representation.edit/src-gen"
+    editorDirectory="/org.eclipse.papyrus.infra.architecture.representation.editor/src-gen"
+    modelPluginID="org.eclipse.papyrus.infra.architecture.representation" modelName="Representation"
+    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory="/org.eclipse.papyrus.infra.architecture.representation.tests/src-gen"
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
+    editorPluginID="org.eclipse.papyrus.infra.architecture.representation.editor"
+    usedGenPackages="../../org.eclipse.papyrus.infra.core.architecture/model/Architecture.genmodel#//architecture ../../org.eclipse.papyrus.infra.constraints/Model/Constraints.genmodel#//constraints ../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel#//types"
+    operationReflection="true" importOrganizing="true">
+  <foreignModel>Representation.ecore</foreignModel>
+  <genPackages prefix="Representation" basePackage="org.eclipse.papyrus.infra.core.architecture"
+      disposableProviderFactory="true" extensibleProviderFactory="true" childCreationExtenders="true"
+      ecorePackage="Representation.ecore#/">
+    <genClasses image="false" ecoreClass="Representation.ecore#//PapyrusRepresentationKind">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Representation.ecore#//PapyrusRepresentationKind/parent"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Representation.ecore#//PapyrusRepresentationKind/modelRules"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Representation.ecore#//PapyrusRepresentationKind/owningRules"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Representation.ecore#//PapyrusRepresentationKind/implementationID"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="Representation.ecore#//Rule">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Representation.ecore#//Rule/permit"/>
+    </genClasses>
+    <genClasses ecoreClass="Representation.ecore#//ModelRule">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Representation.ecore#//ModelRule/element"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Representation.ecore#//ModelRule/stereotypes"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Representation.ecore#//ModelRule/multiplicity"/>
+    </genClasses>
+    <genClasses ecoreClass="Representation.ecore#//OwningRule">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Representation.ecore#//OwningRule/element"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Representation.ecore#//OwningRule/stereotypes"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Representation.ecore#//OwningRule/multiplicity"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Representation.ecore#//OwningRule/newModelPath"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Representation.ecore#//OwningRule/selectDiagramRoot"/>
+    </genClasses>
+    <genClasses ecoreClass="Representation.ecore#//ModelAutoCreate">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Representation.ecore#//ModelAutoCreate/feature"/>
+      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference Representation.ecore#//ModelAutoCreate/origin"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Representation.ecore#//ModelAutoCreate/creationType"/>
+    </genClasses>
+    <genClasses ecoreClass="Representation.ecore#//RootAutoSelect">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Representation.ecore#//RootAutoSelect/feature"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/plugin.properties b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/plugin.properties
new file mode 100644
index 00000000000..58d9ca152fe
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/plugin.properties
@@ -0,0 +1,14 @@
+* Copyright (c) 2017 CEA LIST.
+# 
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#  
+#  Contributors:
+#  Maged Elaasar - Initial API and implementation
+#  
+# 
+
+pluginName = Representation Model
+providerName=Eclipse Modeling Project
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/plugin.xml b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/plugin.xml
new file mode 100644
index 00000000000..d5bc156dc53
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/plugin.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+* Copyright (c) 2017 CEA LIST.
+ 
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/legal/epl-v10.html
+  
+  Contributors:
+  Maged Elaasar - Initial API and implementation
+  
+ 
+-->
+
+<plugin>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated Representation -->
+      <package
+            uri="http://www.eclipse.org/papyrus/infra/core/architecture/representation"
+            class="org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage"
+            genModel="model/Representation.genmodel"/>
+   </extension>
+
+   <extension
+         point="org.eclipse.emf.ecore.factory_override">
+      <factory
+            uri="http://www.eclipse.org/papyrus/infra/core/architecture/representation"
+            class="org.eclipse.papyrus.infra.architecture.representation.impl.RepresentationFactoryCustomImpl">
+      </factory>
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/pom.xml b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/pom.xml
index 9eac72e5cdc..db883c5ade1 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/pom.xml
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/pom.xml
@@ -3,11 +3,11 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.infra-viewpoints</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
+		<artifactId>org.eclipse.papyrus.infra-architecture</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<artifactId>org.eclipse.papyrus.infra.viewpoints.configuration.editor</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
+	<artifactId>org.eclipse.papyrus.infra.architecture.representation</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/ModelAutoCreate.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/ModelAutoCreate.java
index 950a8d84ab0..22faee6a8f6 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/ModelAutoCreate.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/ModelAutoCreate.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 CEA LIST.
+ * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
@@ -7,11 +7,11 @@
  *  http://www.eclipse.org/legal/epl-v10.html
  *  
  *  Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *  Maged Elaasar - Initial API and implementation
  *  
  * 
  */
-package org.eclipse.papyrus.infra.viewpoints.configuration;
+package org.eclipse.papyrus.infra.architecture.representation;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
@@ -26,12 +26,12 @@ import org.eclipse.emf.ecore.EReference;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.ModelAutoCreate#getFeature <em>Feature</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.ModelAutoCreate#getOrigin <em>Origin</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.ModelAutoCreate#getCreationType <em>Creation Type</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.architecture.representation.ModelAutoCreate#getFeature <em>Feature</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.architecture.representation.ModelAutoCreate#getOrigin <em>Origin</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.architecture.representation.ModelAutoCreate#getCreationType <em>Creation Type</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getModelAutoCreate()
+ * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getModelAutoCreate()
  * @model
  * @generated
  */
@@ -46,14 +46,14 @@ public interface ModelAutoCreate extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Feature</em>' reference.
 	 * @see #setFeature(EReference)
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getModelAutoCreate_Feature()
+	 * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getModelAutoCreate_Feature()
 	 * @model required="true"
 	 * @generated
 	 */
 	EReference getFeature();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.ModelAutoCreate#getFeature <em>Feature</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.architecture.representation.ModelAutoCreate#getFeature <em>Feature</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Feature</em>' reference.
@@ -71,7 +71,7 @@ public interface ModelAutoCreate extends EObject {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Origin</em>' reference.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getModelAutoCreate_Origin()
+	 * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getModelAutoCreate_Origin()
 	 * @model required="true" transient="true" changeable="false" volatile="true" derived="true"
 	 * @generated
 	 */
@@ -87,14 +87,14 @@ public interface ModelAutoCreate extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Creation Type</em>' attribute.
 	 * @see #setCreationType(String)
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getModelAutoCreate_CreationType()
+	 * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getModelAutoCreate_CreationType()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getCreationType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.ModelAutoCreate#getCreationType <em>Creation Type</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.architecture.representation.ModelAutoCreate#getCreationType <em>Creation Type</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Creation Type</em>' attribute.
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/ModelRule.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/ModelRule.java
index c590e679545..41e36a9a687 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/ModelRule.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/ModelRule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 CEA LIST.
+ * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
@@ -7,11 +7,11 @@
  *  http://www.eclipse.org/legal/epl-v10.html
  *  
  *  Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *  Maged Elaasar - Initial API and implementation
  *  
  * 
  */
-package org.eclipse.papyrus.infra.viewpoints.configuration;
+package org.eclipse.papyrus.infra.architecture.representation;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -28,12 +28,12 @@ import org.eclipse.papyrus.infra.constraints.DisplayUnit;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.ModelRule#getElement <em>Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.ModelRule#getStereotypes <em>Stereotypes</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.ModelRule#getMultiplicity <em>Multiplicity</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.architecture.representation.ModelRule#getElement <em>Element</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.architecture.representation.ModelRule#getStereotypes <em>Stereotypes</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.architecture.representation.ModelRule#getMultiplicity <em>Multiplicity</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getModelRule()
+ * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getModelRule()
  * @model
  * @generated
  */
@@ -48,14 +48,14 @@ public interface ModelRule extends Rule, DisplayUnit {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Element</em>' reference.
 	 * @see #setElement(EClass)
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getModelRule_Element()
+	 * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getModelRule_Element()
 	 * @model
 	 * @generated
 	 */
 	EClass getElement();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.ModelRule#getElement <em>Element</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.architecture.representation.ModelRule#getElement <em>Element</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Element</em>' reference.
@@ -74,7 +74,7 @@ public interface ModelRule extends Rule, DisplayUnit {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Stereotypes</em>' reference list.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getModelRule_Stereotypes()
+	 * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getModelRule_Stereotypes()
 	 * @model
 	 * @generated
 	 */
@@ -91,14 +91,14 @@ public interface ModelRule extends Rule, DisplayUnit {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Multiplicity</em>' attribute.
 	 * @see #setMultiplicity(int)
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getModelRule_Multiplicity()
+	 * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getModelRule_Multiplicity()
 	 * @model default="-1" required="true"
 	 * @generated
 	 */
 	int getMultiplicity();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.ModelRule#getMultiplicity <em>Multiplicity</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.architecture.representation.ModelRule#getMultiplicity <em>Multiplicity</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Multiplicity</em>' attribute.
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/OwningRule.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/OwningRule.java
index 45230c10699..a40bf00e644 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/OwningRule.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/OwningRule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 CEA LIST.
+ * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
@@ -7,11 +7,11 @@
  *  http://www.eclipse.org/legal/epl-v10.html
  *  
  *  Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *  Maged Elaasar - Initial API and implementation
  *  
  * 
  */
-package org.eclipse.papyrus.infra.viewpoints.configuration;
+package org.eclipse.papyrus.infra.architecture.representation;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -26,14 +26,14 @@ import org.eclipse.emf.ecore.EClass;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.OwningRule#getElement <em>Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.OwningRule#getStereotypes <em>Stereotypes</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.OwningRule#getMultiplicity <em>Multiplicity</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.OwningRule#getNewModelPath <em>New Model Path</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.OwningRule#getSelectDiagramRoot <em>Select Diagram Root</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.architecture.representation.OwningRule#getElement <em>Element</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.architecture.representation.OwningRule#getStereotypes <em>Stereotypes</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.architecture.representation.OwningRule#getMultiplicity <em>Multiplicity</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.architecture.representation.OwningRule#getNewModelPath <em>New Model Path</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.architecture.representation.OwningRule#getSelectDiagramRoot <em>Select Diagram Root</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getOwningRule()
+ * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getOwningRule()
  * @model
  * @generated
  */
@@ -48,14 +48,14 @@ public interface OwningRule extends Rule {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Element</em>' reference.
 	 * @see #setElement(EClass)
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getOwningRule_Element()
+	 * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getOwningRule_Element()
 	 * @model
 	 * @generated
 	 */
 	EClass getElement();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.OwningRule#getElement <em>Element</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.architecture.representation.OwningRule#getElement <em>Element</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Element</em>' reference.
@@ -74,7 +74,7 @@ public interface OwningRule extends Rule {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Stereotypes</em>' reference list.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getOwningRule_Stereotypes()
+	 * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getOwningRule_Stereotypes()
 	 * @model
 	 * @generated
 	 */
@@ -91,14 +91,14 @@ public interface OwningRule extends Rule {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Multiplicity</em>' attribute.
 	 * @see #setMultiplicity(int)
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getOwningRule_Multiplicity()
+	 * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getOwningRule_Multiplicity()
 	 * @model default="-1" required="true"
 	 * @generated
 	 */
 	int getMultiplicity();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.OwningRule#getMultiplicity <em>Multiplicity</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.architecture.representation.OwningRule#getMultiplicity <em>Multiplicity</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Multiplicity</em>' attribute.
@@ -109,7 +109,7 @@ public interface OwningRule extends Rule {
 
 	/**
 	 * Returns the value of the '<em><b>New Model Path</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.configuration.ModelAutoCreate}.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.architecture.representation.ModelAutoCreate}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>New Model Path</em>' containment reference list isn't clear,
@@ -117,7 +117,7 @@ public interface OwningRule extends Rule {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>New Model Path</em>' containment reference list.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getOwningRule_NewModelPath()
+	 * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getOwningRule_NewModelPath()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -125,7 +125,7 @@ public interface OwningRule extends Rule {
 
 	/**
 	 * Returns the value of the '<em><b>Select Diagram Root</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.configuration.RootAutoSelect}.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.architecture.representation.RootAutoSelect}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Select Diagram Root</em>' containment reference list isn't clear,
@@ -133,7 +133,7 @@ public interface OwningRule extends Rule {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Select Diagram Root</em>' containment reference list.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getOwningRule_SelectDiagramRoot()
+	 * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getOwningRule_SelectDiagramRoot()
 	 * @model containment="true"
 	 * @generated
 	 */
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/PapyrusRepresentationKind.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/PapyrusRepresentationKind.java
new file mode 100644
index 00000000000..72f64329f61
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/PapyrusRepresentationKind.java
@@ -0,0 +1,122 @@
+/**
+ * Copyright (c) 2016 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:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.architecture.representation;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.papyrus.infra.core.architecture.RepresentationKind;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Papyrus Representation Kind</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind#getParent <em>Parent</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind#getModelRules <em>Model Rules</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind#getOwningRules <em>Owning Rules</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind#getImplementationID <em>Implementation ID</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getPapyrusRepresentationKind()
+ * @model abstract="true"
+ * @generated
+ */
+public interface PapyrusRepresentationKind extends RepresentationKind {
+	/**
+	 * Returns the value of the '<em><b>Parent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Parent</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Parent</em>' reference.
+	 * @see #setParent(PapyrusRepresentationKind)
+	 * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getPapyrusRepresentationKind_Parent()
+	 * @model
+	 * @generated
+	 */
+	PapyrusRepresentationKind getParent();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind#getParent <em>Parent</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Parent</em>' reference.
+	 * @see #getParent()
+	 * @generated
+	 */
+	void setParent(PapyrusRepresentationKind value);
+
+	/**
+	 * Returns the value of the '<em><b>Model Rules</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.architecture.representation.ModelRule}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * These rules determine which model elements can be the semantic element behind this diagram
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Model Rules</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getPapyrusRepresentationKind_ModelRules()
+	 * @model containment="true" required="true"
+	 * @generated
+	 */
+	EList<ModelRule> getModelRules();
+
+	/**
+	 * Returns the value of the '<em><b>Owning Rules</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.architecture.representation.OwningRule}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * These rules determine which elements can be the syntactic owner of this diagram
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Owning Rules</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getPapyrusRepresentationKind_OwningRules()
+	 * @model containment="true" required="true"
+	 * @generated
+	 */
+	EList<OwningRule> getOwningRules();
+
+	/**
+	 * Returns the value of the '<em><b>Implementation ID</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Implementation 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>Implementation ID</em>' attribute.
+	 * @see #setImplementationID(String)
+	 * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getPapyrusRepresentationKind_ImplementationID()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getImplementationID();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind#getImplementationID <em>Implementation ID</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Implementation ID</em>' attribute.
+	 * @see #getImplementationID()
+	 * @generated
+	 */
+	void setImplementationID(String value);
+
+} // PapyrusRepresentationKind
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/RepresentationFactory.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/RepresentationFactory.java
new file mode 100644
index 00000000000..07b58c37fc7
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/RepresentationFactory.java
@@ -0,0 +1,80 @@
+/**
+ * Copyright (c) 2016 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:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.architecture.representation;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage
+ * @generated
+ */
+public interface RepresentationFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	RepresentationFactory eINSTANCE = org.eclipse.papyrus.infra.architecture.representation.impl.RepresentationFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Model Rule</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Model Rule</em>'.
+	 * @generated
+	 */
+	ModelRule createModelRule();
+
+	/**
+	 * Returns a new object of class '<em>Owning Rule</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Owning Rule</em>'.
+	 * @generated
+	 */
+	OwningRule createOwningRule();
+
+	/**
+	 * Returns a new object of class '<em>Model Auto Create</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Model Auto Create</em>'.
+	 * @generated
+	 */
+	ModelAutoCreate createModelAutoCreate();
+
+	/**
+	 * Returns a new object of class '<em>Root Auto Select</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Root Auto Select</em>'.
+	 * @generated
+	 */
+	RootAutoSelect createRootAutoSelect();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	RepresentationPackage getRepresentationPackage();
+
+} //RepresentationFactory
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/RepresentationPackage.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/RepresentationPackage.java
new file mode 100644
index 00000000000..954820eeb2b
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/RepresentationPackage.java
@@ -0,0 +1,952 @@
+/**
+ * Copyright (c) 2016 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:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.architecture.representation;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ *   <li>each class,</li>
+ *   <li>each feature of each class,</li>
+ *   <li>each operation of each class,</li>
+ *   <li>each enum,</li>
+ *   <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface RepresentationPackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "representation";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/infra/core/architecture/representation";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "representation";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	RepresentationPackage eINSTANCE = org.eclipse.papyrus.infra.architecture.representation.impl.RepresentationPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.architecture.representation.impl.PapyrusRepresentationKindImpl <em>Papyrus Representation Kind</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.architecture.representation.impl.PapyrusRepresentationKindImpl
+	 * @see org.eclipse.papyrus.infra.architecture.representation.impl.RepresentationPackageImpl#getPapyrusRepresentationKind()
+	 * @generated
+	 */
+	int PAPYRUS_REPRESENTATION_KIND = 0;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_REPRESENTATION_KIND__NAME = ArchitecturePackage.REPRESENTATION_KIND__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Desciption</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_REPRESENTATION_KIND__DESCIPTION = ArchitecturePackage.REPRESENTATION_KIND__DESCIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_REPRESENTATION_KIND__QUALIFIED_NAME = ArchitecturePackage.REPRESENTATION_KIND__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Language</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_REPRESENTATION_KIND__LANGUAGE = ArchitecturePackage.REPRESENTATION_KIND__LANGUAGE;
+
+	/**
+	 * The feature id for the '<em><b>Concerns</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_REPRESENTATION_KIND__CONCERNS = ArchitecturePackage.REPRESENTATION_KIND__CONCERNS;
+
+	/**
+	 * The feature id for the '<em><b>Icon</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_REPRESENTATION_KIND__ICON = ArchitecturePackage.REPRESENTATION_KIND__ICON;
+
+	/**
+	 * The feature id for the '<em><b>Parent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_REPRESENTATION_KIND__PARENT = ArchitecturePackage.REPRESENTATION_KIND_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Model Rules</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_REPRESENTATION_KIND__MODEL_RULES = ArchitecturePackage.REPRESENTATION_KIND_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Owning Rules</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_REPRESENTATION_KIND__OWNING_RULES = ArchitecturePackage.REPRESENTATION_KIND_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Implementation ID</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_REPRESENTATION_KIND__IMPLEMENTATION_ID = ArchitecturePackage.REPRESENTATION_KIND_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of structural features of the '<em>Papyrus Representation Kind</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_REPRESENTATION_KIND_FEATURE_COUNT = ArchitecturePackage.REPRESENTATION_KIND_FEATURE_COUNT + 4;
+
+	/**
+	 * The number of operations of the '<em>Papyrus Representation Kind</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_REPRESENTATION_KIND_OPERATION_COUNT = ArchitecturePackage.REPRESENTATION_KIND_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.architecture.representation.impl.RuleImpl <em>Rule</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.architecture.representation.impl.RuleImpl
+	 * @see org.eclipse.papyrus.infra.architecture.representation.impl.RepresentationPackageImpl#getRule()
+	 * @generated
+	 */
+	int RULE = 1;
+
+	/**
+	 * The feature id for the '<em><b>Permit</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RULE__PERMIT = 0;
+
+	/**
+	 * The number of structural features of the '<em>Rule</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RULE_FEATURE_COUNT = 1;
+
+	/**
+	 * The number of operations of the '<em>Rule</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RULE_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.architecture.representation.impl.ModelRuleImpl <em>Model Rule</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.architecture.representation.impl.ModelRuleImpl
+	 * @see org.eclipse.papyrus.infra.architecture.representation.impl.RepresentationPackageImpl#getModelRule()
+	 * @generated
+	 */
+	int MODEL_RULE = 2;
+
+	/**
+	 * The feature id for the '<em><b>Permit</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MODEL_RULE__PERMIT = RULE__PERMIT;
+
+	/**
+	 * The feature id for the '<em><b>Constraints</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MODEL_RULE__CONSTRAINTS = RULE_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Element Multiplicity</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MODEL_RULE__ELEMENT_MULTIPLICITY = RULE_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MODEL_RULE__ELEMENT = RULE_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Stereotypes</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MODEL_RULE__STEREOTYPES = RULE_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Multiplicity</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MODEL_RULE__MULTIPLICITY = RULE_FEATURE_COUNT + 4;
+
+	/**
+	 * The number of structural features of the '<em>Model Rule</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MODEL_RULE_FEATURE_COUNT = RULE_FEATURE_COUNT + 5;
+
+	/**
+	 * The number of operations of the '<em>Model Rule</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MODEL_RULE_OPERATION_COUNT = RULE_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.architecture.representation.impl.OwningRuleImpl <em>Owning Rule</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.architecture.representation.impl.OwningRuleImpl
+	 * @see org.eclipse.papyrus.infra.architecture.representation.impl.RepresentationPackageImpl#getOwningRule()
+	 * @generated
+	 */
+	int OWNING_RULE = 3;
+
+	/**
+	 * The feature id for the '<em><b>Permit</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OWNING_RULE__PERMIT = RULE__PERMIT;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OWNING_RULE__ELEMENT = RULE_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Stereotypes</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OWNING_RULE__STEREOTYPES = RULE_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Multiplicity</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OWNING_RULE__MULTIPLICITY = RULE_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>New Model Path</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OWNING_RULE__NEW_MODEL_PATH = RULE_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Select Diagram Root</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OWNING_RULE__SELECT_DIAGRAM_ROOT = RULE_FEATURE_COUNT + 4;
+
+	/**
+	 * The number of structural features of the '<em>Owning Rule</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OWNING_RULE_FEATURE_COUNT = RULE_FEATURE_COUNT + 5;
+
+	/**
+	 * The number of operations of the '<em>Owning Rule</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OWNING_RULE_OPERATION_COUNT = RULE_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.architecture.representation.impl.ModelAutoCreateImpl <em>Model Auto Create</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.architecture.representation.impl.ModelAutoCreateImpl
+	 * @see org.eclipse.papyrus.infra.architecture.representation.impl.RepresentationPackageImpl#getModelAutoCreate()
+	 * @generated
+	 */
+	int MODEL_AUTO_CREATE = 4;
+
+	/**
+	 * The feature id for the '<em><b>Feature</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MODEL_AUTO_CREATE__FEATURE = 0;
+
+	/**
+	 * The feature id for the '<em><b>Origin</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MODEL_AUTO_CREATE__ORIGIN = 1;
+
+	/**
+	 * The feature id for the '<em><b>Creation Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MODEL_AUTO_CREATE__CREATION_TYPE = 2;
+
+	/**
+	 * The number of structural features of the '<em>Model Auto Create</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MODEL_AUTO_CREATE_FEATURE_COUNT = 3;
+
+	/**
+	 * The number of operations of the '<em>Model Auto Create</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MODEL_AUTO_CREATE_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.architecture.representation.impl.RootAutoSelectImpl <em>Root Auto Select</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.architecture.representation.impl.RootAutoSelectImpl
+	 * @see org.eclipse.papyrus.infra.architecture.representation.impl.RepresentationPackageImpl#getRootAutoSelect()
+	 * @generated
+	 */
+	int ROOT_AUTO_SELECT = 5;
+
+	/**
+	 * The feature id for the '<em><b>Feature</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ROOT_AUTO_SELECT__FEATURE = 0;
+
+	/**
+	 * The number of structural features of the '<em>Root Auto Select</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ROOT_AUTO_SELECT_FEATURE_COUNT = 1;
+
+	/**
+	 * The number of operations of the '<em>Root Auto Select</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ROOT_AUTO_SELECT_OPERATION_COUNT = 0;
+
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind <em>Papyrus Representation Kind</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Papyrus Representation Kind</em>'.
+	 * @see org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind
+	 * @generated
+	 */
+	EClass getPapyrusRepresentationKind();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind#getParent <em>Parent</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Parent</em>'.
+	 * @see org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind#getParent()
+	 * @see #getPapyrusRepresentationKind()
+	 * @generated
+	 */
+	EReference getPapyrusRepresentationKind_Parent();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind#getModelRules <em>Model Rules</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Model Rules</em>'.
+	 * @see org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind#getModelRules()
+	 * @see #getPapyrusRepresentationKind()
+	 * @generated
+	 */
+	EReference getPapyrusRepresentationKind_ModelRules();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind#getOwningRules <em>Owning Rules</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Owning Rules</em>'.
+	 * @see org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind#getOwningRules()
+	 * @see #getPapyrusRepresentationKind()
+	 * @generated
+	 */
+	EReference getPapyrusRepresentationKind_OwningRules();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind#getImplementationID <em>Implementation ID</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Implementation ID</em>'.
+	 * @see org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind#getImplementationID()
+	 * @see #getPapyrusRepresentationKind()
+	 * @generated
+	 */
+	EAttribute getPapyrusRepresentationKind_ImplementationID();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.architecture.representation.Rule <em>Rule</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Rule</em>'.
+	 * @see org.eclipse.papyrus.infra.architecture.representation.Rule
+	 * @generated
+	 */
+	EClass getRule();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.architecture.representation.Rule#isPermit <em>Permit</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Permit</em>'.
+	 * @see org.eclipse.papyrus.infra.architecture.representation.Rule#isPermit()
+	 * @see #getRule()
+	 * @generated
+	 */
+	EAttribute getRule_Permit();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.architecture.representation.ModelRule <em>Model Rule</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Model Rule</em>'.
+	 * @see org.eclipse.papyrus.infra.architecture.representation.ModelRule
+	 * @generated
+	 */
+	EClass getModelRule();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.architecture.representation.ModelRule#getElement <em>Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Element</em>'.
+	 * @see org.eclipse.papyrus.infra.architecture.representation.ModelRule#getElement()
+	 * @see #getModelRule()
+	 * @generated
+	 */
+	EReference getModelRule_Element();
+
+	/**
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.architecture.representation.ModelRule#getStereotypes <em>Stereotypes</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>Stereotypes</em>'.
+	 * @see org.eclipse.papyrus.infra.architecture.representation.ModelRule#getStereotypes()
+	 * @see #getModelRule()
+	 * @generated
+	 */
+	EReference getModelRule_Stereotypes();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.architecture.representation.ModelRule#getMultiplicity <em>Multiplicity</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Multiplicity</em>'.
+	 * @see org.eclipse.papyrus.infra.architecture.representation.ModelRule#getMultiplicity()
+	 * @see #getModelRule()
+	 * @generated
+	 */
+	EAttribute getModelRule_Multiplicity();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.architecture.representation.OwningRule <em>Owning Rule</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Owning Rule</em>'.
+	 * @see org.eclipse.papyrus.infra.architecture.representation.OwningRule
+	 * @generated
+	 */
+	EClass getOwningRule();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.architecture.representation.OwningRule#getElement <em>Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Element</em>'.
+	 * @see org.eclipse.papyrus.infra.architecture.representation.OwningRule#getElement()
+	 * @see #getOwningRule()
+	 * @generated
+	 */
+	EReference getOwningRule_Element();
+
+	/**
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.architecture.representation.OwningRule#getStereotypes <em>Stereotypes</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>Stereotypes</em>'.
+	 * @see org.eclipse.papyrus.infra.architecture.representation.OwningRule#getStereotypes()
+	 * @see #getOwningRule()
+	 * @generated
+	 */
+	EReference getOwningRule_Stereotypes();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.architecture.representation.OwningRule#getMultiplicity <em>Multiplicity</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Multiplicity</em>'.
+	 * @see org.eclipse.papyrus.infra.architecture.representation.OwningRule#getMultiplicity()
+	 * @see #getOwningRule()
+	 * @generated
+	 */
+	EAttribute getOwningRule_Multiplicity();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.architecture.representation.OwningRule#getNewModelPath <em>New Model Path</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>New Model Path</em>'.
+	 * @see org.eclipse.papyrus.infra.architecture.representation.OwningRule#getNewModelPath()
+	 * @see #getOwningRule()
+	 * @generated
+	 */
+	EReference getOwningRule_NewModelPath();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.architecture.representation.OwningRule#getSelectDiagramRoot <em>Select Diagram Root</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Select Diagram Root</em>'.
+	 * @see org.eclipse.papyrus.infra.architecture.representation.OwningRule#getSelectDiagramRoot()
+	 * @see #getOwningRule()
+	 * @generated
+	 */
+	EReference getOwningRule_SelectDiagramRoot();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.architecture.representation.ModelAutoCreate <em>Model Auto Create</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Model Auto Create</em>'.
+	 * @see org.eclipse.papyrus.infra.architecture.representation.ModelAutoCreate
+	 * @generated
+	 */
+	EClass getModelAutoCreate();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.architecture.representation.ModelAutoCreate#getFeature <em>Feature</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Feature</em>'.
+	 * @see org.eclipse.papyrus.infra.architecture.representation.ModelAutoCreate#getFeature()
+	 * @see #getModelAutoCreate()
+	 * @generated
+	 */
+	EReference getModelAutoCreate_Feature();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.architecture.representation.ModelAutoCreate#getOrigin <em>Origin</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Origin</em>'.
+	 * @see org.eclipse.papyrus.infra.architecture.representation.ModelAutoCreate#getOrigin()
+	 * @see #getModelAutoCreate()
+	 * @generated
+	 */
+	EReference getModelAutoCreate_Origin();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.architecture.representation.ModelAutoCreate#getCreationType <em>Creation Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Creation Type</em>'.
+	 * @see org.eclipse.papyrus.infra.architecture.representation.ModelAutoCreate#getCreationType()
+	 * @see #getModelAutoCreate()
+	 * @generated
+	 */
+	EAttribute getModelAutoCreate_CreationType();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.architecture.representation.RootAutoSelect <em>Root Auto Select</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Root Auto Select</em>'.
+	 * @see org.eclipse.papyrus.infra.architecture.representation.RootAutoSelect
+	 * @generated
+	 */
+	EClass getRootAutoSelect();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.architecture.representation.RootAutoSelect#getFeature <em>Feature</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Feature</em>'.
+	 * @see org.eclipse.papyrus.infra.architecture.representation.RootAutoSelect#getFeature()
+	 * @see #getRootAutoSelect()
+	 * @generated
+	 */
+	EReference getRootAutoSelect_Feature();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	RepresentationFactory getRepresentationFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 *   <li>each class,</li>
+	 *   <li>each feature of each class,</li>
+	 *   <li>each operation of each class,</li>
+	 *   <li>each enum,</li>
+	 *   <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.architecture.representation.impl.PapyrusRepresentationKindImpl <em>Papyrus Representation Kind</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.architecture.representation.impl.PapyrusRepresentationKindImpl
+		 * @see org.eclipse.papyrus.infra.architecture.representation.impl.RepresentationPackageImpl#getPapyrusRepresentationKind()
+		 * @generated
+		 */
+		EClass PAPYRUS_REPRESENTATION_KIND = eINSTANCE.getPapyrusRepresentationKind();
+
+		/**
+		 * The meta object literal for the '<em><b>Parent</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PAPYRUS_REPRESENTATION_KIND__PARENT = eINSTANCE.getPapyrusRepresentationKind_Parent();
+
+		/**
+		 * The meta object literal for the '<em><b>Model Rules</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PAPYRUS_REPRESENTATION_KIND__MODEL_RULES = eINSTANCE.getPapyrusRepresentationKind_ModelRules();
+
+		/**
+		 * The meta object literal for the '<em><b>Owning Rules</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PAPYRUS_REPRESENTATION_KIND__OWNING_RULES = eINSTANCE.getPapyrusRepresentationKind_OwningRules();
+
+		/**
+		 * The meta object literal for the '<em><b>Implementation ID</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PAPYRUS_REPRESENTATION_KIND__IMPLEMENTATION_ID = eINSTANCE.getPapyrusRepresentationKind_ImplementationID();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.architecture.representation.impl.RuleImpl <em>Rule</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.architecture.representation.impl.RuleImpl
+		 * @see org.eclipse.papyrus.infra.architecture.representation.impl.RepresentationPackageImpl#getRule()
+		 * @generated
+		 */
+		EClass RULE = eINSTANCE.getRule();
+
+		/**
+		 * The meta object literal for the '<em><b>Permit</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute RULE__PERMIT = eINSTANCE.getRule_Permit();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.architecture.representation.impl.ModelRuleImpl <em>Model Rule</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.architecture.representation.impl.ModelRuleImpl
+		 * @see org.eclipse.papyrus.infra.architecture.representation.impl.RepresentationPackageImpl#getModelRule()
+		 * @generated
+		 */
+		EClass MODEL_RULE = eINSTANCE.getModelRule();
+
+		/**
+		 * The meta object literal for the '<em><b>Element</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference MODEL_RULE__ELEMENT = eINSTANCE.getModelRule_Element();
+
+		/**
+		 * The meta object literal for the '<em><b>Stereotypes</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference MODEL_RULE__STEREOTYPES = eINSTANCE.getModelRule_Stereotypes();
+
+		/**
+		 * The meta object literal for the '<em><b>Multiplicity</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute MODEL_RULE__MULTIPLICITY = eINSTANCE.getModelRule_Multiplicity();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.architecture.representation.impl.OwningRuleImpl <em>Owning Rule</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.architecture.representation.impl.OwningRuleImpl
+		 * @see org.eclipse.papyrus.infra.architecture.representation.impl.RepresentationPackageImpl#getOwningRule()
+		 * @generated
+		 */
+		EClass OWNING_RULE = eINSTANCE.getOwningRule();
+
+		/**
+		 * The meta object literal for the '<em><b>Element</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference OWNING_RULE__ELEMENT = eINSTANCE.getOwningRule_Element();
+
+		/**
+		 * The meta object literal for the '<em><b>Stereotypes</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference OWNING_RULE__STEREOTYPES = eINSTANCE.getOwningRule_Stereotypes();
+
+		/**
+		 * The meta object literal for the '<em><b>Multiplicity</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute OWNING_RULE__MULTIPLICITY = eINSTANCE.getOwningRule_Multiplicity();
+
+		/**
+		 * The meta object literal for the '<em><b>New Model Path</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference OWNING_RULE__NEW_MODEL_PATH = eINSTANCE.getOwningRule_NewModelPath();
+
+		/**
+		 * The meta object literal for the '<em><b>Select Diagram Root</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference OWNING_RULE__SELECT_DIAGRAM_ROOT = eINSTANCE.getOwningRule_SelectDiagramRoot();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.architecture.representation.impl.ModelAutoCreateImpl <em>Model Auto Create</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.architecture.representation.impl.ModelAutoCreateImpl
+		 * @see org.eclipse.papyrus.infra.architecture.representation.impl.RepresentationPackageImpl#getModelAutoCreate()
+		 * @generated
+		 */
+		EClass MODEL_AUTO_CREATE = eINSTANCE.getModelAutoCreate();
+
+		/**
+		 * The meta object literal for the '<em><b>Feature</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference MODEL_AUTO_CREATE__FEATURE = eINSTANCE.getModelAutoCreate_Feature();
+
+		/**
+		 * The meta object literal for the '<em><b>Origin</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference MODEL_AUTO_CREATE__ORIGIN = eINSTANCE.getModelAutoCreate_Origin();
+
+		/**
+		 * The meta object literal for the '<em><b>Creation Type</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute MODEL_AUTO_CREATE__CREATION_TYPE = eINSTANCE.getModelAutoCreate_CreationType();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.architecture.representation.impl.RootAutoSelectImpl <em>Root Auto Select</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.architecture.representation.impl.RootAutoSelectImpl
+		 * @see org.eclipse.papyrus.infra.architecture.representation.impl.RepresentationPackageImpl#getRootAutoSelect()
+		 * @generated
+		 */
+		EClass ROOT_AUTO_SELECT = eINSTANCE.getRootAutoSelect();
+
+		/**
+		 * The meta object literal for the '<em><b>Feature</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ROOT_AUTO_SELECT__FEATURE = eINSTANCE.getRootAutoSelect_Feature();
+
+	}
+
+} //RepresentationPackage
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/RootAutoSelect.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/RootAutoSelect.java
index 0c350dcc998..daa32e15234 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/RootAutoSelect.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/RootAutoSelect.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 CEA LIST.
+ * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
@@ -7,11 +7,11 @@
  *  http://www.eclipse.org/legal/epl-v10.html
  *  
  *  Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *  Maged Elaasar - Initial API and implementation
  *  
  * 
  */
-package org.eclipse.papyrus.infra.viewpoints.configuration;
+package org.eclipse.papyrus.infra.architecture.representation;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
@@ -25,10 +25,10 @@ import org.eclipse.emf.ecore.EReference;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.RootAutoSelect#getFeature <em>Feature</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.architecture.representation.RootAutoSelect#getFeature <em>Feature</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getRootAutoSelect()
+ * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getRootAutoSelect()
  * @model
  * @generated
  */
@@ -43,14 +43,14 @@ public interface RootAutoSelect extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Feature</em>' reference.
 	 * @see #setFeature(EReference)
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getRootAutoSelect_Feature()
+	 * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getRootAutoSelect_Feature()
 	 * @model required="true"
 	 * @generated
 	 */
 	EReference getFeature();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.RootAutoSelect#getFeature <em>Feature</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.architecture.representation.RootAutoSelect#getFeature <em>Feature</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Feature</em>' reference.
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/Rule.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/Rule.java
index c2133246c86..aa24a6c8bf3 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/Rule.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/Rule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 CEA LIST.
+ * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
@@ -7,11 +7,11 @@
  *  http://www.eclipse.org/legal/epl-v10.html
  *  
  *  Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *  Maged Elaasar - Initial API and implementation
  *  
  * 
  */
-package org.eclipse.papyrus.infra.viewpoints.configuration;
+package org.eclipse.papyrus.infra.architecture.representation;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -24,10 +24,10 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.Rule#isPermit <em>Permit</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.architecture.representation.Rule#isPermit <em>Permit</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getRule()
+ * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getRule()
  * @model abstract="true"
  * @generated
  */
@@ -43,14 +43,14 @@ public interface Rule extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Permit</em>' attribute.
 	 * @see #setPermit(boolean)
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getRule_Permit()
+	 * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#getRule_Permit()
 	 * @model default="true" required="true"
 	 * @generated
 	 */
 	boolean isPermit();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.Rule#isPermit <em>Permit</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.architecture.representation.Rule#isPermit <em>Permit</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Permit</em>' attribute.
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/ModelAutoCreateImpl.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/ModelAutoCreateImpl.java
index 2fed2d298e3..b5a3e566a07 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/ModelAutoCreateImpl.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/ModelAutoCreateImpl.java
@@ -1,18 +1,17 @@
 /**
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
+ * Copyright (c) 2016 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:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
  */
-package org.eclipse.papyrus.infra.viewpoints.configuration.impl;
+package org.eclipse.papyrus.infra.architecture.representation.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -22,9 +21,8 @@ import org.eclipse.emf.ecore.InternalEObject;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ModelAutoCreate;
+import org.eclipse.papyrus.infra.architecture.representation.ModelAutoCreate;
+import org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -34,9 +32,9 @@ import org.eclipse.papyrus.infra.viewpoints.configuration.ModelAutoCreate;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.ModelAutoCreateImpl#getFeature <em>Feature</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.ModelAutoCreateImpl#getOrigin <em>Origin</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.ModelAutoCreateImpl#getCreationType <em>Creation Type</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.architecture.representation.impl.ModelAutoCreateImpl#getFeature <em>Feature</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.architecture.representation.impl.ModelAutoCreateImpl#getOrigin <em>Origin</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.architecture.representation.impl.ModelAutoCreateImpl#getCreationType <em>Creation Type</em>}</li>
  * </ul>
  *
  * @generated
@@ -88,7 +86,7 @@ public class ModelAutoCreateImpl extends MinimalEObjectImpl.Container implements
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return ConfigurationPackage.Literals.MODEL_AUTO_CREATE;
+		return RepresentationPackage.Literals.MODEL_AUTO_CREATE;
 	}
 
 	/**
@@ -98,12 +96,11 @@ public class ModelAutoCreateImpl extends MinimalEObjectImpl.Container implements
 	 */
 	public EReference getFeature() {
 		if (feature != null && feature.eIsProxy()) {
-			InternalEObject oldFeature = (InternalEObject) feature;
-			feature = (EReference) eResolveProxy(oldFeature);
+			InternalEObject oldFeature = (InternalEObject)feature;
+			feature = (EReference)eResolveProxy(oldFeature);
 			if (feature != oldFeature) {
-				if (eNotificationRequired()) {
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ConfigurationPackage.MODEL_AUTO_CREATE__FEATURE, oldFeature, feature));
-				}
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RepresentationPackage.MODEL_AUTO_CREATE__FEATURE, oldFeature, feature));
 			}
 		}
 		return feature;
@@ -126,9 +123,8 @@ public class ModelAutoCreateImpl extends MinimalEObjectImpl.Container implements
 	public void setFeature(EReference newFeature) {
 		EReference oldFeature = feature;
 		feature = newFeature;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ConfigurationPackage.MODEL_AUTO_CREATE__FEATURE, oldFeature, feature));
-		}
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, RepresentationPackage.MODEL_AUTO_CREATE__FEATURE, oldFeature, feature));
 	}
 
 	/**
@@ -138,7 +134,7 @@ public class ModelAutoCreateImpl extends MinimalEObjectImpl.Container implements
 	 */
 	public EClass getOrigin() {
 		EClass origin = basicGetOrigin();
-		return origin != null && origin.eIsProxy() ? (EClass) eResolveProxy((InternalEObject) origin) : origin;
+		return origin != null && origin.eIsProxy() ? (EClass)eResolveProxy((InternalEObject)origin) : origin;
 	}
 
 	/**
@@ -170,9 +166,8 @@ public class ModelAutoCreateImpl extends MinimalEObjectImpl.Container implements
 	public void setCreationType(String newCreationType) {
 		String oldCreationType = creationType;
 		creationType = newCreationType;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ConfigurationPackage.MODEL_AUTO_CREATE__CREATION_TYPE, oldCreationType, creationType));
-		}
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, RepresentationPackage.MODEL_AUTO_CREATE__CREATION_TYPE, oldCreationType, creationType));
 	}
 
 	/**
@@ -183,18 +178,14 @@ public class ModelAutoCreateImpl extends MinimalEObjectImpl.Container implements
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case ConfigurationPackage.MODEL_AUTO_CREATE__FEATURE:
-			if (resolve) {
-				return getFeature();
-			}
-			return basicGetFeature();
-		case ConfigurationPackage.MODEL_AUTO_CREATE__ORIGIN:
-			if (resolve) {
-				return getOrigin();
-			}
-			return basicGetOrigin();
-		case ConfigurationPackage.MODEL_AUTO_CREATE__CREATION_TYPE:
-			return getCreationType();
+			case RepresentationPackage.MODEL_AUTO_CREATE__FEATURE:
+				if (resolve) return getFeature();
+				return basicGetFeature();
+			case RepresentationPackage.MODEL_AUTO_CREATE__ORIGIN:
+				if (resolve) return getOrigin();
+				return basicGetOrigin();
+			case RepresentationPackage.MODEL_AUTO_CREATE__CREATION_TYPE:
+				return getCreationType();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -207,12 +198,12 @@ public class ModelAutoCreateImpl extends MinimalEObjectImpl.Container implements
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case ConfigurationPackage.MODEL_AUTO_CREATE__FEATURE:
-			setFeature((EReference) newValue);
-			return;
-		case ConfigurationPackage.MODEL_AUTO_CREATE__CREATION_TYPE:
-			setCreationType((String) newValue);
-			return;
+			case RepresentationPackage.MODEL_AUTO_CREATE__FEATURE:
+				setFeature((EReference)newValue);
+				return;
+			case RepresentationPackage.MODEL_AUTO_CREATE__CREATION_TYPE:
+				setCreationType((String)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -225,12 +216,12 @@ public class ModelAutoCreateImpl extends MinimalEObjectImpl.Container implements
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case ConfigurationPackage.MODEL_AUTO_CREATE__FEATURE:
-			setFeature((EReference) null);
-			return;
-		case ConfigurationPackage.MODEL_AUTO_CREATE__CREATION_TYPE:
-			setCreationType(CREATION_TYPE_EDEFAULT);
-			return;
+			case RepresentationPackage.MODEL_AUTO_CREATE__FEATURE:
+				setFeature((EReference)null);
+				return;
+			case RepresentationPackage.MODEL_AUTO_CREATE__CREATION_TYPE:
+				setCreationType(CREATION_TYPE_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -243,12 +234,12 @@ public class ModelAutoCreateImpl extends MinimalEObjectImpl.Container implements
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case ConfigurationPackage.MODEL_AUTO_CREATE__FEATURE:
-			return feature != null;
-		case ConfigurationPackage.MODEL_AUTO_CREATE__ORIGIN:
-			return basicGetOrigin() != null;
-		case ConfigurationPackage.MODEL_AUTO_CREATE__CREATION_TYPE:
-			return CREATION_TYPE_EDEFAULT == null ? creationType != null : !CREATION_TYPE_EDEFAULT.equals(creationType);
+			case RepresentationPackage.MODEL_AUTO_CREATE__FEATURE:
+				return feature != null;
+			case RepresentationPackage.MODEL_AUTO_CREATE__ORIGIN:
+				return basicGetOrigin() != null;
+			case RepresentationPackage.MODEL_AUTO_CREATE__CREATION_TYPE:
+				return CREATION_TYPE_EDEFAULT == null ? creationType != null : !CREATION_TYPE_EDEFAULT.equals(creationType);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -260,9 +251,7 @@ public class ModelAutoCreateImpl extends MinimalEObjectImpl.Container implements
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
-			return super.toString();
-		}
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (creationType: ");
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/ModelRuleImpl.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/ModelRuleImpl.java
index 7bc2f5546a5..9025905ffcd 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/ModelRuleImpl.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/ModelRuleImpl.java
@@ -1,18 +1,17 @@
 /**
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
+ * Copyright (c) 2016 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:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
  */
-package org.eclipse.papyrus.infra.viewpoints.configuration.impl;
+package org.eclipse.papyrus.infra.architecture.representation.impl;
 
 import java.util.Collection;
 
@@ -29,14 +28,12 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
+import org.eclipse.papyrus.infra.architecture.representation.ModelRule;
+import org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage;
 import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;
 import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
 import org.eclipse.papyrus.infra.constraints.DisplayUnit;
 
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ModelRule;
-
 /**
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Model Rule</b></em>'.
@@ -45,11 +42,11 @@ import org.eclipse.papyrus.infra.viewpoints.configuration.ModelRule;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.ModelRuleImpl#getConstraints <em>Constraints</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.ModelRuleImpl#getElementMultiplicity <em>Element Multiplicity</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.ModelRuleImpl#getElement <em>Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.ModelRuleImpl#getStereotypes <em>Stereotypes</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.ModelRuleImpl#getMultiplicity <em>Multiplicity</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.architecture.representation.impl.ModelRuleImpl#getConstraints <em>Constraints</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.architecture.representation.impl.ModelRuleImpl#getElementMultiplicity <em>Element Multiplicity</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.architecture.representation.impl.ModelRuleImpl#getElement <em>Element</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.architecture.representation.impl.ModelRuleImpl#getStereotypes <em>Stereotypes</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.architecture.representation.impl.ModelRuleImpl#getMultiplicity <em>Multiplicity</em>}</li>
  * </ul>
  *
  * @generated
@@ -141,7 +138,7 @@ public class ModelRuleImpl extends RuleImpl implements ModelRule {
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return ConfigurationPackage.Literals.MODEL_RULE;
+		return RepresentationPackage.Literals.MODEL_RULE;
 	}
 
 	/**
@@ -151,7 +148,7 @@ public class ModelRuleImpl extends RuleImpl implements ModelRule {
 	 */
 	public EList<ConstraintDescriptor> getConstraints() {
 		if (constraints == null) {
-			constraints = new EObjectContainmentWithInverseEList<ConstraintDescriptor>(ConstraintDescriptor.class, this, ConfigurationPackage.MODEL_RULE__CONSTRAINTS, ConstraintsPackage.CONSTRAINT_DESCRIPTOR__DISPLAY);
+			constraints = new EObjectContainmentWithInverseEList<ConstraintDescriptor>(ConstraintDescriptor.class, this, RepresentationPackage.MODEL_RULE__CONSTRAINTS, ConstraintsPackage.CONSTRAINT_DESCRIPTOR__DISPLAY);
 		}
 		return constraints;
 	}
@@ -173,9 +170,8 @@ public class ModelRuleImpl extends RuleImpl implements ModelRule {
 	public void setElementMultiplicity(int newElementMultiplicity) {
 		int oldElementMultiplicity = elementMultiplicity;
 		elementMultiplicity = newElementMultiplicity;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ConfigurationPackage.MODEL_RULE__ELEMENT_MULTIPLICITY, oldElementMultiplicity, elementMultiplicity));
-		}
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, RepresentationPackage.MODEL_RULE__ELEMENT_MULTIPLICITY, oldElementMultiplicity, elementMultiplicity));
 	}
 
 	/**
@@ -185,12 +181,11 @@ public class ModelRuleImpl extends RuleImpl implements ModelRule {
 	 */
 	public EClass getElement() {
 		if (element != null && element.eIsProxy()) {
-			InternalEObject oldElement = (InternalEObject) element;
-			element = (EClass) eResolveProxy(oldElement);
+			InternalEObject oldElement = (InternalEObject)element;
+			element = (EClass)eResolveProxy(oldElement);
 			if (element != oldElement) {
-				if (eNotificationRequired()) {
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ConfigurationPackage.MODEL_RULE__ELEMENT, oldElement, element));
-				}
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RepresentationPackage.MODEL_RULE__ELEMENT, oldElement, element));
 			}
 		}
 		return element;
@@ -213,9 +208,8 @@ public class ModelRuleImpl extends RuleImpl implements ModelRule {
 	public void setElement(EClass newElement) {
 		EClass oldElement = element;
 		element = newElement;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ConfigurationPackage.MODEL_RULE__ELEMENT, oldElement, element));
-		}
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, RepresentationPackage.MODEL_RULE__ELEMENT, oldElement, element));
 	}
 
 	/**
@@ -225,7 +219,7 @@ public class ModelRuleImpl extends RuleImpl implements ModelRule {
 	 */
 	public EList<EClass> getStereotypes() {
 		if (stereotypes == null) {
-			stereotypes = new EObjectResolvingEList<EClass>(EClass.class, this, ConfigurationPackage.MODEL_RULE__STEREOTYPES);
+			stereotypes = new EObjectResolvingEList<EClass>(EClass.class, this, RepresentationPackage.MODEL_RULE__STEREOTYPES);
 		}
 		return stereotypes;
 	}
@@ -247,9 +241,8 @@ public class ModelRuleImpl extends RuleImpl implements ModelRule {
 	public void setMultiplicity(int newMultiplicity) {
 		int oldMultiplicity = multiplicity;
 		multiplicity = newMultiplicity;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ConfigurationPackage.MODEL_RULE__MULTIPLICITY, oldMultiplicity, multiplicity));
-		}
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, RepresentationPackage.MODEL_RULE__MULTIPLICITY, oldMultiplicity, multiplicity));
 	}
 
 	/**
@@ -261,8 +254,8 @@ public class ModelRuleImpl extends RuleImpl implements ModelRule {
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case ConfigurationPackage.MODEL_RULE__CONSTRAINTS:
-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getConstraints()).basicAdd(otherEnd, msgs);
+			case RepresentationPackage.MODEL_RULE__CONSTRAINTS:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getConstraints()).basicAdd(otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
@@ -275,8 +268,8 @@ public class ModelRuleImpl extends RuleImpl implements ModelRule {
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case ConfigurationPackage.MODEL_RULE__CONSTRAINTS:
-			return ((InternalEList<?>) getConstraints()).basicRemove(otherEnd, msgs);
+			case RepresentationPackage.MODEL_RULE__CONSTRAINTS:
+				return ((InternalEList<?>)getConstraints()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -289,19 +282,17 @@ public class ModelRuleImpl extends RuleImpl implements ModelRule {
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case ConfigurationPackage.MODEL_RULE__CONSTRAINTS:
-			return getConstraints();
-		case ConfigurationPackage.MODEL_RULE__ELEMENT_MULTIPLICITY:
-			return getElementMultiplicity();
-		case ConfigurationPackage.MODEL_RULE__ELEMENT:
-			if (resolve) {
-				return getElement();
-			}
-			return basicGetElement();
-		case ConfigurationPackage.MODEL_RULE__STEREOTYPES:
-			return getStereotypes();
-		case ConfigurationPackage.MODEL_RULE__MULTIPLICITY:
-			return getMultiplicity();
+			case RepresentationPackage.MODEL_RULE__CONSTRAINTS:
+				return getConstraints();
+			case RepresentationPackage.MODEL_RULE__ELEMENT_MULTIPLICITY:
+				return getElementMultiplicity();
+			case RepresentationPackage.MODEL_RULE__ELEMENT:
+				if (resolve) return getElement();
+				return basicGetElement();
+			case RepresentationPackage.MODEL_RULE__STEREOTYPES:
+				return getStereotypes();
+			case RepresentationPackage.MODEL_RULE__MULTIPLICITY:
+				return getMultiplicity();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -315,23 +306,23 @@ public class ModelRuleImpl extends RuleImpl implements ModelRule {
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case ConfigurationPackage.MODEL_RULE__CONSTRAINTS:
-			getConstraints().clear();
-			getConstraints().addAll((Collection<? extends ConstraintDescriptor>) newValue);
-			return;
-		case ConfigurationPackage.MODEL_RULE__ELEMENT_MULTIPLICITY:
-			setElementMultiplicity((Integer) newValue);
-			return;
-		case ConfigurationPackage.MODEL_RULE__ELEMENT:
-			setElement((EClass) newValue);
-			return;
-		case ConfigurationPackage.MODEL_RULE__STEREOTYPES:
-			getStereotypes().clear();
-			getStereotypes().addAll((Collection<? extends EClass>) newValue);
-			return;
-		case ConfigurationPackage.MODEL_RULE__MULTIPLICITY:
-			setMultiplicity((Integer) newValue);
-			return;
+			case RepresentationPackage.MODEL_RULE__CONSTRAINTS:
+				getConstraints().clear();
+				getConstraints().addAll((Collection<? extends ConstraintDescriptor>)newValue);
+				return;
+			case RepresentationPackage.MODEL_RULE__ELEMENT_MULTIPLICITY:
+				setElementMultiplicity((Integer)newValue);
+				return;
+			case RepresentationPackage.MODEL_RULE__ELEMENT:
+				setElement((EClass)newValue);
+				return;
+			case RepresentationPackage.MODEL_RULE__STEREOTYPES:
+				getStereotypes().clear();
+				getStereotypes().addAll((Collection<? extends EClass>)newValue);
+				return;
+			case RepresentationPackage.MODEL_RULE__MULTIPLICITY:
+				setMultiplicity((Integer)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -344,21 +335,21 @@ public class ModelRuleImpl extends RuleImpl implements ModelRule {
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case ConfigurationPackage.MODEL_RULE__CONSTRAINTS:
-			getConstraints().clear();
-			return;
-		case ConfigurationPackage.MODEL_RULE__ELEMENT_MULTIPLICITY:
-			setElementMultiplicity(ELEMENT_MULTIPLICITY_EDEFAULT);
-			return;
-		case ConfigurationPackage.MODEL_RULE__ELEMENT:
-			setElement((EClass) null);
-			return;
-		case ConfigurationPackage.MODEL_RULE__STEREOTYPES:
-			getStereotypes().clear();
-			return;
-		case ConfigurationPackage.MODEL_RULE__MULTIPLICITY:
-			setMultiplicity(MULTIPLICITY_EDEFAULT);
-			return;
+			case RepresentationPackage.MODEL_RULE__CONSTRAINTS:
+				getConstraints().clear();
+				return;
+			case RepresentationPackage.MODEL_RULE__ELEMENT_MULTIPLICITY:
+				setElementMultiplicity(ELEMENT_MULTIPLICITY_EDEFAULT);
+				return;
+			case RepresentationPackage.MODEL_RULE__ELEMENT:
+				setElement((EClass)null);
+				return;
+			case RepresentationPackage.MODEL_RULE__STEREOTYPES:
+				getStereotypes().clear();
+				return;
+			case RepresentationPackage.MODEL_RULE__MULTIPLICITY:
+				setMultiplicity(MULTIPLICITY_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -371,16 +362,16 @@ public class ModelRuleImpl extends RuleImpl implements ModelRule {
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case ConfigurationPackage.MODEL_RULE__CONSTRAINTS:
-			return constraints != null && !constraints.isEmpty();
-		case ConfigurationPackage.MODEL_RULE__ELEMENT_MULTIPLICITY:
-			return elementMultiplicity != ELEMENT_MULTIPLICITY_EDEFAULT;
-		case ConfigurationPackage.MODEL_RULE__ELEMENT:
-			return element != null;
-		case ConfigurationPackage.MODEL_RULE__STEREOTYPES:
-			return stereotypes != null && !stereotypes.isEmpty();
-		case ConfigurationPackage.MODEL_RULE__MULTIPLICITY:
-			return multiplicity != MULTIPLICITY_EDEFAULT;
+			case RepresentationPackage.MODEL_RULE__CONSTRAINTS:
+				return constraints != null && !constraints.isEmpty();
+			case RepresentationPackage.MODEL_RULE__ELEMENT_MULTIPLICITY:
+				return elementMultiplicity != ELEMENT_MULTIPLICITY_EDEFAULT;
+			case RepresentationPackage.MODEL_RULE__ELEMENT:
+				return element != null;
+			case RepresentationPackage.MODEL_RULE__STEREOTYPES:
+				return stereotypes != null && !stereotypes.isEmpty();
+			case RepresentationPackage.MODEL_RULE__MULTIPLICITY:
+				return multiplicity != MULTIPLICITY_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -394,12 +385,9 @@ public class ModelRuleImpl extends RuleImpl implements ModelRule {
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
 		if (baseClass == DisplayUnit.class) {
 			switch (derivedFeatureID) {
-			case ConfigurationPackage.MODEL_RULE__CONSTRAINTS:
-				return ConstraintsPackage.DISPLAY_UNIT__CONSTRAINTS;
-			case ConfigurationPackage.MODEL_RULE__ELEMENT_MULTIPLICITY:
-				return ConstraintsPackage.DISPLAY_UNIT__ELEMENT_MULTIPLICITY;
-			default:
-				return -1;
+				case RepresentationPackage.MODEL_RULE__CONSTRAINTS: return ConstraintsPackage.DISPLAY_UNIT__CONSTRAINTS;
+				case RepresentationPackage.MODEL_RULE__ELEMENT_MULTIPLICITY: return ConstraintsPackage.DISPLAY_UNIT__ELEMENT_MULTIPLICITY;
+				default: return -1;
 			}
 		}
 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
@@ -414,12 +402,9 @@ public class ModelRuleImpl extends RuleImpl implements ModelRule {
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
 		if (baseClass == DisplayUnit.class) {
 			switch (baseFeatureID) {
-			case ConstraintsPackage.DISPLAY_UNIT__CONSTRAINTS:
-				return ConfigurationPackage.MODEL_RULE__CONSTRAINTS;
-			case ConstraintsPackage.DISPLAY_UNIT__ELEMENT_MULTIPLICITY:
-				return ConfigurationPackage.MODEL_RULE__ELEMENT_MULTIPLICITY;
-			default:
-				return -1;
+				case ConstraintsPackage.DISPLAY_UNIT__CONSTRAINTS: return RepresentationPackage.MODEL_RULE__CONSTRAINTS;
+				case ConstraintsPackage.DISPLAY_UNIT__ELEMENT_MULTIPLICITY: return RepresentationPackage.MODEL_RULE__ELEMENT_MULTIPLICITY;
+				default: return -1;
 			}
 		}
 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
@@ -432,9 +417,7 @@ public class ModelRuleImpl extends RuleImpl implements ModelRule {
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
-			return super.toString();
-		}
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (elementMultiplicity: ");
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/OwningRuleImpl.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/OwningRuleImpl.java
index d8bd1083a56..ed80a0633c8 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/OwningRuleImpl.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/OwningRuleImpl.java
@@ -1,18 +1,17 @@
 /**
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
+ * Copyright (c) 2016 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:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
  */
-package org.eclipse.papyrus.infra.viewpoints.configuration.impl;
+package org.eclipse.papyrus.infra.architecture.representation.impl;
 
 import java.util.Collection;
 
@@ -29,11 +28,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ModelAutoCreate;
-import org.eclipse.papyrus.infra.viewpoints.configuration.OwningRule;
-import org.eclipse.papyrus.infra.viewpoints.configuration.RootAutoSelect;
+import org.eclipse.papyrus.infra.architecture.representation.ModelAutoCreate;
+import org.eclipse.papyrus.infra.architecture.representation.OwningRule;
+import org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage;
+import org.eclipse.papyrus.infra.architecture.representation.RootAutoSelect;
 
 /**
  * <!-- begin-user-doc -->
@@ -43,11 +41,11 @@ import org.eclipse.papyrus.infra.viewpoints.configuration.RootAutoSelect;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.OwningRuleImpl#getElement <em>Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.OwningRuleImpl#getStereotypes <em>Stereotypes</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.OwningRuleImpl#getMultiplicity <em>Multiplicity</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.OwningRuleImpl#getNewModelPath <em>New Model Path</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.OwningRuleImpl#getSelectDiagramRoot <em>Select Diagram Root</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.architecture.representation.impl.OwningRuleImpl#getElement <em>Element</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.architecture.representation.impl.OwningRuleImpl#getStereotypes <em>Stereotypes</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.architecture.representation.impl.OwningRuleImpl#getMultiplicity <em>Multiplicity</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.architecture.representation.impl.OwningRuleImpl#getNewModelPath <em>New Model Path</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.architecture.representation.impl.OwningRuleImpl#getSelectDiagramRoot <em>Select Diagram Root</em>}</li>
  * </ul>
  *
  * @generated
@@ -129,7 +127,7 @@ public class OwningRuleImpl extends RuleImpl implements OwningRule {
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return ConfigurationPackage.Literals.OWNING_RULE;
+		return RepresentationPackage.Literals.OWNING_RULE;
 	}
 
 	/**
@@ -139,12 +137,11 @@ public class OwningRuleImpl extends RuleImpl implements OwningRule {
 	 */
 	public EClass getElement() {
 		if (element != null && element.eIsProxy()) {
-			InternalEObject oldElement = (InternalEObject) element;
-			element = (EClass) eResolveProxy(oldElement);
+			InternalEObject oldElement = (InternalEObject)element;
+			element = (EClass)eResolveProxy(oldElement);
 			if (element != oldElement) {
-				if (eNotificationRequired()) {
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ConfigurationPackage.OWNING_RULE__ELEMENT, oldElement, element));
-				}
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RepresentationPackage.OWNING_RULE__ELEMENT, oldElement, element));
 			}
 		}
 		return element;
@@ -167,9 +164,8 @@ public class OwningRuleImpl extends RuleImpl implements OwningRule {
 	public void setElement(EClass newElement) {
 		EClass oldElement = element;
 		element = newElement;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ConfigurationPackage.OWNING_RULE__ELEMENT, oldElement, element));
-		}
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, RepresentationPackage.OWNING_RULE__ELEMENT, oldElement, element));
 	}
 
 	/**
@@ -179,7 +175,7 @@ public class OwningRuleImpl extends RuleImpl implements OwningRule {
 	 */
 	public EList<EClass> getStereotypes() {
 		if (stereotypes == null) {
-			stereotypes = new EObjectResolvingEList<EClass>(EClass.class, this, ConfigurationPackage.OWNING_RULE__STEREOTYPES);
+			stereotypes = new EObjectResolvingEList<EClass>(EClass.class, this, RepresentationPackage.OWNING_RULE__STEREOTYPES);
 		}
 		return stereotypes;
 	}
@@ -201,9 +197,8 @@ public class OwningRuleImpl extends RuleImpl implements OwningRule {
 	public void setMultiplicity(int newMultiplicity) {
 		int oldMultiplicity = multiplicity;
 		multiplicity = newMultiplicity;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ConfigurationPackage.OWNING_RULE__MULTIPLICITY, oldMultiplicity, multiplicity));
-		}
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, RepresentationPackage.OWNING_RULE__MULTIPLICITY, oldMultiplicity, multiplicity));
 	}
 
 	/**
@@ -213,7 +208,7 @@ public class OwningRuleImpl extends RuleImpl implements OwningRule {
 	 */
 	public EList<ModelAutoCreate> getNewModelPath() {
 		if (newModelPath == null) {
-			newModelPath = new EObjectContainmentEList<ModelAutoCreate>(ModelAutoCreate.class, this, ConfigurationPackage.OWNING_RULE__NEW_MODEL_PATH);
+			newModelPath = new EObjectContainmentEList<ModelAutoCreate>(ModelAutoCreate.class, this, RepresentationPackage.OWNING_RULE__NEW_MODEL_PATH);
 		}
 		return newModelPath;
 	}
@@ -225,7 +220,7 @@ public class OwningRuleImpl extends RuleImpl implements OwningRule {
 	 */
 	public EList<RootAutoSelect> getSelectDiagramRoot() {
 		if (selectDiagramRoot == null) {
-			selectDiagramRoot = new EObjectContainmentEList<RootAutoSelect>(RootAutoSelect.class, this, ConfigurationPackage.OWNING_RULE__SELECT_DIAGRAM_ROOT);
+			selectDiagramRoot = new EObjectContainmentEList<RootAutoSelect>(RootAutoSelect.class, this, RepresentationPackage.OWNING_RULE__SELECT_DIAGRAM_ROOT);
 		}
 		return selectDiagramRoot;
 	}
@@ -238,10 +233,10 @@ public class OwningRuleImpl extends RuleImpl implements OwningRule {
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case ConfigurationPackage.OWNING_RULE__NEW_MODEL_PATH:
-			return ((InternalEList<?>) getNewModelPath()).basicRemove(otherEnd, msgs);
-		case ConfigurationPackage.OWNING_RULE__SELECT_DIAGRAM_ROOT:
-			return ((InternalEList<?>) getSelectDiagramRoot()).basicRemove(otherEnd, msgs);
+			case RepresentationPackage.OWNING_RULE__NEW_MODEL_PATH:
+				return ((InternalEList<?>)getNewModelPath()).basicRemove(otherEnd, msgs);
+			case RepresentationPackage.OWNING_RULE__SELECT_DIAGRAM_ROOT:
+				return ((InternalEList<?>)getSelectDiagramRoot()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -254,19 +249,17 @@ public class OwningRuleImpl extends RuleImpl implements OwningRule {
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case ConfigurationPackage.OWNING_RULE__ELEMENT:
-			if (resolve) {
-				return getElement();
-			}
-			return basicGetElement();
-		case ConfigurationPackage.OWNING_RULE__STEREOTYPES:
-			return getStereotypes();
-		case ConfigurationPackage.OWNING_RULE__MULTIPLICITY:
-			return getMultiplicity();
-		case ConfigurationPackage.OWNING_RULE__NEW_MODEL_PATH:
-			return getNewModelPath();
-		case ConfigurationPackage.OWNING_RULE__SELECT_DIAGRAM_ROOT:
-			return getSelectDiagramRoot();
+			case RepresentationPackage.OWNING_RULE__ELEMENT:
+				if (resolve) return getElement();
+				return basicGetElement();
+			case RepresentationPackage.OWNING_RULE__STEREOTYPES:
+				return getStereotypes();
+			case RepresentationPackage.OWNING_RULE__MULTIPLICITY:
+				return getMultiplicity();
+			case RepresentationPackage.OWNING_RULE__NEW_MODEL_PATH:
+				return getNewModelPath();
+			case RepresentationPackage.OWNING_RULE__SELECT_DIAGRAM_ROOT:
+				return getSelectDiagramRoot();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -280,24 +273,24 @@ public class OwningRuleImpl extends RuleImpl implements OwningRule {
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case ConfigurationPackage.OWNING_RULE__ELEMENT:
-			setElement((EClass) newValue);
-			return;
-		case ConfigurationPackage.OWNING_RULE__STEREOTYPES:
-			getStereotypes().clear();
-			getStereotypes().addAll((Collection<? extends EClass>) newValue);
-			return;
-		case ConfigurationPackage.OWNING_RULE__MULTIPLICITY:
-			setMultiplicity((Integer) newValue);
-			return;
-		case ConfigurationPackage.OWNING_RULE__NEW_MODEL_PATH:
-			getNewModelPath().clear();
-			getNewModelPath().addAll((Collection<? extends ModelAutoCreate>) newValue);
-			return;
-		case ConfigurationPackage.OWNING_RULE__SELECT_DIAGRAM_ROOT:
-			getSelectDiagramRoot().clear();
-			getSelectDiagramRoot().addAll((Collection<? extends RootAutoSelect>) newValue);
-			return;
+			case RepresentationPackage.OWNING_RULE__ELEMENT:
+				setElement((EClass)newValue);
+				return;
+			case RepresentationPackage.OWNING_RULE__STEREOTYPES:
+				getStereotypes().clear();
+				getStereotypes().addAll((Collection<? extends EClass>)newValue);
+				return;
+			case RepresentationPackage.OWNING_RULE__MULTIPLICITY:
+				setMultiplicity((Integer)newValue);
+				return;
+			case RepresentationPackage.OWNING_RULE__NEW_MODEL_PATH:
+				getNewModelPath().clear();
+				getNewModelPath().addAll((Collection<? extends ModelAutoCreate>)newValue);
+				return;
+			case RepresentationPackage.OWNING_RULE__SELECT_DIAGRAM_ROOT:
+				getSelectDiagramRoot().clear();
+				getSelectDiagramRoot().addAll((Collection<? extends RootAutoSelect>)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -310,21 +303,21 @@ public class OwningRuleImpl extends RuleImpl implements OwningRule {
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case ConfigurationPackage.OWNING_RULE__ELEMENT:
-			setElement((EClass) null);
-			return;
-		case ConfigurationPackage.OWNING_RULE__STEREOTYPES:
-			getStereotypes().clear();
-			return;
-		case ConfigurationPackage.OWNING_RULE__MULTIPLICITY:
-			setMultiplicity(MULTIPLICITY_EDEFAULT);
-			return;
-		case ConfigurationPackage.OWNING_RULE__NEW_MODEL_PATH:
-			getNewModelPath().clear();
-			return;
-		case ConfigurationPackage.OWNING_RULE__SELECT_DIAGRAM_ROOT:
-			getSelectDiagramRoot().clear();
-			return;
+			case RepresentationPackage.OWNING_RULE__ELEMENT:
+				setElement((EClass)null);
+				return;
+			case RepresentationPackage.OWNING_RULE__STEREOTYPES:
+				getStereotypes().clear();
+				return;
+			case RepresentationPackage.OWNING_RULE__MULTIPLICITY:
+				setMultiplicity(MULTIPLICITY_EDEFAULT);
+				return;
+			case RepresentationPackage.OWNING_RULE__NEW_MODEL_PATH:
+				getNewModelPath().clear();
+				return;
+			case RepresentationPackage.OWNING_RULE__SELECT_DIAGRAM_ROOT:
+				getSelectDiagramRoot().clear();
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -337,16 +330,16 @@ public class OwningRuleImpl extends RuleImpl implements OwningRule {
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case ConfigurationPackage.OWNING_RULE__ELEMENT:
-			return element != null;
-		case ConfigurationPackage.OWNING_RULE__STEREOTYPES:
-			return stereotypes != null && !stereotypes.isEmpty();
-		case ConfigurationPackage.OWNING_RULE__MULTIPLICITY:
-			return multiplicity != MULTIPLICITY_EDEFAULT;
-		case ConfigurationPackage.OWNING_RULE__NEW_MODEL_PATH:
-			return newModelPath != null && !newModelPath.isEmpty();
-		case ConfigurationPackage.OWNING_RULE__SELECT_DIAGRAM_ROOT:
-			return selectDiagramRoot != null && !selectDiagramRoot.isEmpty();
+			case RepresentationPackage.OWNING_RULE__ELEMENT:
+				return element != null;
+			case RepresentationPackage.OWNING_RULE__STEREOTYPES:
+				return stereotypes != null && !stereotypes.isEmpty();
+			case RepresentationPackage.OWNING_RULE__MULTIPLICITY:
+				return multiplicity != MULTIPLICITY_EDEFAULT;
+			case RepresentationPackage.OWNING_RULE__NEW_MODEL_PATH:
+				return newModelPath != null && !newModelPath.isEmpty();
+			case RepresentationPackage.OWNING_RULE__SELECT_DIAGRAM_ROOT:
+				return selectDiagramRoot != null && !selectDiagramRoot.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -358,9 +351,7 @@ public class OwningRuleImpl extends RuleImpl implements OwningRule {
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
-			return super.toString();
-		}
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (multiplicity: ");
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/PapyrusRepresentationKindImpl.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/PapyrusRepresentationKindImpl.java
new file mode 100644
index 00000000000..e5988a89138
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/PapyrusRepresentationKindImpl.java
@@ -0,0 +1,329 @@
+/**
+ * Copyright (c) 2016 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:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.architecture.representation.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.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.architecture.representation.ModelRule;
+import org.eclipse.papyrus.infra.architecture.representation.OwningRule;
+import org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind;
+import org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage;
+import org.eclipse.papyrus.infra.core.architecture.impl.RepresentationKindImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Papyrus Representation Kind</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.architecture.representation.impl.PapyrusRepresentationKindImpl#getParent <em>Parent</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.architecture.representation.impl.PapyrusRepresentationKindImpl#getModelRules <em>Model Rules</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.architecture.representation.impl.PapyrusRepresentationKindImpl#getOwningRules <em>Owning Rules</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.architecture.representation.impl.PapyrusRepresentationKindImpl#getImplementationID <em>Implementation ID</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class PapyrusRepresentationKindImpl extends RepresentationKindImpl implements PapyrusRepresentationKind {
+	/**
+	 * The cached value of the '{@link #getParent() <em>Parent</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getParent()
+	 * @generated
+	 * @ordered
+	 */
+	protected PapyrusRepresentationKind parent;
+
+	/**
+	 * The cached value of the '{@link #getModelRules() <em>Model Rules</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getModelRules()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<ModelRule> modelRules;
+
+	/**
+	 * The cached value of the '{@link #getOwningRules() <em>Owning Rules</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getOwningRules()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<OwningRule> owningRules;
+
+	/**
+	 * The default value of the '{@link #getImplementationID() <em>Implementation ID</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getImplementationID()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String IMPLEMENTATION_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getImplementationID() <em>Implementation ID</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getImplementationID()
+	 * @generated
+	 * @ordered
+	 */
+	protected String implementationID = IMPLEMENTATION_ID_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected PapyrusRepresentationKindImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return RepresentationPackage.Literals.PAPYRUS_REPRESENTATION_KIND;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public PapyrusRepresentationKind getParent() {
+		if (parent != null && parent.eIsProxy()) {
+			InternalEObject oldParent = (InternalEObject)parent;
+			parent = (PapyrusRepresentationKind)eResolveProxy(oldParent);
+			if (parent != oldParent) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__PARENT, oldParent, parent));
+			}
+		}
+		return parent;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public PapyrusRepresentationKind basicGetParent() {
+		return parent;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setParent(PapyrusRepresentationKind newParent) {
+		PapyrusRepresentationKind oldParent = parent;
+		parent = newParent;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__PARENT, oldParent, parent));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<ModelRule> getModelRules() {
+		if (modelRules == null) {
+			modelRules = new EObjectContainmentEList<ModelRule>(ModelRule.class, this, RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__MODEL_RULES);
+		}
+		return modelRules;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<OwningRule> getOwningRules() {
+		if (owningRules == null) {
+			owningRules = new EObjectContainmentEList<OwningRule>(OwningRule.class, this, RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__OWNING_RULES);
+		}
+		return owningRules;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getImplementationID() {
+		return implementationID;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setImplementationID(String newImplementationID) {
+		String oldImplementationID = implementationID;
+		implementationID = newImplementationID;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__IMPLEMENTATION_ID, oldImplementationID, implementationID));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__MODEL_RULES:
+				return ((InternalEList<?>)getModelRules()).basicRemove(otherEnd, msgs);
+			case RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__OWNING_RULES:
+				return ((InternalEList<?>)getOwningRules()).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 RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__PARENT:
+				if (resolve) return getParent();
+				return basicGetParent();
+			case RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__MODEL_RULES:
+				return getModelRules();
+			case RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__OWNING_RULES:
+				return getOwningRules();
+			case RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__IMPLEMENTATION_ID:
+				return getImplementationID();
+		}
+		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 RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__PARENT:
+				setParent((PapyrusRepresentationKind)newValue);
+				return;
+			case RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__MODEL_RULES:
+				getModelRules().clear();
+				getModelRules().addAll((Collection<? extends ModelRule>)newValue);
+				return;
+			case RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__OWNING_RULES:
+				getOwningRules().clear();
+				getOwningRules().addAll((Collection<? extends OwningRule>)newValue);
+				return;
+			case RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__IMPLEMENTATION_ID:
+				setImplementationID((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__PARENT:
+				setParent((PapyrusRepresentationKind)null);
+				return;
+			case RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__MODEL_RULES:
+				getModelRules().clear();
+				return;
+			case RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__OWNING_RULES:
+				getOwningRules().clear();
+				return;
+			case RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__IMPLEMENTATION_ID:
+				setImplementationID(IMPLEMENTATION_ID_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__PARENT:
+				return parent != null;
+			case RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__MODEL_RULES:
+				return modelRules != null && !modelRules.isEmpty();
+			case RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__OWNING_RULES:
+				return owningRules != null && !owningRules.isEmpty();
+			case RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__IMPLEMENTATION_ID:
+				return IMPLEMENTATION_ID_EDEFAULT == null ? implementationID != null : !IMPLEMENTATION_ID_EDEFAULT.equals(implementationID);
+		}
+		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(" (implementationID: ");
+		result.append(implementationID);
+		result.append(')');
+		return result.toString();
+	}
+
+} //PapyrusRepresentationKindImpl
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/RepresentationFactoryImpl.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/RepresentationFactoryImpl.java
new file mode 100644
index 00000000000..e7857a3f895
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/RepresentationFactoryImpl.java
@@ -0,0 +1,138 @@
+/**
+ * Copyright (c) 2016 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:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.architecture.representation.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.infra.architecture.representation.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class RepresentationFactoryImpl extends EFactoryImpl implements RepresentationFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static RepresentationFactory init() {
+		try {
+			RepresentationFactory theRepresentationFactory = (RepresentationFactory)EPackage.Registry.INSTANCE.getEFactory(RepresentationPackage.eNS_URI);
+			if (theRepresentationFactory != null) {
+				return theRepresentationFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new RepresentationFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RepresentationFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case RepresentationPackage.MODEL_RULE: return createModelRule();
+			case RepresentationPackage.OWNING_RULE: return createOwningRule();
+			case RepresentationPackage.MODEL_AUTO_CREATE: return createModelAutoCreate();
+			case RepresentationPackage.ROOT_AUTO_SELECT: return createRootAutoSelect();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ModelRule createModelRule() {
+		ModelRuleImpl modelRule = new ModelRuleImpl();
+		return modelRule;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public OwningRule createOwningRule() {
+		OwningRuleImpl owningRule = new OwningRuleImpl();
+		return owningRule;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ModelAutoCreate createModelAutoCreate() {
+		ModelAutoCreateImpl modelAutoCreate = new ModelAutoCreateImpl();
+		return modelAutoCreate;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RootAutoSelect createRootAutoSelect() {
+		RootAutoSelectImpl rootAutoSelect = new RootAutoSelectImpl();
+		return rootAutoSelect;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RepresentationPackage getRepresentationPackage() {
+		return (RepresentationPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static RepresentationPackage getPackage() {
+		return RepresentationPackage.eINSTANCE;
+	}
+
+} //RepresentationFactoryImpl
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/RepresentationPackageImpl.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/RepresentationPackageImpl.java
new file mode 100644
index 00000000000..0eb6e133c31
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/RepresentationPackageImpl.java
@@ -0,0 +1,484 @@
+/**
+ * Copyright (c) 2016 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:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.architecture.representation.impl;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+import org.eclipse.papyrus.infra.architecture.representation.ModelAutoCreate;
+import org.eclipse.papyrus.infra.architecture.representation.ModelRule;
+import org.eclipse.papyrus.infra.architecture.representation.OwningRule;
+import org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind;
+import org.eclipse.papyrus.infra.architecture.representation.RepresentationFactory;
+import org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage;
+import org.eclipse.papyrus.infra.architecture.representation.RootAutoSelect;
+import org.eclipse.papyrus.infra.architecture.representation.Rule;
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+
+import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class RepresentationPackageImpl extends EPackageImpl implements RepresentationPackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass papyrusRepresentationKindEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass ruleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass modelRuleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass owningRuleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass modelAutoCreateEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass rootAutoSelectEClass = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private RepresentationPackageImpl() {
+		super(eNS_URI, RepresentationFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>This method is used to initialize {@link RepresentationPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static RepresentationPackage init() {
+		if (isInited) return (RepresentationPackage)EPackage.Registry.INSTANCE.getEPackage(RepresentationPackage.eNS_URI);
+
+		// Obtain or create and register package
+		RepresentationPackageImpl theRepresentationPackage = (RepresentationPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof RepresentationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new RepresentationPackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		ArchitecturePackage.eINSTANCE.eClass();
+		ConstraintsPackage.eINSTANCE.eClass();
+
+		// Create package meta-data objects
+		theRepresentationPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theRepresentationPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theRepresentationPackage.freeze();
+
+  
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(RepresentationPackage.eNS_URI, theRepresentationPackage);
+		return theRepresentationPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getPapyrusRepresentationKind() {
+		return papyrusRepresentationKindEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getPapyrusRepresentationKind_Parent() {
+		return (EReference)papyrusRepresentationKindEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getPapyrusRepresentationKind_ModelRules() {
+		return (EReference)papyrusRepresentationKindEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getPapyrusRepresentationKind_OwningRules() {
+		return (EReference)papyrusRepresentationKindEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getPapyrusRepresentationKind_ImplementationID() {
+		return (EAttribute)papyrusRepresentationKindEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getRule() {
+		return ruleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getRule_Permit() {
+		return (EAttribute)ruleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getModelRule() {
+		return modelRuleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getModelRule_Element() {
+		return (EReference)modelRuleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getModelRule_Stereotypes() {
+		return (EReference)modelRuleEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getModelRule_Multiplicity() {
+		return (EAttribute)modelRuleEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getOwningRule() {
+		return owningRuleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getOwningRule_Element() {
+		return (EReference)owningRuleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getOwningRule_Stereotypes() {
+		return (EReference)owningRuleEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getOwningRule_Multiplicity() {
+		return (EAttribute)owningRuleEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getOwningRule_NewModelPath() {
+		return (EReference)owningRuleEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getOwningRule_SelectDiagramRoot() {
+		return (EReference)owningRuleEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getModelAutoCreate() {
+		return modelAutoCreateEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getModelAutoCreate_Feature() {
+		return (EReference)modelAutoCreateEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getModelAutoCreate_Origin() {
+		return (EReference)modelAutoCreateEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getModelAutoCreate_CreationType() {
+		return (EAttribute)modelAutoCreateEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getRootAutoSelect() {
+		return rootAutoSelectEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getRootAutoSelect_Feature() {
+		return (EReference)rootAutoSelectEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RepresentationFactory getRepresentationFactory() {
+		return (RepresentationFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		papyrusRepresentationKindEClass = createEClass(PAPYRUS_REPRESENTATION_KIND);
+		createEReference(papyrusRepresentationKindEClass, PAPYRUS_REPRESENTATION_KIND__PARENT);
+		createEReference(papyrusRepresentationKindEClass, PAPYRUS_REPRESENTATION_KIND__MODEL_RULES);
+		createEReference(papyrusRepresentationKindEClass, PAPYRUS_REPRESENTATION_KIND__OWNING_RULES);
+		createEAttribute(papyrusRepresentationKindEClass, PAPYRUS_REPRESENTATION_KIND__IMPLEMENTATION_ID);
+
+		ruleEClass = createEClass(RULE);
+		createEAttribute(ruleEClass, RULE__PERMIT);
+
+		modelRuleEClass = createEClass(MODEL_RULE);
+		createEReference(modelRuleEClass, MODEL_RULE__ELEMENT);
+		createEReference(modelRuleEClass, MODEL_RULE__STEREOTYPES);
+		createEAttribute(modelRuleEClass, MODEL_RULE__MULTIPLICITY);
+
+		owningRuleEClass = createEClass(OWNING_RULE);
+		createEReference(owningRuleEClass, OWNING_RULE__ELEMENT);
+		createEReference(owningRuleEClass, OWNING_RULE__STEREOTYPES);
+		createEAttribute(owningRuleEClass, OWNING_RULE__MULTIPLICITY);
+		createEReference(owningRuleEClass, OWNING_RULE__NEW_MODEL_PATH);
+		createEReference(owningRuleEClass, OWNING_RULE__SELECT_DIAGRAM_ROOT);
+
+		modelAutoCreateEClass = createEClass(MODEL_AUTO_CREATE);
+		createEReference(modelAutoCreateEClass, MODEL_AUTO_CREATE__FEATURE);
+		createEReference(modelAutoCreateEClass, MODEL_AUTO_CREATE__ORIGIN);
+		createEAttribute(modelAutoCreateEClass, MODEL_AUTO_CREATE__CREATION_TYPE);
+
+		rootAutoSelectEClass = createEClass(ROOT_AUTO_SELECT);
+		createEReference(rootAutoSelectEClass, ROOT_AUTO_SELECT__FEATURE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		ArchitecturePackage theArchitecturePackage = (ArchitecturePackage)EPackage.Registry.INSTANCE.getEPackage(ArchitecturePackage.eNS_URI);
+		ConstraintsPackage theConstraintsPackage = (ConstraintsPackage)EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		papyrusRepresentationKindEClass.getESuperTypes().add(theArchitecturePackage.getRepresentationKind());
+		modelRuleEClass.getESuperTypes().add(this.getRule());
+		modelRuleEClass.getESuperTypes().add(theConstraintsPackage.getDisplayUnit());
+		owningRuleEClass.getESuperTypes().add(this.getRule());
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(papyrusRepresentationKindEClass, PapyrusRepresentationKind.class, "PapyrusRepresentationKind", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getPapyrusRepresentationKind_Parent(), this.getPapyrusRepresentationKind(), null, "parent", null, 0, 1, PapyrusRepresentationKind.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getPapyrusRepresentationKind_ModelRules(), this.getModelRule(), null, "modelRules", null, 1, -1, PapyrusRepresentationKind.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getPapyrusRepresentationKind_OwningRules(), this.getOwningRule(), null, "owningRules", null, 1, -1, PapyrusRepresentationKind.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getPapyrusRepresentationKind_ImplementationID(), ecorePackage.getEString(), "implementationID", null, 1, 1, PapyrusRepresentationKind.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(ruleEClass, Rule.class, "Rule", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getRule_Permit(), ecorePackage.getEBoolean(), "permit", "true", 1, 1, Rule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(modelRuleEClass, ModelRule.class, "ModelRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getModelRule_Element(), ecorePackage.getEClass(), null, "element", null, 0, 1, ModelRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getModelRule_Stereotypes(), ecorePackage.getEClass(), null, "stereotypes", null, 0, -1, ModelRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getModelRule_Multiplicity(), ecorePackage.getEInt(), "multiplicity", "-1", 1, 1, ModelRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(owningRuleEClass, OwningRule.class, "OwningRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getOwningRule_Element(), ecorePackage.getEClass(), null, "element", null, 0, 1, OwningRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getOwningRule_Stereotypes(), ecorePackage.getEClass(), null, "stereotypes", null, 0, -1, OwningRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getOwningRule_Multiplicity(), ecorePackage.getEInt(), "multiplicity", "-1", 1, 1, OwningRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getOwningRule_NewModelPath(), this.getModelAutoCreate(), null, "newModelPath", null, 0, -1, OwningRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getOwningRule_SelectDiagramRoot(), this.getRootAutoSelect(), null, "selectDiagramRoot", null, 0, -1, OwningRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(modelAutoCreateEClass, ModelAutoCreate.class, "ModelAutoCreate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getModelAutoCreate_Feature(), ecorePackage.getEReference(), null, "feature", null, 1, 1, ModelAutoCreate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getModelAutoCreate_Origin(), ecorePackage.getEClass(), null, "origin", null, 1, 1, ModelAutoCreate.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+		initEAttribute(getModelAutoCreate_CreationType(), ecorePackage.getEString(), "creationType", null, 1, 1, ModelAutoCreate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(rootAutoSelectEClass, RootAutoSelect.class, "RootAutoSelect", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getRootAutoSelect_Feature(), ecorePackage.getEReference(), null, "feature", null, 1, 1, RootAutoSelect.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		// Create resource
+		createResource(eNS_URI);
+	}
+
+} //RepresentationPackageImpl
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/RootAutoSelectImpl.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/RootAutoSelectImpl.java
index fe60545e892..393bce8bafc 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/RootAutoSelectImpl.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/RootAutoSelectImpl.java
@@ -1,18 +1,17 @@
 /**
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
+ * Copyright (c) 2016 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:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
  */
-package org.eclipse.papyrus.infra.viewpoints.configuration.impl;
+package org.eclipse.papyrus.infra.architecture.representation.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -22,9 +21,8 @@ import org.eclipse.emf.ecore.InternalEObject;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.viewpoints.configuration.RootAutoSelect;
+import org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage;
+import org.eclipse.papyrus.infra.architecture.representation.RootAutoSelect;
 
 /**
  * <!-- begin-user-doc -->
@@ -34,7 +32,7 @@ import org.eclipse.papyrus.infra.viewpoints.configuration.RootAutoSelect;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.RootAutoSelectImpl#getFeature <em>Feature</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.architecture.representation.impl.RootAutoSelectImpl#getFeature <em>Feature</em>}</li>
  * </ul>
  *
  * @generated
@@ -66,7 +64,7 @@ public class RootAutoSelectImpl extends MinimalEObjectImpl.Container implements
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return ConfigurationPackage.Literals.ROOT_AUTO_SELECT;
+		return RepresentationPackage.Literals.ROOT_AUTO_SELECT;
 	}
 
 	/**
@@ -76,12 +74,11 @@ public class RootAutoSelectImpl extends MinimalEObjectImpl.Container implements
 	 */
 	public EReference getFeature() {
 		if (feature != null && feature.eIsProxy()) {
-			InternalEObject oldFeature = (InternalEObject) feature;
-			feature = (EReference) eResolveProxy(oldFeature);
+			InternalEObject oldFeature = (InternalEObject)feature;
+			feature = (EReference)eResolveProxy(oldFeature);
 			if (feature != oldFeature) {
-				if (eNotificationRequired()) {
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ConfigurationPackage.ROOT_AUTO_SELECT__FEATURE, oldFeature, feature));
-				}
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RepresentationPackage.ROOT_AUTO_SELECT__FEATURE, oldFeature, feature));
 			}
 		}
 		return feature;
@@ -104,9 +101,8 @@ public class RootAutoSelectImpl extends MinimalEObjectImpl.Container implements
 	public void setFeature(EReference newFeature) {
 		EReference oldFeature = feature;
 		feature = newFeature;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ConfigurationPackage.ROOT_AUTO_SELECT__FEATURE, oldFeature, feature));
-		}
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, RepresentationPackage.ROOT_AUTO_SELECT__FEATURE, oldFeature, feature));
 	}
 
 	/**
@@ -117,11 +113,9 @@ public class RootAutoSelectImpl extends MinimalEObjectImpl.Container implements
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case ConfigurationPackage.ROOT_AUTO_SELECT__FEATURE:
-			if (resolve) {
-				return getFeature();
-			}
-			return basicGetFeature();
+			case RepresentationPackage.ROOT_AUTO_SELECT__FEATURE:
+				if (resolve) return getFeature();
+				return basicGetFeature();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -134,9 +128,9 @@ public class RootAutoSelectImpl extends MinimalEObjectImpl.Container implements
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case ConfigurationPackage.ROOT_AUTO_SELECT__FEATURE:
-			setFeature((EReference) newValue);
-			return;
+			case RepresentationPackage.ROOT_AUTO_SELECT__FEATURE:
+				setFeature((EReference)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -149,9 +143,9 @@ public class RootAutoSelectImpl extends MinimalEObjectImpl.Container implements
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case ConfigurationPackage.ROOT_AUTO_SELECT__FEATURE:
-			setFeature((EReference) null);
-			return;
+			case RepresentationPackage.ROOT_AUTO_SELECT__FEATURE:
+				setFeature((EReference)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -164,8 +158,8 @@ public class RootAutoSelectImpl extends MinimalEObjectImpl.Container implements
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case ConfigurationPackage.ROOT_AUTO_SELECT__FEATURE:
-			return feature != null;
+			case RepresentationPackage.ROOT_AUTO_SELECT__FEATURE:
+				return feature != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/RuleImpl.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/RuleImpl.java
index a7585246d10..ebb2594255b 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/RuleImpl.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/impl/RuleImpl.java
@@ -1,18 +1,17 @@
 /**
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
+ * Copyright (c) 2016 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:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
  */
-package org.eclipse.papyrus.infra.viewpoints.configuration.impl;
+package org.eclipse.papyrus.infra.architecture.representation.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -20,9 +19,8 @@ import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.viewpoints.configuration.Rule;
+import org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage;
+import org.eclipse.papyrus.infra.architecture.representation.Rule;
 
 /**
  * <!-- begin-user-doc -->
@@ -32,7 +30,7 @@ import org.eclipse.papyrus.infra.viewpoints.configuration.Rule;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.RuleImpl#isPermit <em>Permit</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.architecture.representation.impl.RuleImpl#isPermit <em>Permit</em>}</li>
  * </ul>
  *
  * @generated
@@ -74,7 +72,7 @@ public abstract class RuleImpl extends MinimalEObjectImpl.Container implements R
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return ConfigurationPackage.Literals.RULE;
+		return RepresentationPackage.Literals.RULE;
 	}
 
 	/**
@@ -94,9 +92,8 @@ public abstract class RuleImpl extends MinimalEObjectImpl.Container implements R
 	public void setPermit(boolean newPermit) {
 		boolean oldPermit = permit;
 		permit = newPermit;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ConfigurationPackage.RULE__PERMIT, oldPermit, permit));
-		}
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, RepresentationPackage.RULE__PERMIT, oldPermit, permit));
 	}
 
 	/**
@@ -107,8 +104,8 @@ public abstract class RuleImpl extends MinimalEObjectImpl.Container implements R
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case ConfigurationPackage.RULE__PERMIT:
-			return isPermit();
+			case RepresentationPackage.RULE__PERMIT:
+				return isPermit();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -121,9 +118,9 @@ public abstract class RuleImpl extends MinimalEObjectImpl.Container implements R
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case ConfigurationPackage.RULE__PERMIT:
-			setPermit((Boolean) newValue);
-			return;
+			case RepresentationPackage.RULE__PERMIT:
+				setPermit((Boolean)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -136,9 +133,9 @@ public abstract class RuleImpl extends MinimalEObjectImpl.Container implements R
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case ConfigurationPackage.RULE__PERMIT:
-			setPermit(PERMIT_EDEFAULT);
-			return;
+			case RepresentationPackage.RULE__PERMIT:
+				setPermit(PERMIT_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -151,8 +148,8 @@ public abstract class RuleImpl extends MinimalEObjectImpl.Container implements R
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case ConfigurationPackage.RULE__PERMIT:
-			return permit != PERMIT_EDEFAULT;
+			case RepresentationPackage.RULE__PERMIT:
+				return permit != PERMIT_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -164,9 +161,7 @@ public abstract class RuleImpl extends MinimalEObjectImpl.Container implements R
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
-			return super.toString();
-		}
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (permit: ");
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/util/RepresentationAdapterFactory.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/util/RepresentationAdapterFactory.java
new file mode 100644
index 00000000000..5c6de95af9b
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/util/RepresentationAdapterFactory.java
@@ -0,0 +1,278 @@
+/**
+ * Copyright (c) 2016 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:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.architecture.representation.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.architecture.representation.*;
+import org.eclipse.papyrus.infra.constraints.DisplayUnit;
+
+import org.eclipse.papyrus.infra.core.architecture.ADElement;
+import org.eclipse.papyrus.infra.core.architecture.RepresentationKind;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage
+ * @generated
+ */
+public class RepresentationAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static RepresentationPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RepresentationAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = RepresentationPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected RepresentationSwitch<Adapter> modelSwitch =
+		new RepresentationSwitch<Adapter>() {
+			@Override
+			public Adapter casePapyrusRepresentationKind(PapyrusRepresentationKind object) {
+				return createPapyrusRepresentationKindAdapter();
+			}
+			@Override
+			public Adapter caseRule(Rule object) {
+				return createRuleAdapter();
+			}
+			@Override
+			public Adapter caseModelRule(ModelRule object) {
+				return createModelRuleAdapter();
+			}
+			@Override
+			public Adapter caseOwningRule(OwningRule object) {
+				return createOwningRuleAdapter();
+			}
+			@Override
+			public Adapter caseModelAutoCreate(ModelAutoCreate object) {
+				return createModelAutoCreateAdapter();
+			}
+			@Override
+			public Adapter caseRootAutoSelect(RootAutoSelect object) {
+				return createRootAutoSelectAdapter();
+			}
+			@Override
+			public Adapter caseADElement(ADElement object) {
+				return createADElementAdapter();
+			}
+			@Override
+			public Adapter caseRepresentationKind(RepresentationKind object) {
+				return createRepresentationKindAdapter();
+			}
+			@Override
+			public Adapter caseDisplayUnit(DisplayUnit object) {
+				return createDisplayUnitAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind <em>Papyrus Representation Kind</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind
+	 * @generated
+	 */
+	public Adapter createPapyrusRepresentationKindAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.architecture.representation.Rule <em>Rule</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.architecture.representation.Rule
+	 * @generated
+	 */
+	public Adapter createRuleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.architecture.representation.ModelRule <em>Model Rule</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.architecture.representation.ModelRule
+	 * @generated
+	 */
+	public Adapter createModelRuleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.architecture.representation.OwningRule <em>Owning Rule</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.architecture.representation.OwningRule
+	 * @generated
+	 */
+	public Adapter createOwningRuleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.architecture.representation.ModelAutoCreate <em>Model Auto Create</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.architecture.representation.ModelAutoCreate
+	 * @generated
+	 */
+	public Adapter createModelAutoCreateAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.architecture.representation.RootAutoSelect <em>Root Auto Select</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.architecture.representation.RootAutoSelect
+	 * @generated
+	 */
+	public Adapter createRootAutoSelectAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.core.architecture.ADElement <em>AD Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ADElement
+	 * @generated
+	 */
+	public Adapter createADElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.core.architecture.RepresentationKind <em>Representation Kind</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.core.architecture.RepresentationKind
+	 * @generated
+	 */
+	public Adapter createRepresentationKindAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.constraints.DisplayUnit <em>Display Unit</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.constraints.DisplayUnit
+	 * @generated
+	 */
+	public Adapter createDisplayUnitAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+
+} //RepresentationAdapterFactory
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/util/RepresentationSwitch.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/util/RepresentationSwitch.java
new file mode 100644
index 00000000000..8b02aab277f
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/util/RepresentationSwitch.java
@@ -0,0 +1,279 @@
+/**
+ * Copyright (c) 2016 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:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.architecture.representation.util;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.infra.architecture.representation.*;
+import org.eclipse.papyrus.infra.constraints.DisplayUnit;
+
+import org.eclipse.papyrus.infra.core.architecture.ADElement;
+import org.eclipse.papyrus.infra.core.architecture.RepresentationKind;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage
+ * @generated
+ */
+public class RepresentationSwitch<T> extends Switch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static RepresentationPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RepresentationSwitch() {
+		if (modelPackage == null) {
+			modelPackage = RepresentationPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case RepresentationPackage.PAPYRUS_REPRESENTATION_KIND: {
+				PapyrusRepresentationKind papyrusRepresentationKind = (PapyrusRepresentationKind)theEObject;
+				T result = casePapyrusRepresentationKind(papyrusRepresentationKind);
+				if (result == null) result = caseRepresentationKind(papyrusRepresentationKind);
+				if (result == null) result = caseADElement(papyrusRepresentationKind);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case RepresentationPackage.RULE: {
+				Rule rule = (Rule)theEObject;
+				T result = caseRule(rule);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case RepresentationPackage.MODEL_RULE: {
+				ModelRule modelRule = (ModelRule)theEObject;
+				T result = caseModelRule(modelRule);
+				if (result == null) result = caseRule(modelRule);
+				if (result == null) result = caseDisplayUnit(modelRule);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case RepresentationPackage.OWNING_RULE: {
+				OwningRule owningRule = (OwningRule)theEObject;
+				T result = caseOwningRule(owningRule);
+				if (result == null) result = caseRule(owningRule);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case RepresentationPackage.MODEL_AUTO_CREATE: {
+				ModelAutoCreate modelAutoCreate = (ModelAutoCreate)theEObject;
+				T result = caseModelAutoCreate(modelAutoCreate);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case RepresentationPackage.ROOT_AUTO_SELECT: {
+				RootAutoSelect rootAutoSelect = (RootAutoSelect)theEObject;
+				T result = caseRootAutoSelect(rootAutoSelect);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Papyrus Representation Kind</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>Papyrus Representation Kind</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T casePapyrusRepresentationKind(PapyrusRepresentationKind object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Rule</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>Rule</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseRule(Rule object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Model Rule</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>Model Rule</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseModelRule(ModelRule object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Owning Rule</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>Owning Rule</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseOwningRule(OwningRule object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Model Auto Create</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>Model Auto Create</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseModelAutoCreate(ModelAutoCreate object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Root Auto Select</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>Root Auto Select</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseRootAutoSelect(RootAutoSelect object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>AD Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>AD Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseADElement(ADElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Representation Kind</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>Representation Kind</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseRepresentationKind(RepresentationKind object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Display Unit</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>Display Unit</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDisplayUnit(DisplayUnit object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+
+} //RepresentationSwitch
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/impl/ModelAutoCreateCustomImpl.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src/org/eclipse/papyrus/infra/architecture/representation/impl/ModelAutoCreateCustomImpl.java
index 6e1c04778ed..f2c043ace13 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/impl/ModelAutoCreateCustomImpl.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src/org/eclipse/papyrus/infra/architecture/representation/impl/ModelAutoCreateCustomImpl.java
@@ -10,19 +10,20 @@
  *  Benoit Maggi benoit.maggi@cea.fr - Initial API and implementation
  *
  */
-package org.eclipse.papyrus.infra.viewpoints.configuration.impl;
+package org.eclipse.papyrus.infra.architecture.representation.impl;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ModelAutoCreate;
-import org.eclipse.papyrus.infra.viewpoints.configuration.OwningRule;
+import org.eclipse.papyrus.infra.architecture.representation.ModelAutoCreate;
+import org.eclipse.papyrus.infra.architecture.representation.OwningRule;
+import org.eclipse.papyrus.infra.architecture.representation.impl.ModelAutoCreateImpl;
 
 
 public class ModelAutoCreateCustomImpl extends ModelAutoCreateImpl implements ModelAutoCreate {
 	
 	
 	/**
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ModelAutoCreateImpl#basicGetOrigin()
+	 * @see org.eclipse.papyrus.infra.architecture.representation.impl.ModelAutoCreateImpl#basicGetOrigin()
 	 *
 	 * @return
 	 */
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src/org/eclipse/papyrus/infra/architecture/representation/impl/RepresentationFactoryCustomImpl.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src/org/eclipse/papyrus/infra/architecture/representation/impl/RepresentationFactoryCustomImpl.java
new file mode 100644
index 00000000000..cdfcbe7b66f
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src/org/eclipse/papyrus/infra/architecture/representation/impl/RepresentationFactoryCustomImpl.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright (c) 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *  Benoit Maggi benoit.maggi@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 463156
+ *
+ */
+package org.eclipse.papyrus.infra.architecture.representation.impl;
+
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.infra.architecture.representation.ModelAutoCreate;
+import org.eclipse.papyrus.infra.architecture.representation.RepresentationFactory;
+import org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage;
+import org.eclipse.papyrus.infra.architecture.representation.impl.ModelAutoCreateImpl;
+import org.eclipse.papyrus.infra.architecture.representation.impl.RepresentationFactoryImpl;
+
+
+public class RepresentationFactoryCustomImpl extends RepresentationFactoryImpl implements RepresentationFactory {
+
+	public static RepresentationFactory init() {
+		try {
+			RepresentationFactory theRepresentationFactory = (RepresentationFactory) EPackage.Registry.INSTANCE.getEFactory(RepresentationPackage.eNS_URI);
+			if (theRepresentationFactory != null) {
+				return theRepresentationFactory;
+			}
+		} catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new RepresentationFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public RepresentationFactoryCustomImpl() {
+		super();
+	}
+
+	@Override
+	public ModelAutoCreate createModelAutoCreate() {
+		ModelAutoCreateImpl modelAutoCreate = new ModelAutoCreateCustomImpl();
+		return modelAutoCreate;
+	}
+
+}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/.classpath b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/.classpath
index 2d1a4302f04..eca7bdba8f0 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/.classpath
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/.classpath
@@ -1,7 +1,7 @@
-<?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/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/.project b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/.project
new file mode 100644
index 00000000000..b84c4044c74
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.architecture</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/infra/architecture/org.eclipse.papyrus.infra.architecture/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..0c68a61dca8
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/META-INF/MANIFEST.MF b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..ca78652d551
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/META-INF/MANIFEST.MF
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.infra.architecture;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.papyrus.infra.architecture,
+ org.eclipse.papyrus.infra.architecture.commands,
+ org.eclipse.papyrus.infra.architecture.listeners,
+ org.eclipse.papyrus.infra.core.architecture.merged
+Require-Bundle: org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.services.edit;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[2.3.0,3.0.0)"
+Bundle-ActivationPolicy: lazy
+Bundle-Vendor: %providerName
diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/about.html b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/about.html
index dd02e0be168..bbf2bd6aac7 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/about.html
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/about.html
@@ -1,28 +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>December 2, 2009</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>

+<!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>January 30, 2017</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/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/build.properties b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/build.properties
index 30e2cedf44d..0d413bddebd 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/build.properties
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/build.properties
@@ -1,8 +1,7 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               plugin.properties,\

-               about.html

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.properties,\
+               plugin.xml
+               
\ No newline at end of file
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/plugin.properties b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/plugin.properties
new file mode 100644
index 00000000000..f8028c40563
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/plugin.properties
@@ -0,0 +1,14 @@
+# Copyright (c) 2017 CEA LIST.
+# 
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#  
+#  Contributors:
+#  Maged Elaasar - Initial API and implementation
+#  
+# 
+
+pluginName = Architecture Services
+providerName=Eclipse Modeling Project
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/plugin.xml b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/plugin.xml
new file mode 100644
index 00000000000..daedd8ffb97
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/plugin.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+ Copyright (c) 2016 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:
+  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+  
+ 
+-->
+
+<plugin>
+   <extension-point id="models" name="Architecture Models" schema="schema/models.exsd"/>
+   <extension-point id="commandProviders" name="Architecture Command Providers" schema="schema/commands.exsd"/>
+   <extension-point id="listeners" name="Architecture Listneers" schema="schema/listeners.exsd"/>
+
+   <extension
+         point="org.eclipse.papyrus.infra.core.model">
+      <modelSetSnippet
+            classname="org.eclipse.papyrus.infra.architecture.listeners.ArchitectureDescriptionSnippet"
+            description="Adapter attached to the ModelSet to listen to architecture changes">
+      </modelSetSnippet>
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/pom.xml b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/pom.xml
index 2e0babfae30..50ab4a4ee64 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/pom.xml
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/pom.xml
@@ -3,11 +3,11 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.infra-viewpoints</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
+		<artifactId>org.eclipse.papyrus.infra-architecture</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<artifactId>org.eclipse.papyrus.infra.viewpoints.iso42010</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
+	<artifactId>org.eclipse.papyrus.infra.architecture</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/schema/commands.exsd b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/schema/commands.exsd
new file mode 100644
index 00000000000..964f9881d5f
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/schema/commands.exsd
@@ -0,0 +1,107 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.architecture" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.architecture" id="commands" name="Architecture Command Providers"/>
+      </appInfo>
+      <documentation>
+         Definition of architecture command providers
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="commandProvider" minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute translatable="true"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="commandProvider">
+      <annotation>
+         <documentation>
+            contributes an architecture command provider
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  A fully qualified name of a class implementing the org.eclipse.papyrus.infra.architecture.commands.ICommandProvider interface.
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.architecture.commands.ICommandProvider"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiinfo"/>
+      </appInfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+
+</schema>
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/schema/listeners.exsd b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/schema/listeners.exsd
new file mode 100644
index 00000000000..2448123718b
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/schema/listeners.exsd
@@ -0,0 +1,107 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.architecture" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.architecture" id="listeners" name="Architecture Listeners"/>
+      </appInfo>
+      <documentation>
+         Definition of architecture listeners
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="listener" minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute translatable="true"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="listener">
+      <annotation>
+         <documentation>
+            contributes an architecture listener
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  A fully qualified name of a class implementing the org.eclipse.papyrus.infra.architecture.listeners.IArchitectureDescriptionListener interface.
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.architecture.listeners.IArchitectureDescriptionListener"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiinfo"/>
+      </appInfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+
+</schema>
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/schema/models.exsd b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/schema/models.exsd
new file mode 100644
index 00000000000..01d94c00902
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/schema/models.exsd
@@ -0,0 +1,109 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.architecture" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.architecture" id="models" name="Architecture Models"/>
+      </appInfo>
+      <documentation>
+         Definition of an architecture domain.
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="model" minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute translatable="true"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="model">
+      <annotation>
+         <documentation>
+            contributes an architecture model
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="path" type="string" use="required">
+            <annotation>
+               <documentation>
+                  Path to an architecture model file in the bundle. 
+
+Note: Do not forget to add the file in the binary build of the plugin!
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="resource"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiinfo"/>
+      </appInfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+
+</schema>
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/Activator.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/Activator.java
new file mode 100644
index 00000000000..4b6d2d237f5
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/Activator.java
@@ -0,0 +1,62 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.architecture;
+
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends Plugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.architecture"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	/** Logging helper */
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+	}
+
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		log = null;
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+}
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/ArchitectureDescriptionUtils.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/ArchitectureDescriptionUtils.java
new file mode 100644
index 00000000000..18c9e69463c
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/ArchitectureDescriptionUtils.java
@@ -0,0 +1,333 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.architecture;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CompoundCommand;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.papyrus.infra.architecture.commands.IModelConversionCommand;
+import org.eclipse.papyrus.infra.architecture.commands.IModelCreationCommand;
+import org.eclipse.papyrus.infra.architecture.commands.ModelCommandProviderRegistry;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescription;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionPreferences;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureFactory;
+import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureContext;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureViewpoint;
+import org.eclipse.papyrus.infra.core.resource.IModel;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;
+
+/**
+ * An API for manipulating architecture descriptions in a model set
+ *
+ * @since 1.0
+ */
+public class ArchitectureDescriptionUtils {
+
+	/**
+	 * The model set in context
+	 */
+	private ModelSet modelSet;
+	
+	/**
+	 * The architecture domain manager
+	 */
+	private ArchitectureDomainManager manager = ArchitectureDomainManager.getInstance();
+	
+	/**
+	 * Constructs an instance of this class given a model set
+	 *
+	 * @param modelSet The given model set
+	 */
+	public ArchitectureDescriptionUtils(ModelSet modelSet) {
+		this.modelSet = modelSet;
+	}
+	
+	/**
+	 * Gets the model set in context
+	 * 
+	 * @return a model set
+	 */
+	public ModelSet getModelSet() {
+		return modelSet;
+	}
+	
+	/**
+	 * Gets the architecture context set in the model set
+	 * 
+	 * @return architecture context
+	 */
+	public MergedArchitectureContext getArchitectureContext() {
+		String contextId = getArchitectureContextId();
+		return manager.getArchitectureContextById(contextId);
+	}
+
+	/**
+	 * Gets the architecture context id set in the model set
+	 * 
+	 * @return architecture context id
+	 */
+	public String getArchitectureContextId() {
+		ArchitectureDescription description = getArchitectureDescription();
+		if (description != null) 
+			return description.getContextId();
+		return ArchitectureDomainManager.getInstance().getDefaultArchitectureContextId();
+	}
+
+	/**
+	 * Gets the architecture viewpoints set in the model set
+	 * 
+	 * @return a collection of architecture viewpoints
+	 */
+	public Collection<MergedArchitectureViewpoint> getArchitectureViewpoints() {
+		List<MergedArchitectureViewpoint> viewpoints = new ArrayList<MergedArchitectureViewpoint>();
+		for (String viewpointId : getArchitectureViewpointIds()) {
+			MergedArchitectureViewpoint viewpoint = manager.getArchitectureViewpointById(viewpointId);
+			if (viewpoint != null)
+				viewpoints.add(viewpoint);
+		}
+		return viewpoints;
+	}
+
+	/**
+	 * Gets the architecture viewpoint ids set in the model set
+	 * 
+	 * @return a collection of architecture viewpoin ids
+	 */
+	public Collection<String> getArchitectureViewpointIds() {
+		ArchitectureDescriptionPreferences preferences = getArchitectureDescriptionPreferences();
+		if (preferences != null) 
+			return preferences.getViewpointIds();
+		MergedArchitectureContext context = ArchitectureDomainManager.getInstance().getDefaultArchitectureContext();
+		List<String> viewpointIds = new ArrayList<String>();
+		for (MergedArchitectureViewpoint viewpoint : context.getViewpoints()) {
+			viewpointIds.add(viewpoint.getId());
+		}
+		return viewpointIds;
+	}
+
+	/**
+	 * Returns a command that applies the given contextId and viewpoint ids to the model set
+	 * and creates a new model in the set based on them
+	 * 
+	 * Model creation is based on the creation command configured with the architecture context
+	 * and contribution commands registered in extensions
+	 * 
+	 * @param contextId the context id to apply to the model set
+	 * @param viewpointIds the viewpoint ids to apply to the model set
+	 * @return a command to create a new model
+	 */
+	public Command createNewModel(final String contextId, final String[] viewpointIds) {
+		CompoundCommand cc = new CompoundCommand("Create New Model");
+		// Add the main command to create the model
+		cc.append(getModelCreationCommand(contextId));
+		// Add commands from registered providers to create the model
+		cc.append(ModelCommandProviderRegistry.getInstance().getModelCreationCommand(modelSet, contextId));
+		// Add a command to set the new context id to the model set
+		cc.append(getSetContextCommand(contextId));
+		// Add a command to set the new viewpoint ids to the model set
+		cc.append(getSetViewpointCommand(viewpointIds));
+		return cc;
+	}
+
+	/**
+	 * Returns a command that switches the contextId of the model set to the given id and
+	 * converts the semantic model as a result
+	 * 
+	 * Model conversion is based on the conversion command configured with the architecture context
+	 * and contribution commands registered in extensions
+	 * 
+	 * @param contextId the context id to apply to the model set
+	 * @return a command that switches the model set to the given context id
+	 */
+	public Command switchArchitectureContextId(final String contextId) {
+		CompoundCommand cc = new CompoundCommand("Switch Architecture Context");
+		// Add the main command to convert the model
+		cc.append(getModelConversionCommand(contextId));
+		// Add commands from registered providers to convert the model
+		cc.append(ModelCommandProviderRegistry.getInstance().getModelConversionCommand(modelSet, contextId));
+		// Add a command to set the new context id
+		cc.append(getSetContextCommand(contextId));
+		return cc;
+	}
+
+	/**
+	 * Returns a command that switches the viewpoints of the model set to the given id
+	 * 
+	 * @param viewpointIds the new viewpoint ids to apply to the model set
+	 * @return a command that switches the model set to the given viewpoint ids
+	 */
+	public Command switchArchitectureViewpointIds(final String[] viewpointIds) {
+		CompoundCommand cc = new CompoundCommand("Switch Architecture Viewpoints");
+		// Add a command to convert the model
+		cc.append(getSetViewpointCommand(viewpointIds));
+		return cc;
+	}
+
+	/**
+	 * Returns a command to set the context id in the model set
+	 * 
+	 * @param contextId the new context id
+	 * @return a command that sets the context id in the model set
+	 */
+	protected Command getSetContextCommand(String contextId) {
+		return new RecordingCommand(modelSet.getTransactionalEditingDomain()) {
+			@Override
+			protected void doExecute() {
+				ArchitectureDescription description = getArchitectureDescription();
+				if (description == null) {
+					description = ArchitectureFactory.eINSTANCE.createArchitectureDescription();
+					addArchitectureDescription(description);
+				}
+				description.setContextId(contextId);
+			}
+		};
+	}
+
+	/**
+	 * Returns a command to create a new model in the model set based on the given context id
+	 * 
+	 * @param contextId the context id
+	 * @return a command that creates a new model
+	 */
+	protected Command getModelCreationCommand(String contextId) {
+		final MergedArchitectureContext context = manager.getArchitectureContextById(contextId);
+		if (context.getCreationCommandClass() == null)
+			return null;
+		return new RecordingCommand(modelSet.getTransactionalEditingDomain()) {
+			@Override
+			protected void doExecute() {
+				try {
+					IModelCreationCommand creationCommand = (IModelCreationCommand) context.getCreationCommandClass().newInstance();
+					creationCommand.createModel(modelSet);
+				} catch (Exception e) {
+					Activator.log.error(e);
+				}
+			}
+		};
+	}
+	
+	/**
+	 * Returns a command to converts a new model in the model set based on the given new context id
+	 * 
+	 * @param contextId the new context id
+	 * @return a command that converts a model
+	 */
+	protected Command getModelConversionCommand(String contextId) {
+		MergedArchitectureContext context = manager.getArchitectureContextById(contextId);
+		if (context.getConversionCommandClass() == null)
+			return null;
+		return new RecordingCommand(modelSet.getTransactionalEditingDomain()) {
+			@Override
+			protected void doExecute() {
+				try {
+					IModelConversionCommand conversionCommand = (IModelConversionCommand) context.getConversionCommandClass().newInstance();
+					conversionCommand.convertModel(modelSet);
+				} catch (Exception e) {
+					Activator.log.error(e);
+				}
+			}
+		};
+	}
+
+	/**
+	 * Returns a command that sets the given viewpoint ids to the model set
+	 * 
+	 * @param viewpointIds The new viewpoint ids
+	 * @return a command to set the viewpoint ids
+	 */
+	protected Command getSetViewpointCommand(String[] viewpointIds) {
+		return new RecordingCommand(modelSet.getTransactionalEditingDomain()) {
+			@Override
+			protected void doExecute() {
+				ArchitectureDescriptionPreferences preferences = getArchitectureDescriptionPreferences();
+				if (preferences == null) {
+					preferences = ArchitectureFactory.eINSTANCE.createArchitectureDescriptionPreferences();
+					addArchitectureDescriptionPreferences(preferences);
+				}
+				Arrays.sort(viewpointIds);
+				preferences.eSet(ArchitecturePackage.eINSTANCE.getArchitectureDescriptionPreferences_ViewpointIds(), Arrays.asList(viewpointIds));
+			}
+		};
+	}
+
+	/**
+	 * Gets the architecture description element in the model set
+	 * 
+	 * @return the architecture description element
+	 */
+	protected ArchitectureDescription getArchitectureDescription() {
+		ArchitectureDescription description = null;
+		for (EObject root : getDiResource().getContents()) {
+			if (root instanceof ArchitectureDescription) {
+				description = (ArchitectureDescription) root;
+				break;
+			}
+		}
+		return description;
+	}
+
+	/**
+	 * Adds the given architecture description element to the resource set
+	 * 
+	 * @param description an architecture description element
+	 */
+	protected void addArchitectureDescription(ArchitectureDescription description) {
+		getDiResource().getContents().add(description);
+	}
+
+	/**
+	 * Gets the architecture description preferences element in the model set
+	 * 
+	 * @return the architecture description preferences element
+	 */
+	protected ArchitectureDescriptionPreferences getArchitectureDescriptionPreferences() {
+		ArchitectureDescriptionPreferences preferences = null;
+		for (EObject root : getDiResource().getContents()) {
+			if (root instanceof ArchitectureDescriptionPreferences) {
+				preferences = (ArchitectureDescriptionPreferences) root;
+				break;
+			}
+		}
+		return preferences;
+	}
+
+	/**
+	 * Adds the given architecture description preferences element to the resource set
+	 * 
+	 * @param description an architecture description preferences element
+	 */
+	protected void addArchitectureDescriptionPreferences(ArchitectureDescriptionPreferences preferences) {
+		getDiResource().getContents().add(preferences);
+	}
+
+	/**
+	 * Gets the DI resource from the model set
+	 * 
+	 * @return the DI resource
+	 */
+	protected Resource getDiResource() {
+		IModel model = modelSet.getModel(DiModel.DI_MODEL_ID);
+		return ((DiModel)model).getResource();
+	}
+	
+}
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/ArchitectureDomainManager.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/ArchitectureDomainManager.java
new file mode 100644
index 00000000000..152e35b9baf
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/ArchitectureDomainManager.java
@@ -0,0 +1,233 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.architecture;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureContext;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureDomain;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureViewpoint;
+
+/**
+ * The main API for reading architecture domains information
+ * 
+ * It reads architecture domain models registered in extensions and preferences
+ * 
+ * @since 1.0
+ */
+public class ArchitectureDomainManager implements IPreferenceChangeListener {
+
+	/**
+	 * The extension point for architecture models
+	 */
+	private static final String EXTENSION_POINT = Activator.PLUGIN_ID + ".models";
+
+	/**
+	 * The name pf the path attribute
+	 */
+	private static final String PATH = "path"; //$NON-NLS-1$
+	
+	/**
+	 * The singleton instance of this class
+	 */
+	private static ArchitectureDomainManager INSTANCE;
+	
+	/**
+	 * Gets the singleton instance of this class
+	 * 
+	 * @return the singleton instance of this class
+	 */
+	public static ArchitectureDomainManager getInstance() {
+		if (INSTANCE == null)
+			INSTANCE = new ArchitectureDomainManager();
+		return INSTANCE;
+	}
+	
+	/**
+	 * An interface for listening to changes to architectural domains 
+	 */
+	public static interface Listener {
+		public void domainManagerChanged();
+	}
+	
+	/**
+	 * The architecture domain preferences
+	 */
+	private ArchitectureDomainPreferences preferences;
+
+	/**
+	 * The architecture domain merger
+	 */
+	private ArchitectureDomainMerger merger;
+	
+	/**
+	 * A collection of listeners to architecture domain changes
+	 */
+	private Collection<Listener> listeners;
+
+	/**
+	 * Constructs a new instance of this class
+	 */
+	private ArchitectureDomainManager() {
+		listeners = new HashSet<Listener>();
+		merger = new ArchitectureDomainMerger();
+		preferences = new ArchitectureDomainPreferences();
+		preferences.addListener(this);
+		initializeFromExtensions();
+		initializeFromPreferences();
+		merger.init(); // init as early as possible
+	}
+
+	/**
+	 * initialize the architecture domain merger from the registered extensions
+	 */
+	private void initializeFromExtensions() {
+		List<URI> models = new ArrayList<URI>();
+		IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_POINT);
+		for (IConfigurationElement element : elements) {
+			String path = element.getAttribute(PATH);
+			String bundleId = element.getContributor().getName();
+			String modelPath = bundleId + IPath.SEPARATOR + path;
+			models.add(URI.createPlatformPluginURI(modelPath, true));
+		}
+		merger.setExtensionModels(models);
+	}
+
+	/**
+	 * initialize the architecture domain merger from the preferences
+	 */
+	private void initializeFromPreferences() {
+		preferences.read();
+		List<URI> models = new ArrayList<URI>();
+		for (String value : preferences.getAddedModelURIs()) {
+			if (value.length()>0) {
+				models.add(URI.createURI(value, true));
+			}
+		}
+		merger.setPreferenceModels(models);
+	}
+
+	/**
+	 * Add the given listener to the domain changes
+	 * 
+	 * @param listener a given domain change listener
+	 */
+	public void addListener(Listener listener) {
+		listeners.add(listener);
+	}
+
+	/**
+	 * Remove the given listener to the domain changes
+	 * 
+	 * @param listener a given domain change listener
+	 */
+	public void removeListener(Listener listener) {
+		listeners.remove(listener);
+	}
+
+	/**
+	 * React to the preferences changing by reinitializing from them; notify listeners
+	 * @see org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener#preferenceChange(org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent)
+	 * 
+	 * @param event a preference change event
+	 */
+	@Override
+	public void preferenceChange(PreferenceChangeEvent event) {
+		initializeFromPreferences();
+		for (Listener listener : listeners)
+			listener.domainManagerChanged();
+	}
+	
+	/**
+	 * Gets the architecture domain preferences
+	 * 
+	 * @return the architecture domain preferences
+	 */
+	public ArchitectureDomainPreferences getPreferences() {
+		return preferences;
+	}
+
+	/**
+	 * Get the architecture domain merger
+	 * 
+	 * @return the architecture domain merger
+	 */
+	public ArchitectureDomainMerger getMerger() {
+		return merger;
+	}
+
+	/**
+	 * Gets the collection of architecture contexts that are visible based on preferences
+	 * 
+	 * @return a list of architecture contexts
+	 */
+	public Collection<MergedArchitectureContext> getVisibleArchitectureContexts() {
+		Collection<MergedArchitectureContext> contexts = new ArrayList<MergedArchitectureContext>();
+		for (MergedArchitectureDomain domain : merger.getDomains()) {
+			for (MergedArchitectureContext context : domain.getContexts()) {
+				if (!preferences.getExcludedContextIds().contains(context.getId()))
+					contexts.add(context);
+			}
+		}
+		return contexts;
+	}
+	
+	/**
+	 * Gets the id of the default architecture context
+	 * 
+	 * @return the default architecture context id
+	 */
+	public String getDefaultArchitectureContextId() {
+		return preferences.getDefaultContextId();
+	}
+	
+	/**
+	 * Gets the default architecture context
+	 * 
+	 * @return the default architecture context
+	 */
+	public MergedArchitectureContext getDefaultArchitectureContext() {
+		return getArchitectureContextById(getDefaultArchitectureContextId());
+	}
+
+	/**
+	 * Gets an architecture context by the given id
+	 *  
+	 * @param id a given id of an architecture context
+	 * @return the architecture context with the given id
+	 */
+	public MergedArchitectureContext getArchitectureContextById(String id) {
+		return merger.getArchitectureContextById(id);
+	}
+
+	/**
+	 * Gets an architecture viewpoint by the given id
+	 * 
+	 * @param id a given id of an architecture viewpoint
+	 * @return the architecture viewpoint with the given id
+	 */
+	public MergedArchitectureViewpoint getArchitectureViewpointById(String id) {
+		return merger.getArchitectureViewpointById(id);
+	}
+
+}
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/ArchitectureDomainMerger.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/ArchitectureDomainMerger.java
new file mode 100644
index 00000000000..62d2c0f94cd
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/ArchitectureDomainMerger.java
@@ -0,0 +1,237 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.architecture;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.emf.common.util.URI;
+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.papyrus.infra.core.architecture.ArchitectureDomain;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedADElement;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureContext;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureDomain;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureViewpoint;
+
+/**
+ * A merger for architecture domains read from extensions or preferences or contributed
+ * dynamically (programmatically)
+ * 
+ * It produces a collection of {@link org.eclipse.papyrus.infra.core.architecture.
+ * merged.MergedDomain}s by merging a collection of {@link org.eclipse.papyrus.infra.
+ * core.architecture.ArchitectureDomain}s.
+ * 
+ * @since 1.0
+ */
+public class ArchitectureDomainMerger implements Cloneable {
+
+	/**
+	 * A resource set used to load architecture models
+	 */
+	private ResourceSet resourceSet;
+		
+	/**
+	 * a collection of architecture models coming from extensions
+	 */
+	private Collection<URI> extensionModels;
+	
+	/**
+	 * a collection of architecture models coming from preferences
+	 */
+	private Collection<URI> preferenceModels;
+
+	/**
+	 * a collection of architecture domains contributed dynamically (programmatically)
+	 */
+	private Collection<ArchitectureDomain> dynamicDomains;
+
+	/**
+	 * A collection of merged domains
+	 */
+	private Map<String, MergedArchitectureDomain> mergedDomains;
+
+	/**
+	 * a cached mapping from id to ADElement
+	 */
+	private Map<String, MergedADElement> idCache;
+	
+	/**
+	 * Constructs a new instance of the class
+	 */
+	ArchitectureDomainMerger() {
+	}
+
+	/**
+	 * Sets the collection of architecture models URIs read from extensions
+	 * 
+	 * @param models a collection of architecture model URIs
+	 */
+	public void setExtensionModels(Collection<URI> models) {
+		this.extensionModels = models;
+		reset();
+	}
+	
+	/**
+	 * Sets the collection of architecture model URIs read from preferences
+	 * 
+	 * @param models a collection of architecture model URIS
+	 */
+	public void setPreferenceModels(Collection<URI> models) {
+		this.preferenceModels = models;
+		reset();
+	}
+
+	/**
+	 * Sets the collection of architecture domains contributed dynamically
+	 * 
+	 * @param domains a collection of architecture domains
+	 */
+	public void setDynamicDomains(Collection<ArchitectureDomain> domains) {
+		this.dynamicDomains = domains;
+		reset();
+	}
+
+	/**
+	 * Gets the collection of merged architecture domains
+	 * 
+	 * @return the collection of merged architecture domains
+	 */
+	public Collection<MergedArchitectureDomain> getDomains() {
+		if (mergedDomains == null)
+			init();
+		return mergedDomains.values();
+	}
+	
+	/**
+	 * Gets an architecture context given its id
+	 * 
+	 * @param id an id for an architecture context
+	 * @return an architecture context
+	 */
+	public MergedArchitectureContext getArchitectureContextById(String id) {
+		if (mergedDomains == null)
+			init();
+		MergedADElement found = idCache.get(id);
+		return (found instanceof MergedArchitectureContext)? (MergedArchitectureContext)found : null;
+	}
+
+	/**
+	 * Gets an architecture viewpoint given its id
+	 * 
+	 * @param id an id for an architecture viewpoint
+	 * @return an architecture viewpoint
+	 */
+	public MergedArchitectureViewpoint getArchitectureViewpointById(String id) {
+		if (mergedDomains == null)
+			init();
+		MergedADElement found = idCache.get(id);
+		return (found instanceof MergedArchitectureViewpoint)? (MergedArchitectureViewpoint)found : null;
+	}
+	
+	@Override
+	public ArchitectureDomainMerger clone() {
+		ArchitectureDomainMerger clone = new ArchitectureDomainMerger();
+		clone.setExtensionModels(extensionModels);
+		clone.setPreferenceModels(preferenceModels);
+		return clone;
+	}
+
+	/*
+	 * Resets the merger's state 
+	 */
+	private void reset() {
+		resourceSet = null;
+		mergedDomains = null;
+		idCache = null;
+	}
+	
+	/**
+	 * Initializes this instance of the merger
+	 */
+	void init() {
+		resourceSet = new ResourceSetImpl();
+		mergedDomains = new HashMap<String, MergedArchitectureDomain>();
+		if (extensionModels != null) {
+			for (URI model : extensionModels) {
+				ArchitectureDomain domain = loadDomain(resourceSet.createResource(model));
+				if (domain != null)
+					merge(domain);
+			}
+		}
+		if (preferenceModels != null) {
+			for (URI model : preferenceModels) {
+				ArchitectureDomain domain = loadDomain(resourceSet.createResource(model));
+				if (domain != null)
+					merge(domain);
+			}
+		}
+		if (dynamicDomains != null) {
+			for (ArchitectureDomain domain : dynamicDomains) {
+				if (domain != null)
+					merge(domain);
+			}
+		}
+		buildCache();
+	}
+
+	/*
+	 * Read an architecture domain from the given architecture model resource
+	 */
+	private ArchitectureDomain loadDomain(Resource resource) {
+		try {
+			resource.load(null);
+		} catch (IOException e) {
+			// Don't log the error yet; we're trying several options
+			return null;
+		}
+		EObject content = resource.getContents().get(0);
+		if (content instanceof ArchitectureDomain) {
+			return (ArchitectureDomain) content;
+		} else
+			Activator.log.warn("file "+resource.getURI()+ " is not an architecture model");
+		return null;
+	}
+	
+	/*
+	 * Merges the given architecture domain with the others
+	 */
+	private void merge(ArchitectureDomain domain) {
+		MergedArchitectureDomain merged = mergedDomains.get(domain.getName());
+		if (merged == null) {
+			mergedDomains.put(domain.getName(), merged = new MergedArchitectureDomain());
+		}
+		merged.merge(domain);
+	}
+
+	/*
+	 * builds a id to element cache for faster lookup
+	 */
+	private void buildCache() {
+		idCache = new HashMap<String, MergedADElement>();
+		for (MergedArchitectureDomain domain : mergedDomains.values()) {
+			for (MergedArchitectureContext context : domain.getContexts()) {
+				idCache.put(context.getId(), context);
+				for (MergedArchitectureViewpoint viewpoint : context.getViewpoints()) {
+					idCache.put(viewpoint.getId(), viewpoint);
+				}
+			}
+		}
+	}
+	
+}
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/ArchitectureDomainPreferences.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/ArchitectureDomainPreferences.java
new file mode 100644
index 00000000000..e7954f363d6
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/ArchitectureDomainPreferences.java
@@ -0,0 +1,160 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.architecture;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener;
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
+import org.osgi.service.prefs.BackingStoreException;
+
+/**
+ * This class reads/writes the architecture domain preferences
+ * 
+ * @since 1.0
+ */
+public class ArchitectureDomainPreferences implements Cloneable {
+
+	/**
+	 * The addedModels preference property name
+	 */
+	public static final String ADDED_MODELS = "addedModels"; //$NON-NLS-1$
+
+	/**
+	 * The excludedContexts preference property name
+	 */
+	public static final String EXCLUDED_CONTEXTS = "excludedContexts"; //$NON-NLS-1$
+	
+	/**
+	 * The defaultContext preference property name
+	 */
+	public static final String DEFAULT_CONTEXT = "defaultContext"; //$NON-NLS-1$
+
+	/**
+	 * The list of added architecture models in the preferences
+	 */
+	private List<String> addedModels;
+
+	/**
+	 * The set of excluded architecture contexts in the preferences
+	 */
+	private Set<String> excludedContexts;
+	
+	/**
+	 * The id of the default context in the preferences
+	 */
+	private String defaultContext;
+
+	/**
+	 * The default value of the default context when not set
+	 */
+	private String defaultDefaultContext = TypeContext.getDefaultContextId();
+
+	/*
+	 * Gets the preferences node
+	 */
+	private static IEclipsePreferences getPreferences() {
+		return InstanceScope.INSTANCE.getNode(Activator.PLUGIN_ID);
+	}
+
+	/**
+	 * Reads the state of the preferences
+	 */
+	public void read() {
+		addedModels = Arrays.asList(getPreferences().get(ArchitectureDomainPreferences.ADDED_MODELS, "").split(" "));
+		excludedContexts = new HashSet<String>(Arrays.asList(getPreferences().get(ArchitectureDomainPreferences.EXCLUDED_CONTEXTS, "").split(",")));
+		defaultContext = getPreferences().get(ArchitectureDomainPreferences.DEFAULT_CONTEXT, defaultDefaultContext);
+	}
+	
+	/**
+	 * Writes the state of the preferences
+	 */
+	public void write() {
+		getPreferences().put(ArchitectureDomainPreferences.ADDED_MODELS, String.join(" ", addedModels));
+		getPreferences().put(ArchitectureDomainPreferences.EXCLUDED_CONTEXTS, String.join(",", excludedContexts));
+		if (defaultContext != null)
+			getPreferences().put(ArchitectureDomainPreferences.DEFAULT_CONTEXT, defaultContext);
+		else
+			getPreferences().remove(ArchitectureDomainPreferences.DEFAULT_CONTEXT);
+		try {
+			getPreferences().flush();
+		} catch (BackingStoreException e) {
+			Activator.log.error(e);
+		}
+	}
+	
+	/**
+	 * Resets the state of this class to default
+	 */
+	public void reset() {
+		addedModels.clear();
+		excludedContexts.clear();
+		defaultContext = defaultDefaultContext;
+	}
+	
+	/**
+	 * Adds the given preference change listener
+	 * 
+	 * @param listener
+	 */
+	public void addListener(IPreferenceChangeListener listener) {
+		getPreferences().addPreferenceChangeListener(listener);
+	}
+
+	/**
+	 * @return the added model URIs
+	 */
+	public List<String> getAddedModelURIs() {
+		return addedModels;
+	}
+
+	/**
+	 * @return the excluded context ids
+	 */
+	public Set<String> getExcludedContextIds() {
+		return excludedContexts;
+	}
+
+	/**
+	 * @return the default context id
+	 */
+	public String getDefaultContextId() {
+		return defaultContext;
+	}
+
+	/**
+	 * Sets the default context id
+	 * 
+	 * @param defaultContext the default context id
+	 */
+	public void setDefaultContextId(String defaultContext) {
+		this.defaultContext = defaultContext;
+	}
+
+	@Override
+	public ArchitectureDomainPreferences clone() {
+		ArchitectureDomainPreferences clone = new ArchitectureDomainPreferences();
+		clone.addedModels = new ArrayList<String>(getAddedModelURIs());
+		clone.excludedContexts = new HashSet<String>(getExcludedContextIds());
+		clone.setDefaultContextId(getDefaultContextId());
+		return clone;
+	}
+
+}
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/commands/IModelCommandProvider.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/commands/IModelCommandProvider.java
new file mode 100644
index 00000000000..0e27176bdaa
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/commands/IModelCommandProvider.java
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.architecture.commands;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+
+/**
+ * An interface to provide architecture model creation and conversion commands by an extension
+ * 
+ * @since 1.0
+ */
+public interface IModelCommandProvider {
+
+	/**
+	 * Gets a model creation command that represents the contributions of a command provider
+	 * The model is created in the given model set based on the given context id
+	 * 
+	 * @param modelSet the model set to create the model in
+	 * @param contextId context id for which a model is created
+	 * @return a command to create a model
+	 */
+	Command getModelCreationCommand(ModelSet modelSet, String contextId);
+
+	/**
+	 * Gets a model conversion command that represents the contributions of a command provider
+	 * The model is converted in the given model set based on the given new context id
+	 * 
+	 * @param modelSet the model set that contains the model to be converted
+	 * @param contextId the context id for which a model is converted
+	 * @return a command to convert a model to the given context id
+	 */
+	Command getModelConversionCommand(ModelSet modelSet, String contextId);
+
+}
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/commands/IModelConversionCommand.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/commands/IModelConversionCommand.java
new file mode 100644
index 00000000000..615b49af0e0
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/commands/IModelConversionCommand.java
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.architecture.commands;
+
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+
+/**
+ * An Interface to convert a model in a model set
+ * 
+ * @since 1.0
+ */
+public interface IModelConversionCommand {
+
+	/**
+	 * Converts the model in the given model set
+	 *
+	 * @param modelSet the model set
+	 */
+	void convertModel(final ModelSet modelSet);
+
+}
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/commands/IModelCreationCommand.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/commands/IModelCreationCommand.java
new file mode 100644
index 00000000000..b8b6dd9912f
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/commands/IModelCreationCommand.java
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.architecture.commands;
+
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+
+/**
+ * An Interface to create a model in a model set
+ * 
+ * @since 1.0
+ */
+public interface IModelCreationCommand {
+
+	/**
+	 * Creates the model in the given model set
+	 *
+	 * @param modelSet the model set
+	 */
+	void createModel(final ModelSet modelSet);
+
+}
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/commands/ModelCommandProviderRegistry.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/commands/ModelCommandProviderRegistry.java
new file mode 100644
index 00000000000..c30b5251d2f
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/commands/ModelCommandProviderRegistry.java
@@ -0,0 +1,118 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.architecture.commands;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CompoundCommand;
+import org.eclipse.papyrus.infra.architecture.Activator;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+
+/**
+ * A registry for architecture model command providers registered in extensions
+ * 
+ * @since 1.0
+ */
+public class ModelCommandProviderRegistry implements IModelCommandProvider {
+
+	/**
+	 * The extension point id
+	 */
+	private final static String EXTENSION_POINT_ID = Activator.PLUGIN_ID + ".commandProviders";
+
+	/**
+	 * The name of the class attribute
+	 */
+	private static final String PROVIDER_CLASS = "class";
+
+	/**
+	 * The singleton instance of this class
+	 */
+	private static ModelCommandProviderRegistry registry;
+
+	/**
+	 * A collection of registerd command providers
+	 */
+	private Collection<IModelCommandProvider> providers;
+
+	/**
+	 * Gets the singleton instance of this class
+	 * 
+	 * @return the singleton instance
+	 */
+	public static synchronized ModelCommandProviderRegistry getInstance() {
+		if (registry == null) {
+			registry = new ModelCommandProviderRegistry();
+			registry.init();
+		}
+		return registry;
+	}
+
+	/**
+	 * Gets a model creation command that aggregates the contributions of the command providers
+	 * The model is created in the given model set based on the given context id
+	 * 
+	 * @param modelSet the model set to create the model in
+	 * @param contextId context id for which a model is created
+	 * @return a command to create a model
+	 */
+	@Override
+	public Command getModelCreationCommand(ModelSet modelSet, String contextId) {
+		CompoundCommand cc = new CompoundCommand("Contributions to Model Creation");
+		for (IModelCommandProvider provider : providers) {
+			cc.append(provider.getModelCreationCommand(modelSet, contextId));
+		}
+		return cc.isEmpty() ? null : cc;
+	}
+
+	/**
+	 * Gets a model conversion command that aggregates the contributions of the command providers
+	 * The model is converted in the given model set based on the given new context id
+	 * 
+	 * @param modelSet the model set that contains the model to be converted
+	 * @param contextId the context id for which a model is converted
+	 * @return a command to convert a model to the given context id
+	 */
+	@Override
+	public Command getModelConversionCommand(ModelSet modelSet, String contextId) {
+		CompoundCommand cc = new CompoundCommand("Contributions to Model Conversion");
+		for (IModelCommandProvider provider : providers) {
+			cc.append(provider.getModelConversionCommand(modelSet, contextId));
+		}
+		return cc.isEmpty() ? null : cc;
+	}
+
+	/*
+	 * initializes the registry from extensions
+	 */
+	private void init() {
+		providers = new ArrayList<IModelCommandProvider>();
+		IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_POINT_ID);
+		for (IConfigurationElement configurationElement : elements) {
+			try {
+				Object providerClass = configurationElement.createExecutableExtension(PROVIDER_CLASS);
+				if (providerClass instanceof IModelCommandProvider) {
+					providers.add((IModelCommandProvider) providerClass);
+				}
+			} catch (CoreException e) {
+				Activator.log.error(e);
+			}
+		}
+	}
+}
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/listeners/ArchitectureDescriptionAdapter.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/listeners/ArchitectureDescriptionAdapter.java
new file mode 100644
index 00000000000..6acaa9220a0
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/listeners/ArchitectureDescriptionAdapter.java
@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.architecture.listeners;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.util.EContentAdapter;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescription;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionPreferences;
+
+/**
+ * An adapter that is installed in DI models to listen to architecture description changes
+ *
+ * @since 1.0
+ */
+public class ArchitectureDescriptionAdapter extends EContentAdapter {
+
+	/**
+	 * Listens to changes on ArchitectureDescription* objects
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		if (notification.getEventType() == Notification.REMOVING_ADAPTER)
+			return;
+		Object notifier = notification.getNotifier();
+		if (notifier instanceof ArchitectureDescription) {
+			ArchitectureDescriptionNotifier.getInstance().fireArchitectureContextChanged(notification);
+		} else if (notifier instanceof ArchitectureDescriptionPreferences) {
+			ArchitectureDescriptionNotifier.getInstance().fireArchitectureViewpointsChanged(notification);
+		}
+	}
+
+}
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/listeners/ArchitectureDescriptionNotifier.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/listeners/ArchitectureDescriptionNotifier.java
new file mode 100644
index 00000000000..dc221a27b4e
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/listeners/ArchitectureDescriptionNotifier.java
@@ -0,0 +1,104 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.architecture.listeners;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.papyrus.infra.architecture.Activator;
+
+/**
+ * A notifier for registered listeners on events affecting architecture descriptions in models
+ * 
+ * @since 1.0
+ */
+public class ArchitectureDescriptionNotifier {
+
+	/**
+	 * The name of the extension point
+	 */
+	private final static String EXTENSION_POINT_ID = Activator.PLUGIN_ID + ".listeners";
+
+	/**
+	 * The class property name
+	 */
+	private static final String LISTENER_CLASS = "class";
+
+	/**
+	 * The singleton instance of this class
+	 */
+	private static ArchitectureDescriptionNotifier notifier;
+
+	/**
+	 * The collection of registered listeners in extensions 
+	 */
+	private static Collection<IArchitectureDescriptionListener> listeners;
+
+	/**
+	 * Gets the singleton instance of this class
+	 * 
+	 * @return the singleton instance
+	 */
+	public static synchronized ArchitectureDescriptionNotifier getInstance() {
+		if (notifier == null) {
+			notifier = new ArchitectureDescriptionNotifier();
+			listeners = new ArrayList<IArchitectureDescriptionListener>();
+			notifier.init();
+		}
+		return notifier;
+	}
+
+	/**
+	 * Fires architecture context change events for registered listeners
+	 * 
+	 * @param notification the change event
+	 */
+	public void fireArchitectureContextChanged(Notification notification) {
+		for (IArchitectureDescriptionListener policyCheckerListener : listeners) {
+			policyCheckerListener.architectureContextChanged(notification);
+		}
+	}
+
+	/**
+	 * Fires architecture viewpoint change events for registered listeners
+	 * 
+	 * @param notification the change event
+	 */
+	public void fireArchitectureViewpointsChanged(Notification notification) {
+		for (IArchitectureDescriptionListener policyCheckerListener : listeners) {
+			policyCheckerListener.architectureViewpointsChanged(notification);
+		}
+	}
+
+	/*
+	 * initializes the collection of listeners from the extensions
+	 */
+	private void init() {
+		IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_POINT_ID);
+		for (IConfigurationElement configurationElement : elements) {
+			try {
+				Object listenerClass = configurationElement.createExecutableExtension(LISTENER_CLASS);
+				if (listenerClass instanceof IArchitectureDescriptionListener) {
+					listeners.add((IArchitectureDescriptionListener) listenerClass);
+				}
+			} catch (CoreException e) {
+				Activator.log.error(e);
+			}
+		}
+	}
+}
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/listeners/ArchitectureDescriptionSnippet.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/listeners/ArchitectureDescriptionSnippet.java
new file mode 100644
index 00000000000..2739e936fa6
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/listeners/ArchitectureDescriptionSnippet.java
@@ -0,0 +1,57 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.architecture.listeners;
+
+import org.eclipse.papyrus.infra.core.resource.IModelSetSnippet;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;
+
+/**
+ * A model snippet to install the architecture description adapter in the DI model
+ *
+ * @since 1.0
+ */
+public class ArchitectureDescriptionSnippet implements IModelSetSnippet {
+
+	/**
+	 * The installed adapter
+	 */
+	private ArchitectureDescriptionAdapter adapter;
+	
+	/**
+	 * Installs the architecture adapter model snippet on the given model set
+	 * 
+	 * @see org.eclipse.papyrus.infra.core.resource.IModelSetSnippet#start(org.eclipse.papyrus.infra.core.resource.ModelSet)
+	 *
+	 * @param modelSet the given model set
+	 */
+	@Override
+	public void start(ModelSet modelSet) {
+		DiModel diModel = (DiModel) modelSet.getModel(DiModel.DI_MODEL_ID);
+		diModel.getResource().eAdapters().add(adapter = new ArchitectureDescriptionAdapter());
+	}
+
+	/**
+	 * Removes the architecture adapter model snippet from the given model set
+	 * 
+	 * @see org.eclipse.papyrus.infra.core.resource.IModelSetSnippet#dispose(org.eclipse.papyrus.infra.core.resource.ModelSet)
+	 *
+	 * @param modelSet the given model set
+	 */
+	@Override
+	public void dispose(ModelSet modelSet) {
+		DiModel diModel = (DiModel) modelSet.getModel(DiModel.DI_MODEL_ID);
+		diModel.getResource().eAdapters().remove(adapter);
+	}
+}
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/listeners/IArchitectureDescriptionListener.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/listeners/IArchitectureDescriptionListener.java
new file mode 100644
index 00000000000..2814e2f73a6
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/listeners/IArchitectureDescriptionListener.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.architecture.listeners;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionPreferences;
+
+/**
+ * An interface for listening to architecture description change events in models
+ * Listeners are expected to update UI in response
+ * 
+ * @since 1.0
+ */
+public interface IArchitectureDescriptionListener {
+
+	/**
+	 * Responds to an architecture context id change event
+	 * 
+	 * The event's notifier is of type {@link ArchitectureDescription}
+	 * 
+	 * @param notification the change event
+	 */
+	void architectureContextChanged(Notification notification);
+
+	/**
+	 * Responds to an architecture viewpoint id change events
+	 * 
+	 * The event's notifier is of type {@link ArchitectureDescriptionPreferences}
+	 * 
+	 * @param notification the change event
+	 */
+	void architectureViewpointsChanged(Notification notification);
+
+}
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/architecture/merged/MergedADElement.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/architecture/merged/MergedADElement.java
new file mode 100644
index 00000000000..5c0500a5de4
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/architecture/merged/MergedADElement.java
@@ -0,0 +1,156 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture.merged;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import org.eclipse.papyrus.infra.core.architecture.ADElement;
+
+/**
+ * An element that represents a merged collection of {@link org.eclipse.papyrus.infra.core.
+ * architecture.ADElement}s that are instances of the same EClass. This allows the definition 
+ * of architecture elements to be split across several architectural models (*.architecture).
+ * 
+ * All merged elements is assumed to have the same name and qualified name values. However, only
+ * one of those elements (the main merge increment) has values for the single-valued properties.
+ * On the other hand, all multi-valued properties of the elements are merged.
+ * 
+ * @see org.eclipse.papyrus.infra.core.architecture.ADElement
+ * @since 1.0
+ */
+public class MergedADElement {
+
+	/**
+	 * The merged parent of this element
+	 */
+	protected MergedADElement parent;
+	
+	/**
+	 * the architecture elements that represent merge increments of this element
+	 */
+	protected Collection<ADElement> elements;
+	
+	/**
+	 * Create a new '<em><b>Merged AD Element</b></em>'.
+	 *
+	 * @param parent the merged parent of this element
+	 */
+	public MergedADElement(MergedADElement parent) {
+		this.parent = parent;
+		this.elements = new LinkedHashSet<ADElement>();
+	}
+
+	/**
+	 * Get the element's parent
+	 * 
+	 * @return the parent element
+	 */
+	public MergedADElement getParent() {
+		return parent;
+	}
+
+	/**
+	 * Get the element's name
+	 * 
+	 * @return a name
+	 */
+	public String getName() {
+		for (ADElement element : elements) {
+			if (element.getName() != null)
+				return element.getName();
+		}
+		return null;
+	}
+
+	/**
+	 * Get the element's qualified name
+	 * 
+	 * @return a qualified name
+	 */
+	public String getQualifiedName() {
+		for (ADElement element : elements) {
+			if (element.getQualifiedName() != null)
+				return element.getQualifiedName();
+		}
+		return null;
+	}
+	
+	/**
+	 * Get the element's description
+	 * 
+	 * @return a description
+	 */
+	public String getDesciption() {
+		for (ADElement element : elements) {
+			if (element.getDesciption() != null)
+				return element.getDesciption();
+		}
+		return null;
+	}
+
+	/**
+	 * Get a merge increment whose image represents that of the merged element   
+	 * 
+	 * By default, any one of the merge increments will be returned. Subclasses may override.
+	 * 
+	 * @return a merge increment
+	 */
+	public Object getImageObject() {
+		if (!elements.isEmpty())
+			return elements.iterator().next();
+		return null;
+	}
+
+	@Override
+	public int hashCode() {
+		int hash = 0;
+		for (ADElement element : elements) {
+			hash += element.hashCode();
+		}
+		return hash;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (!(obj instanceof MergedADElement))
+			return false;
+		MergedADElement other = (MergedADElement) obj;
+		if (other.parent != this.parent)
+			return false;
+		Set<ADElement> copy = new HashSet<ADElement>(this.elements);
+		copy.retainAll(other.elements);
+		return copy.size() == this.elements.size();
+	}
+
+	@Override
+	public String toString() {
+		Iterator<ADElement> i = elements.iterator();
+		if (i.hasNext())
+			return i.next().toString();
+		return super.toString();
+	}
+
+	/*
+	 * Adds the given element to the collection of merged elements
+	 */
+	void merge(ADElement element) {
+		elements.add(element);
+	}
+
+	
+}
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/architecture/merged/MergedArchitectureContext.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/architecture/merged/MergedArchitectureContext.java
new file mode 100644
index 00000000000..85d487ac916
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/architecture/merged/MergedArchitectureContext.java
@@ -0,0 +1,175 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture.merged;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.papyrus.infra.core.architecture.ADElement;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureContext;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint;
+import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;
+
+/**
+ * An element that represents a merged collection of {@link org.eclipse.papyrus.infra.core.
+ * architecture.ArchitectureContext}s. This allows the definition of architecture contexts 
+ * to be split across several architectural models (*.architecture). 
+ * 
+ * This class is a subclass of {@link org.eclipse.papyrus.infra.core.architecture.merged.
+ * MergedADElement}s
+ *  
+ * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureContext
+ * @since 1.0
+ */
+public abstract class MergedArchitectureContext extends MergedADElement {
+
+	/**
+	 * Create a new '<em><b>Merged Architecture Context</b></em>'.
+	 *
+	 * @param domain the merged parent domain of this context
+	 */
+	public MergedArchitectureContext(MergedArchitectureDomain domain) {
+		super(domain);
+	}
+
+	/**
+	 * Gets the context's id
+	 * 
+	 * @return an id
+	 */
+	public String getId() {
+		for (ADElement element : elements) {
+			ArchitectureContext context = (ArchitectureContext) element;
+			if (context.getId() != null)
+				return context.getId();
+		}
+		return null;
+	}
+
+	/**
+	 * Gets the context's icon path
+	 * 
+	 * @return an icon path
+	 */
+	public String getIcon() {
+		for (ADElement element : elements) {
+			ArchitectureContext context = (ArchitectureContext) element;
+			if (context.getIcon() != null)
+				return context.getIcon();
+		}
+		return null;
+	}
+
+	/**
+	 * Gets the context's extension prefix
+	 * 
+	 * @return an extension prefix
+	 */
+	public String getExtensionPrefix() {
+		for (ADElement element : elements) {
+			ArchitectureContext context = (ArchitectureContext) element;
+			if (context.getExtensionPrefix() != null)
+				return context.getExtensionPrefix();
+		}
+		return null;
+	}
+
+	/**
+	 * Gets the context's creation command class
+	 * 
+	 * @return a creation command class
+	 */
+	public Class<?> getCreationCommandClass() {
+		for (ADElement element : elements) {
+			ArchitectureContext context = (ArchitectureContext) element;
+			if (context.getCreationCommandClass() != null)
+				return context.getCreationCommandClass();
+		}
+		return null;
+	}
+
+	/**
+	 * Gets the context's conversion command class
+	 * 
+	 * @return a conversion command class
+	 */
+	public Class<?> getConversionCommandClass() {
+		for (ADElement element : elements) {
+			ArchitectureContext context = (ArchitectureContext) element;
+			if (context.getConversionCommandClass() != null)
+				return context.getConversionCommandClass();
+		}
+		return null;
+	}
+
+	/**
+	 * Gets the context's parent domain
+	 * 
+	 * @return the parent domain
+	 */
+	public MergedArchitectureDomain getDomain() {
+		return (MergedArchitectureDomain) getParent();
+	}
+
+	/**
+	 * Gets the context's element type set configurations
+	 * 
+	 * @return a merged collection of element type set configurations
+	 */
+	public Collection<ElementTypeSetConfiguration> getElementTypes() {
+		Set<ElementTypeSetConfiguration> configurations = new LinkedHashSet<ElementTypeSetConfiguration>();
+		for (ADElement element : elements) {
+			ArchitectureContext context = (ArchitectureContext) element;
+			configurations.addAll(context.getElementTypes());
+		}
+		return Collections.unmodifiableCollection(configurations);
+	}
+
+	/**
+	 * Gets the context's viewpoints
+	 * 
+	 * @return a merged collection of viewpoints
+	 */
+	public Collection<MergedArchitectureViewpoint> getViewpoints() {
+		Map<String, MergedArchitectureViewpoint> viewpoints = new HashMap<String, MergedArchitectureViewpoint>();
+		for (ADElement element : elements) {
+			ArchitectureContext context = (ArchitectureContext) element;
+			for (ArchitectureViewpoint viewpoint : context.getViewpoints()) {
+				MergedArchitectureViewpoint merged = viewpoints.get(viewpoint.getName());
+				if (merged == null) {
+					viewpoints.put(viewpoint.getName(), merged = new MergedArchitectureViewpoint(this));
+				}
+				merged.merge(viewpoint);
+			}
+		}
+		return Collections.unmodifiableCollection(viewpoints.values());
+	}
+
+	/*
+	 * Gets the merge increment that has an icon value
+	 */
+	@Override
+	public Object getImageObject() {
+		for (ADElement element : elements) {
+			ArchitectureContext context = (ArchitectureContext) element;
+			if (context.getIcon() != null)
+				return context;
+		}
+		return super.getImageObject();
+	}
+}
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/architecture/merged/MergedArchitectureDescriptionLanguage.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/architecture/merged/MergedArchitectureDescriptionLanguage.java
new file mode 100644
index 00000000000..5e0b7b191e5
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/architecture/merged/MergedArchitectureDescriptionLanguage.java
@@ -0,0 +1,90 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture.merged;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.papyrus.infra.core.architecture.ADElement;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage;
+import org.eclipse.papyrus.infra.core.architecture.RepresentationKind;
+
+/**
+ * An element that represents a merged collection of {@link org.eclipse.papyrus.infra.core.
+ * architecture.ArchitectureDescriptionLanguage}s. This allows the definition of architecture 
+ * description languages to be split across several architectural models (*.architecture). 
+ * 
+ * This class is a subclass of {@link org.eclipse.papyrus.infra.core.architecture.merged.
+ * MergedArchitectureContext}s
+ *  
+ * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage
+ * @since 1.0
+ */
+public class MergedArchitectureDescriptionLanguage extends MergedArchitectureContext {
+
+	/**
+	 * Create a new '<em><b>Merged Architecture Description Language</b></em>'.
+	 *
+	 * @param domain the merged parent domain of this language
+	 */
+	public MergedArchitectureDescriptionLanguage(MergedArchitectureDomain domain) {
+		super(domain);
+	}
+
+	/**
+	 * Get the language's metamodel EPackage
+	 * 
+	 * @return an EPackage
+	 */
+	public EPackage getMetamodel() {
+		for (ADElement element : elements) {
+			ArchitectureDescriptionLanguage language = (ArchitectureDescriptionLanguage) element;
+			if (language.getMetamodel() != null)
+				return language.getMetamodel();
+		}
+		return null;
+	}
+
+	/**
+	 * Get a merged collection of the language's profile EPackages
+	 * 
+	 * @return a collection of EPackages
+	 */
+	public Collection<EPackage> getProfiles() {
+		Set<EPackage> profiles = new LinkedHashSet<EPackage>();
+		for (ADElement element : elements) {
+			ArchitectureDescriptionLanguage language = (ArchitectureDescriptionLanguage) element;
+			profiles.addAll(language.getProfiles());
+		}
+		return Collections.unmodifiableCollection(profiles);
+	}
+
+	/**
+	 * Get a merged collection of the language's representation kinds
+	 * 
+	 * @return a collection of representation kinds
+	 */
+	public Collection<RepresentationKind> getRepresentationKinds() {
+		Set<RepresentationKind> kinds = new LinkedHashSet<RepresentationKind>();
+		for (ADElement element : elements) {
+			ArchitectureDescriptionLanguage language = (ArchitectureDescriptionLanguage) element;
+			kinds.addAll(language.getRepresentationKinds());
+		}
+		return Collections.unmodifiableCollection(kinds);
+	}
+
+}
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/architecture/merged/MergedArchitectureDomain.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/architecture/merged/MergedArchitectureDomain.java
new file mode 100644
index 00000000000..0eeea05adb0
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/architecture/merged/MergedArchitectureDomain.java
@@ -0,0 +1,110 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture.merged;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.papyrus.infra.core.architecture.ADElement;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureContext;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain;
+import org.eclipse.papyrus.infra.core.architecture.Concern;
+import org.eclipse.papyrus.infra.core.architecture.Stakeholder;
+
+/**
+ * An element that represents a merged collection of {@link org.eclipse.papyrus.infra.core.
+ * architecture.ArchitectureDomain}s. This allows the definition of architecture 
+ * domains to be split across several architectural models (*.architecture). 
+ * 
+ * This class is a subclass of {@link org.eclipse.papyrus.infra.core.architecture.merged.
+ * MergedADElement}s
+ *  
+ * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain
+ * @since 1.0
+ */
+public class MergedArchitectureDomain extends MergedADElement {
+
+	/**
+	 * Create a new '<em><b>Merged Architecture Domain</b></em>'.
+	 */
+	public MergedArchitectureDomain() {
+		super(null);
+	}
+	
+	/**
+	 * Get a merged collection of the domain's stakeholders
+	 * 
+	 * @return a collection of stakeholders
+	 */
+	public Collection<Stakeholder> getStakeholders() {
+		Set<Stakeholder> stakeholders = new LinkedHashSet<Stakeholder>();
+		for (ADElement element : elements) {
+			ArchitectureDomain domain = (ArchitectureDomain) element;
+			stakeholders.addAll(domain.getStakeholders());
+		}
+		return Collections.unmodifiableCollection(stakeholders);
+	}
+
+	/**
+	 * Get a merged collection of the domain's concerns
+	 * 
+	 * @return a collection of concerns
+	 */
+	public Collection<Concern> getConcerns() {
+		Set<Concern> concerns = new LinkedHashSet<Concern>();
+		for (ADElement element : elements) {
+			ArchitectureDomain domain = (ArchitectureDomain) element;
+			concerns.addAll(domain.getConcerns());
+		}
+		return Collections.unmodifiableCollection(concerns);
+	}
+
+	/**
+	 * Get a merged collection of the domain's contexts
+	 * 
+	 * @return a collection of contexts
+	 */
+	public Collection<MergedArchitectureContext> getContexts() {
+		Map<String, MergedArchitectureContext> contexts = new HashMap<String, MergedArchitectureContext>();
+		for (ADElement element : elements) {
+			ArchitectureDomain domain = (ArchitectureDomain) element;
+			for (ArchitectureContext context : domain.getContexts()) {
+				MergedArchitectureContext merged = contexts.get(context.getName());
+				if (merged == null) {
+					if (context instanceof ArchitectureDescriptionLanguage)
+						contexts.put(context.getName(), merged = new MergedArchitectureDescriptionLanguage(this));
+					else
+						contexts.put(context.getName(), merged = new MergedArchitectureFramework(this));
+				}
+				merged.merge(context);
+			}
+		}
+		return Collections.unmodifiableCollection(contexts.values());
+	}
+
+	/**
+	 * Merges the given domain element with the other merge increments
+	 * 
+	 * @param domain a given domain to merge
+	 */
+	public void merge(ArchitectureDomain domain) {
+		elements.add(domain);
+	}
+	
+}
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/architecture/merged/MergedArchitectureFramework.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/architecture/merged/MergedArchitectureFramework.java
new file mode 100644
index 00000000000..4bf826ae1a6
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/architecture/merged/MergedArchitectureFramework.java
@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture.merged;
+
+/**
+ * An element that represents a merged collection of {@link org.eclipse.papyrus.infra.core.
+ * architecture.ArchitectureFramework}s. This allows the definition of architecture 
+ * framework to be split across several architectural models (*.architecture). 
+ * 
+ * This class is a subclass of {@link org.eclipse.papyrus.infra.core.architecture.merged.
+ * MergedArchitectureContext}s
+ *  
+ * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureFramework
+ * @since 1.0
+ */
+public class MergedArchitectureFramework extends MergedArchitectureContext {
+
+	/**
+	 * Create a new '<em><b>Merged Architecture Framework</b></em>'.
+	 *
+	 * @param domain the merged parent domain of this framework
+	 */
+	public MergedArchitectureFramework(MergedArchitectureDomain domain) {
+		super(domain);
+	}
+
+}
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/architecture/merged/MergedArchitectureViewpoint.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/architecture/merged/MergedArchitectureViewpoint.java
new file mode 100644
index 00000000000..2930fc544e0
--- /dev/null
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/architecture/merged/MergedArchitectureViewpoint.java
@@ -0,0 +1,99 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture.merged;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import org.eclipse.papyrus.infra.core.architecture.ADElement;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint;
+import org.eclipse.papyrus.infra.core.architecture.Concern;
+import org.eclipse.papyrus.infra.core.architecture.RepresentationKind;
+
+/**
+ * An element that represents a merged collection of {@link org.eclipse.papyrus.infra.core.
+ * architecture.ArchitectureViewpoint}s. This allows the definition of architecture 
+ * viewpoints to be split across several architectural models (*.architecture). 
+ * 
+ * This class is a subclass of {@link org.eclipse.papyrus.infra.core.architecture.merged.
+ * MergedADElement}s
+ *  
+ * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint
+ * @since 1.0
+ */
+public class MergedArchitectureViewpoint extends MergedADElement {
+
+	/**
+	 * Create a new '<em><b>Merged Architecture Viewpoint</b></em>'.
+	 *
+	 * @param context the merged parent context of this viewpoint
+	 */
+	public MergedArchitectureViewpoint(MergedArchitectureContext context) {
+		super(context);
+	}
+
+	/**
+	 * Gets the viewpoint's parent context
+	 * 
+	 * @return an architecture context
+	 */
+	public MergedArchitectureContext getContext() {
+		return (MergedArchitectureContext) getParent();
+	}
+
+	/**
+	 * Get the viewpoints's id
+	 * 
+	 * @return an id
+	 */
+	public String getId() {
+		for (ADElement element : elements) {
+			ArchitectureViewpoint viewpoint = (ArchitectureViewpoint) element;
+			if (viewpoint.getId() != null)
+				return viewpoint.getId();
+		}
+		return null;
+	}
+
+	/**
+	 * Gets the viewpoint's merged concerns
+	 * 
+	 * @return a merged collection of concerns
+	 */
+	public Collection<Concern> getConcerns() {
+		Set<Concern> concerns = new LinkedHashSet<Concern>();
+		for (ADElement element : elements) {
+			ArchitectureViewpoint viewpoint = (ArchitectureViewpoint) element;
+			concerns.addAll(viewpoint.getConcerns());
+		}
+		return Collections.unmodifiableCollection(concerns);
+	}
+
+	/**
+	 * Gets the viewpoint's merged representation kinds
+	 * 
+	 * @return a merged collection of representation kinds
+	 */
+	public Collection<RepresentationKind> getRepresentationKinds() {
+		Set<RepresentationKind> kinds = new LinkedHashSet<RepresentationKind>();
+		for (ADElement element : elements) {
+			ArchitectureViewpoint viewpoint = (ArchitectureViewpoint) element;
+			kinds.addAll(viewpoint.getRepresentationKinds());
+		}
+		return Collections.unmodifiableCollection(kinds);
+	}
+
+}
diff --git a/plugins/infra/architecture/pom.xml b/plugins/infra/architecture/pom.xml
new file mode 100644
index 00000000000..a46a143e4ab
--- /dev/null
+++ b/plugins/infra/architecture/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.eclipse.papyrus.infra-architecture</artifactId>
+	<packaging>pom</packaging>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+    </parent>
+	<name>Papyrus Infra Architecture</name>
+	<description>Architecture framework for Papyrus including the architecture representation package.</description>
+
+	<modules>
+		<module>org.eclipse.papyrus.infra.architecture</module>
+		<module>org.eclipse.papyrus.infra.architecture.representation</module>
+		<module>org.eclipse.papyrus.infra.architecture.representation.edit</module>
+	</modules>
+</project>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/.classpath b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/.classpath
new file mode 100644
index 00000000000..2534a1484b3
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/.classpath
@@ -0,0 +1,8 @@
+<?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/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/.project b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/.project
new file mode 100644
index 00000000000..aa403f495cd
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.core.architecture.edit</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.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..2363c7fcc17
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/META-INF/MANIFEST.MF
@@ -0,0 +1,17 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.infra.core.architecture.edit;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Activator: org.eclipse.papyrus.infra.core.architecture.provider.ArchitectureEditPlugin$Implementation
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.papyrus.infra.core.architecture.provider
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.types.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
+Bundle-ActivationPolicy: lazy
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/about.html b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/about.html
new file mode 100644
index 00000000000..bbf2bd6aac7
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/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>January 30, 2017</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/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/build.properties b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/build.properties
new file mode 100644
index 00000000000..7fcb9ee906a
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/build.properties
@@ -0,0 +1,21 @@
+* Copyright (c) 2017 CEA LIST.
+# 
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#  
+#  Contributors:
+#  Maged Elaasar - Initial API and implementation
+#  
+# 
+
+bin.includes = .,\
+               icons/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties
+jars.compile.order = .
+source.. = src-gen/,\
+           src/
+output.. = bin/
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/icons/full/ctool16/CreateArchitectureContext_viewpoints_ArchitectureViewpoint.gif b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/icons/full/ctool16/CreateArchitectureContext_viewpoints_ArchitectureViewpoint.gif
new file mode 100644
index 00000000000..c5686b5c011
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/icons/full/ctool16/CreateArchitectureContext_viewpoints_ArchitectureViewpoint.gif
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/icons/full/ctool16/CreateArchitectureDomain_concerns_Concern.gif b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/icons/full/ctool16/CreateArchitectureDomain_concerns_Concern.gif
new file mode 100644
index 00000000000..45d19124e8f
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/icons/full/ctool16/CreateArchitectureDomain_concerns_Concern.gif
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/icons/full/ctool16/CreateArchitectureDomain_contexts_ArchitectureDescriptionLanguage.gif b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/icons/full/ctool16/CreateArchitectureDomain_contexts_ArchitectureDescriptionLanguage.gif
new file mode 100644
index 00000000000..a6265c4d1e7
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/icons/full/ctool16/CreateArchitectureDomain_contexts_ArchitectureDescriptionLanguage.gif
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/icons/full/ctool16/CreateArchitectureDomain_contexts_ArchitectureFramework.gif b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/icons/full/ctool16/CreateArchitectureDomain_contexts_ArchitectureFramework.gif
new file mode 100644
index 00000000000..e2ee3160f16
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/icons/full/ctool16/CreateArchitectureDomain_contexts_ArchitectureFramework.gif
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/icons/full/ctool16/CreateArchitectureDomain_stakeholders_Stakeholder.gif b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/icons/full/ctool16/CreateArchitectureDomain_stakeholders_Stakeholder.gif
new file mode 100644
index 00000000000..8129448469a
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/icons/full/ctool16/CreateArchitectureDomain_stakeholders_Stakeholder.gif
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/obj16/ArchitectureDescription.gif b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/icons/full/obj16/ArchitectureDescription.gif
index 94c953e013b..94c953e013b 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/obj16/ArchitectureDescription.gif
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/icons/full/obj16/ArchitectureDescription.gif
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/icons/full/obj16/ArchitectureDescriptionLanguage.gif b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/icons/full/obj16/ArchitectureDescriptionLanguage.gif
new file mode 100644
index 00000000000..c3370c7ddd5
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/icons/full/obj16/ArchitectureDescriptionLanguage.gif
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/obj16/CorrespondenceRule.gif b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/icons/full/obj16/ArchitectureDescriptionPreferences.gif
index 33854e98c25..33854e98c25 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/obj16/CorrespondenceRule.gif
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/icons/full/obj16/ArchitectureDescriptionPreferences.gif
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/obj16/PapyrusConfiguration.png b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/icons/full/obj16/ArchitectureDomain.gif
index bf425f3de24..bf425f3de24 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/obj16/PapyrusConfiguration.png
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/icons/full/obj16/ArchitectureDomain.gif
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/obj16/ArchitectureFramework.gif b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/icons/full/obj16/ArchitectureFramework.gif
index 53500daf98e..53500daf98e 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/obj16/ArchitectureFramework.gif
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/icons/full/obj16/ArchitectureFramework.gif
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/obj16/PapyrusViewpoint.png b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/icons/full/obj16/ArchitectureViewpoint.gif
index 1c1f316b177..1c1f316b177 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/obj16/PapyrusViewpoint.png
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/icons/full/obj16/ArchitectureViewpoint.gif
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/obj16/Concern.gif b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/icons/full/obj16/Concern.gif
index 9250fecbffd..9250fecbffd 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/obj16/Concern.gif
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/icons/full/obj16/Concern.gif
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/obj16/Stakeholder.png b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/icons/full/obj16/Stakeholder.gif
index 7229ab993a2..7229ab993a2 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/obj16/Stakeholder.png
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/icons/full/obj16/Stakeholder.gif
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/plugin.properties b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/plugin.properties
new file mode 100644
index 00000000000..df33a3c6d54
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/plugin.properties
@@ -0,0 +1,134 @@
+* Copyright (c) 2017 CEA LIST.
+# 
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#  
+#  Contributors:
+#  Maged Elaasar - Initial API and implementation
+#  
+# 
+
+pluginName = Architecture Edit Support
+providerName=Eclipse Modeling Project
+
+_UI_CreateChild_text = {0}
+_UI_CreateChild_text2 = {1} {0}
+_UI_CreateChild_text3 = {1}
+_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
+_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
+_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
+
+_UI_PropertyDescriptor_description = The {0} of the {1}
+
+_UI_ADElement_type = AD Element
+_UI_ArchitectureDomain_type = Architecture Domain
+_UI_ArchitectureDescriptionLanguage_type = Architecture Description Language
+_UI_Stakeholder_type = Stakeholder
+_UI_Concern_type = Concern
+_UI_ArchitectureViewpoint_type = Architecture Viewpoint
+_UI_RepresentationKind_type = Representation Kind
+_UI_ArchitectureContext_type = Architecture Context
+_UI_ArchitectureFramework_type = Architecture Framework
+_UI_ArchitectureDescription_type = Architecture Description
+_UI_Unknown_type = Object
+
+_UI_Unknown_datatype= Value
+
+_UI_ADElement_name_feature = Name
+_UI_ADElement_desciption_feature = Desciption
+_UI_ADElement_qualifiedName_feature = Qualified Name
+_UI_ArchitectureDomain_stakeholders_feature = Stakeholders
+_UI_ArchitectureDomain_concerns_feature = Concerns
+_UI_ArchitectureDomain_contexts_feature = Contexts
+_UI_ArchitectureDescriptionLanguage_representationKinds_feature = Representation Kinds
+_UI_ArchitectureDescriptionLanguage_metamodel_feature = Metamodel
+_UI_ArchitectureDescriptionLanguage_profiles_feature = Profiles
+_UI_Stakeholder_concerns_feature = Concerns
+_UI_ArchitectureViewpoint_concerns_feature = Concerns
+_UI_ArchitectureViewpoint_representationKinds_feature = Representation Kinds
+_UI_RepresentationKind_concerns_feature = Concerns
+_UI_ArchitectureContext_viewpoints_feature = Viewpoints
+_UI_ArchitectureContext_elementTypes_feature = Element Types
+_UI_ArchitectureContext_id_feature = Id
+_UI_ArchitectureDescription_contextId_feature = Context Id
+_UI_ArchitectureDescription_viewpoints_feature = Viewpoints
+_UI_Unknown_feature = Unspecified
+
+_UI_PapyrusRepresentationKind_type = Papyrus Representation Kind
+_UI_PapyrusDiagram_type = Papyrus Diagram
+_UI_PapyrusSyncTable_type = Papyrus Sync Table
+_UI_PapyrusTable_type = Papyrus Table
+_UI_Rule_type = Rule
+_UI_ModelRule_type = Model Rule
+_UI_OwningRule_type = Owning Rule
+_UI_ChildRule_type = Child Rule
+_UI_PaletteRule_type = Palette Rule
+_UI_PathElement_type = Path Element
+_UI_Category_type = Category
+_UI_ModelAutoCreate_type = Model Auto Create
+_UI_RootAutoSelect_type = Root Auto Select
+_UI_AssistantRule_type = Assistant Rule
+_UI_PapyrusRepresentationKind_icon_feature = Icon
+_UI_PapyrusRepresentationKind_parent_feature = Parent
+_UI_PapyrusRepresentationKind_profiles_feature = Profiles
+_UI_PapyrusRepresentationKind_modelRules_feature = Model Rules
+_UI_PapyrusRepresentationKind_owningRules_feature = Owning Rules
+_UI_PapyrusRepresentationKind_implementationID_feature = Implementation ID
+_UI_PapyrusRepresentationKind_categories_feature = Categories
+_UI_PapyrusDiagram_customPalette_feature = Custom Palette
+_UI_PapyrusDiagram_customStyle_feature = Custom Style
+_UI_PapyrusDiagram_childRules_feature = Child Rules
+_UI_PapyrusDiagram_paletteRules_feature = Palette Rules
+_UI_PapyrusDiagram_assistantRules_feature = Assistant Rules
+_UI_PapyrusTable_configuration_feature = Configuration
+_UI_Rule_permit_feature = Permit
+_UI_ModelRule_element_feature = Element
+_UI_ModelRule_stereotypes_feature = Stereotypes
+_UI_ModelRule_multiplicity_feature = Multiplicity
+_UI_OwningRule_element_feature = Element
+_UI_OwningRule_stereotypes_feature = Stereotypes
+_UI_OwningRule_multiplicity_feature = Multiplicity
+_UI_OwningRule_newModelPath_feature = New Model Path
+_UI_OwningRule_selectDiagramRoot_feature = Select Diagram Root
+_UI_ChildRule_element_feature = Element
+_UI_ChildRule_stereotypes_feature = Stereotypes
+_UI_ChildRule_origin_feature = Origin
+_UI_ChildRule_insertionPath_feature = Insertion Path
+_UI_PaletteRule_element_feature = Element
+_UI_PathElement_feature_feature = Feature
+_UI_PathElement_origin_feature = Origin
+_UI_PathElement_target_feature = Target
+_UI_Category_name_feature = Name
+_UI_ModelAutoCreate_feature_feature = Feature
+_UI_ModelAutoCreate_origin_feature = Origin
+_UI_ModelAutoCreate_creationType_feature = Creation Type
+_UI_RootAutoSelect_feature_feature = Feature
+_UI_AssistantRule_elementTypeID_feature = Element Type ID
+
+_UI_AssistantRule_label = Assistant: {0} => {1}
+_UI_allow = allow
+_UI_deny = deny
+
+_UI_ArchitectureContext_icon_feature = Icon
+_UI_ArchitectureContext_extension_feature = Extension
+_UI_RepresentationKind_icon_feature = Icon
+_UI_Stakeholder_domain_feature = Domain
+_UI_Concern_domain_feature = Domain
+_UI_ArchitectureViewpoint_context_feature = Context
+_UI_RepresentationKind_language_feature = Language
+_UI_ArchitectureContext_domain_feature = Domain
+_UI_ArchitectureDescription_context_feature = Context
+_UI_ArchitectureDescription_contextName_feature = Context Name
+_UI_ArchitectureDescription_viewpointNames_feature = Viewpoint Names
+_UI_ArchitectureContext_extensionPrefix_feature = Extension Prefix
+_UI_ArchitectureContext_createCommand_feature = Create Command
+_UI_ArchitectureViewpoint_id_feature = Id
+_UI_ArchitectureDescription_viewpointIds_feature = Viewpoint Ids
+_UI_ArchitectureContext_creationCommand_feature = Creation Command
+_UI_ArchitectureContext_conversionCommand_feature = Conversion Command
+_UI_ArchitectureContext_creationCommandClass_feature = Creation Command Class
+_UI_ArchitectureContext_conversionCommandClass_feature = Conversion Command Class
+_UI_ArchitectureDescriptionPreferences_type = Description Preferences
+_UI_ArchitectureDescriptionPreferences_viewpointIds_feature = Viewpoint Ids
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/plugin.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/plugin.xml
index e5d807fa495..60cb8a838f4 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/plugin.xml
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/plugin.xml
@@ -1,22 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-

-<!--

--->

-

-<plugin>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated iso42010 -->

-      <factory

-            uri="http://www.eclipse.org/papyrus/infra/viewpoints/iso42010"

-            class="org.eclipse.papyrus.infra.viewpoints.iso42010.provider.Iso42010ItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+* Copyright (c) 2017 CEA LIST.
+ 
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/legal/epl-v10.html
+  
+  Contributors:
+  Maged Elaasar - Initial API and implementation
+  
+ 
+-->
+
+<plugin>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated Architecture -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/infra/core/architecture"
+            class="org.eclipse.papyrus.infra.core.architecture.provider.ArchitectureItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/pom.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/pom.xml
index b0f019aaaed..5c617dc8ac1 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/pom.xml
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/pom.xml
@@ -3,11 +3,11 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.infra-viewpoints</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
+		<artifactId>org.eclipse.papyrus.infra-core</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<artifactId>org.eclipse.papyrus.infra.viewpoints.preferences</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
+	<artifactId>org.eclipse.papyrus.infra.core.architecture.edit</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/ADElementItemProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ADElementItemProvider.java
index 7c0547a8ea4..c8dddbfeba3 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/ADElementItemProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ADElementItemProvider.java
@@ -1,186 +1,206 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010.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.infra.viewpoints.iso42010.ADElement;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ADElement} object.

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

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

- *

- * @generated

- */

-public class ADElementItemProvider

-		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 ADElementItemProvider(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);

-			addAffectedByPropertyDescriptor(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_ADElement_name_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_ADElement_name_feature", "_UI_ADElement_type"),

-						Iso42010Package.Literals.AD_ELEMENT__NAME,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Affected By feature.

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

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

-	 *

-	 * @generated

-	 */

-	protected void addAffectedByPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_ADElement_affectedBy_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_ADElement_affectedBy_feature", "_UI_ADElement_type"),

-						Iso42010Package.Literals.AD_ELEMENT__AFFECTED_BY,

-						true,

-						false,

-						true,

-						null,

-						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 = ((ADElement) object).getName();

-		return label == null || label.length() == 0 ?

-				getString("_UI_ADElement_type") :

-				getString("_UI_ADElement_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(ADElement.class)) {

-		case Iso42010Package.AD_ELEMENT__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 Iso42010EditPlugin.INSTANCE;

-	}

-

-}

+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture.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.IChildCreationExtender;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.core.architecture.ADElement;
+import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.core.architecture.ADElement} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ADElementItemProvider 
+	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 ADElementItemProvider(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);
+			addDesciptionPropertyDescriptor(object);
+			addQualifiedNamePropertyDescriptor(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_ADElement_name_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_ADElement_name_feature", "_UI_ADElement_type"),
+				 ArchitecturePackage.Literals.AD_ELEMENT__NAME,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Desciption feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDesciptionPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ADElement_desciption_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_ADElement_desciption_feature", "_UI_ADElement_type"),
+				 ArchitecturePackage.Literals.AD_ELEMENT__DESCIPTION,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Qualified Name feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addQualifiedNamePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ADElement_qualifiedName_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_ADElement_qualifiedName_feature", "_UI_ADElement_type"),
+				 ArchitecturePackage.Literals.AD_ELEMENT__QUALIFIED_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 = ((ADElement)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_ADElement_type") :
+			getString("_UI_ADElement_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(ADElement.class)) {
+			case ArchitecturePackage.AD_ELEMENT__NAME:
+			case ArchitecturePackage.AD_ELEMENT__DESCIPTION:
+			case ArchitecturePackage.AD_ELEMENT__QUALIFIED_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 ((IChildCreationExtender)adapterFactory).getResourceLocator();
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureContextItemProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureContextItemProvider.java
new file mode 100644
index 00000000000..38f0fcfdb0f
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureContextItemProvider.java
@@ -0,0 +1,291 @@
+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture.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.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureContext;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureFactory;
+import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ArchitectureContextItemProvider extends ADElementItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ArchitectureContextItemProvider(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);
+
+			addElementTypesPropertyDescriptor(object);
+			addIdPropertyDescriptor(object);
+			addIconPropertyDescriptor(object);
+			addExtensionPrefixPropertyDescriptor(object);
+			addCreationCommandClassPropertyDescriptor(object);
+			addConversionCommandClassPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Element Types feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addElementTypesPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ArchitectureContext_elementTypes_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_ArchitectureContext_elementTypes_feature", "_UI_ArchitectureContext_type"),
+				 ArchitecturePackage.Literals.ARCHITECTURE_CONTEXT__ELEMENT_TYPES,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Id feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addIdPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ArchitectureContext_id_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_ArchitectureContext_id_feature", "_UI_ArchitectureContext_type"),
+				 ArchitecturePackage.Literals.ARCHITECTURE_CONTEXT__ID,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 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_ArchitectureContext_icon_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_ArchitectureContext_icon_feature", "_UI_ArchitectureContext_type"),
+				 ArchitecturePackage.Literals.ARCHITECTURE_CONTEXT__ICON,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Extension Prefix feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addExtensionPrefixPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ArchitectureContext_extensionPrefix_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_ArchitectureContext_extensionPrefix_feature", "_UI_ArchitectureContext_type"),
+				 ArchitecturePackage.Literals.ARCHITECTURE_CONTEXT__EXTENSION_PREFIX,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Creation Command Class feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addCreationCommandClassPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ArchitectureContext_creationCommandClass_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_ArchitectureContext_creationCommandClass_feature", "_UI_ArchitectureContext_type"),
+				 ArchitecturePackage.Literals.ARCHITECTURE_CONTEXT__CREATION_COMMAND_CLASS,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Conversion Command Class feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addConversionCommandClassPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ArchitectureContext_conversionCommandClass_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_ArchitectureContext_conversionCommandClass_feature", "_UI_ArchitectureContext_type"),
+				 ArchitecturePackage.Literals.ARCHITECTURE_CONTEXT__CONVERSION_COMMAND_CLASS,
+				 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(ArchitecturePackage.Literals.ARCHITECTURE_CONTEXT__VIEWPOINTS);
+		}
+		return childrenFeatures;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
+
+		return super.getChildFeature(object, child);
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((ArchitectureContext)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_ArchitectureContext_type") :
+			getString("_UI_ArchitectureContext_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(ArchitectureContext.class)) {
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__ID:
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__ICON:
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__EXTENSION_PREFIX:
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__CREATION_COMMAND_CLASS:
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__CONVERSION_COMMAND_CLASS:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__VIEWPOINTS:
+				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
+				(ArchitecturePackage.Literals.ARCHITECTURE_CONTEXT__VIEWPOINTS,
+				 ArchitectureFactory.eINSTANCE.createArchitectureViewpoint()));
+	}
+
+}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/CategoryItemProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureDescriptionItemProvider.java
index 351ef091a64..b60bcaadab1 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/CategoryItemProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureDescriptionItemProvider.java
@@ -1,18 +1,17 @@
 /**
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
+* Copyright (c) 2017 CEA LIST.
+ * 
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
  *  which accompanies this distribution, and is available at
  *  http://www.eclipse.org/legal/epl-v10.html
- *
+ *  
  *  Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
  */
-package org.eclipse.papyrus.infra.viewpoints.configuration.provider;
+package org.eclipse.papyrus.infra.core.architecture.provider;
 
 
 import java.util.Collection;
@@ -20,7 +19,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.ResourceLocator;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IChildCreationExtender;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
@@ -32,18 +33,18 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.infra.viewpoints.configuration.Category;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescription;
+import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.viewpoints.configuration.Category} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDescription} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class CategoryItemProvider
-		extends ItemProviderAdapter
-		implements
+public class ArchitectureDescriptionItemProvider 
+	extends ItemProviderAdapter
+	implements
 		IEditingDomainItemProvider,
 		IStructuredItemContentProvider,
 		ITreeItemContentProvider,
@@ -55,7 +56,7 @@ public class CategoryItemProvider
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public CategoryItemProvider(AdapterFactory adapterFactory) {
+	public ArchitectureDescriptionItemProvider(AdapterFactory adapterFactory) {
 		super(adapterFactory);
 	}
 
@@ -70,51 +71,42 @@ public class CategoryItemProvider
 		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
-			addNamePropertyDescriptor(object);
+			addContextIdPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
-	 * This adds a property descriptor for the Name feature.
+	 * This adds a property descriptor for the Context Id feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_Category_name_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Category_name_feature", "_UI_Category_type"),
-				ConfigurationPackage.Literals.CATEGORY__NAME,
-				true,
-				false,
-				false,
-				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				null,
-				null));
-	}
-
-	/**
-	 * This returns Category.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated NOT - custom image
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/PapyrusView.png"));
+	protected void addContextIdPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ArchitectureDescription_contextId_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_ArchitectureDescription_contextId_feature", "_UI_ArchitectureDescription_type"),
+				 ArchitecturePackage.Literals.ARCHITECTURE_DESCRIPTION__CONTEXT_ID,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
 	}
 
 	/**
+	 * This returns ArchitectureDescription.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
-	protected boolean shouldComposeCreationImage() {
-		return true;
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ArchitectureDescription"));
 	}
 
 	/**
@@ -125,10 +117,12 @@ public class CategoryItemProvider
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((Category) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Category_type") : getString("_UI_Category_type") + " " + label;
+		String label = ((ArchitectureDescription)object).getContextId();
+		return label == null || label.length() == 0 ?
+			getString("_UI_ArchitectureDescription_type") :
+			getString("_UI_ArchitectureDescription_type") + " " + label;
 	}
-
+	
 
 	/**
 	 * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -141,10 +135,10 @@ public class CategoryItemProvider
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
 
-		switch (notification.getFeatureID(Category.class)) {
-		case ConfigurationPackage.CATEGORY__NAME:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
+		switch (notification.getFeatureID(ArchitectureDescription.class)) {
+			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION__CONTEXT_ID:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -169,7 +163,7 @@ public class CategoryItemProvider
 	 */
 	@Override
 	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender) adapterFactory).getResourceLocator();
+		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
 	}
 
 }
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureDescriptionLanguageItemProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureDescriptionLanguageItemProvider.java
new file mode 100644
index 00000000000..7e0ca9669eb
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureDescriptionLanguageItemProvider.java
@@ -0,0 +1,195 @@
+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture.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.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage;
+import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
+import org.eclipse.papyrus.infra.core.architecture.provider.EPackagePropertyDescriptor;
+import org.eclipse.papyrus.infra.core.architecture.provider.ProfilePropertyDescriptor;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ArchitectureDescriptionLanguageItemProvider extends ArchitectureContextItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ArchitectureDescriptionLanguageItemProvider(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);
+
+			addMetamodelPropertyDescriptor(object);
+			addProfilesPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Metamodel feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	protected void addMetamodelPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(new EPackagePropertyDescriptor(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(),
+				getString("_UI_ArchitectureDescriptionLanguage_metamodel_feature"),
+				getString("_UI_PropertyDescriptor_description", "_UI_ArchitectureDescriptionLanguage_metamodel_feature", "_UI_ArchitectureDescriptionLanguage_type"),
+				ArchitecturePackage.Literals.ARCHITECTURE_DESCRIPTION_LANGUAGE__METAMODEL,
+				true,
+				false,
+				true,
+				null,
+				null,
+				null)));
+	}
+
+	/**
+	 * This adds a property descriptor for the Profiles feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	protected void addProfilesPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(new ProfilePropertyDescriptor(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(),
+				getString("_UI_ArchitectureDescriptionLanguage_profiles_feature"),
+				getString("_UI_PropertyDescriptor_description", "_UI_ArchitectureDescriptionLanguage_profiles_feature", "_UI_ArchitectureDescriptionLanguage_type"),
+				ArchitecturePackage.Literals.ARCHITECTURE_DESCRIPTION_LANGUAGE__PROFILES,
+				true,
+				false,
+				true,
+				null,
+				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(ArchitecturePackage.Literals.ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS);
+		}
+		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 ArchitectureDescriptionLanguage.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	@Override
+	public Object getImage(Object object) {
+		ArchitectureDescriptionLanguage language = (ArchitectureDescriptionLanguage)object;
+		if (language.getIcon() != null)
+			return overlayImage(object, getResourceLocator().getImage(language.getIcon()));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ArchitectureDescriptionLanguage"));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((ArchitectureDescriptionLanguage)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_ArchitectureDescriptionLanguage_type") :
+			getString("_UI_ArchitectureDescriptionLanguage_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(ArchitectureDescriptionLanguage.class)) {
+			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS:
+				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);
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureDescriptionPreferencesItemProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureDescriptionPreferencesItemProvider.java
new file mode 100644
index 00000000000..cdac63cd692
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureDescriptionPreferencesItemProvider.java
@@ -0,0 +1,167 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture.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.IChildCreationExtender;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionPreferences;
+import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionPreferences} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ArchitectureDescriptionPreferencesItemProvider 
+	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 ArchitectureDescriptionPreferencesItemProvider(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);
+
+			addViewpointIdsPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Viewpoint Ids feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addViewpointIdsPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ArchitectureDescriptionPreferences_viewpointIds_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_ArchitectureDescriptionPreferences_viewpointIds_feature", "_UI_ArchitectureDescriptionPreferences_type"),
+				 ArchitecturePackage.Literals.ARCHITECTURE_DESCRIPTION_PREFERENCES__VIEWPOINT_IDS,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns ArchitectureDescriptionPreferences.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ArchitectureDescriptionPreferences"));
+	}
+
+	/**
+	 * 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_ArchitectureDescriptionPreferences_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(ArchitectureDescriptionPreferences.class)) {
+			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_PREFERENCES__VIEWPOINT_IDS:
+				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 ((IChildCreationExtender)adapterFactory).getResourceLocator();
+	}
+
+}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/ArchitectureFrameworkItemProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureDomainItemProvider.java
index c7d19d86cb7..8211765df89 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/ArchitectureFrameworkItemProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureDomainItemProvider.java
@@ -1,204 +1,174 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010.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.infra.viewpoints.iso42010.ArchitectureFramework;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Factory;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureFramework} object.

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

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

- *

- * @generated

- */

-public class ArchitectureFrameworkItemProvider

-		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 ArchitectureFrameworkItemProvider(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(Iso42010Package.Literals.ARCHITECTURE_FRAMEWORK__STAKEHOLDERS);

-			childrenFeatures.add(Iso42010Package.Literals.ARCHITECTURE_FRAMEWORK__VIEWPOINTS);

-			childrenFeatures.add(Iso42010Package.Literals.ARCHITECTURE_FRAMEWORK__RULES);

-			childrenFeatures.add(Iso42010Package.Literals.ARCHITECTURE_FRAMEWORK__CONCERNS);

-		}

-		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 ArchitectureFramework.gif.

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

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

-	}

-

-	/**

-	 * 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_ArchitectureFramework_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(ArchitectureFramework.class)) {

-		case Iso42010Package.ARCHITECTURE_FRAMEWORK__STAKEHOLDERS:

-		case Iso42010Package.ARCHITECTURE_FRAMEWORK__VIEWPOINTS:

-		case Iso42010Package.ARCHITECTURE_FRAMEWORK__RULES:

-		case Iso42010Package.ARCHITECTURE_FRAMEWORK__CONCERNS:

-			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

-				(Iso42010Package.Literals.ARCHITECTURE_FRAMEWORK__STAKEHOLDERS,

-						Iso42010Factory.eINSTANCE.createStakeholder()));

-

-		newChildDescriptors.add

-				(createChildParameter

-				(Iso42010Package.Literals.ARCHITECTURE_FRAMEWORK__VIEWPOINTS,

-						Iso42010Factory.eINSTANCE.createArchitectureViewpoint()));

-

-		newChildDescriptors.add

-				(createChildParameter

-				(Iso42010Package.Literals.ARCHITECTURE_FRAMEWORK__RULES,

-						Iso42010Factory.eINSTANCE.createCorrespondenceRule()));

-

-		newChildDescriptors.add

-				(createChildParameter

-				(Iso42010Package.Literals.ARCHITECTURE_FRAMEWORK__CONCERNS,

-						Iso42010Factory.eINSTANCE.createConcern()));

-	}

-

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return Iso42010EditPlugin.INSTANCE;

-	}

-

-}

+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture.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.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureFactory;
+import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ArchitectureDomainItemProvider extends ADElementItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ArchitectureDomainItemProvider(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(ArchitecturePackage.Literals.ARCHITECTURE_DOMAIN__STAKEHOLDERS);
+			childrenFeatures.add(ArchitecturePackage.Literals.ARCHITECTURE_DOMAIN__CONCERNS);
+			childrenFeatures.add(ArchitecturePackage.Literals.ARCHITECTURE_DOMAIN__CONTEXTS);
+		}
+		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 ArchitectureDomain.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ArchitectureDomain"));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((ArchitectureDomain)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_ArchitectureDomain_type") :
+			getString("_UI_ArchitectureDomain_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(ArchitectureDomain.class)) {
+			case ArchitecturePackage.ARCHITECTURE_DOMAIN__STAKEHOLDERS:
+			case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONCERNS:
+			case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONTEXTS:
+				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
+				(ArchitecturePackage.Literals.ARCHITECTURE_DOMAIN__STAKEHOLDERS,
+				 ArchitectureFactory.eINSTANCE.createStakeholder()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(ArchitecturePackage.Literals.ARCHITECTURE_DOMAIN__CONCERNS,
+				 ArchitectureFactory.eINSTANCE.createConcern()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(ArchitecturePackage.Literals.ARCHITECTURE_DOMAIN__CONTEXTS,
+				 ArchitectureFactory.eINSTANCE.createArchitectureDescriptionLanguage()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(ArchitecturePackage.Literals.ARCHITECTURE_DOMAIN__CONTEXTS,
+				 ArchitectureFactory.eINSTANCE.createArchitectureFramework()));
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureEditPlugin.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureEditPlugin.java
new file mode 100644
index 00000000000..0a04f5a2e05
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureEditPlugin.java
@@ -0,0 +1,117 @@
+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture.provider;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+
+import org.eclipse.emf.common.EMFPlugin;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.papyrus.infra.types.provider.TypesConfigurationsEditPlugin;
+
+/**
+ * This is the central singleton for the Architecture edit plugin.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public final class ArchitectureEditPlugin extends EMFPlugin {
+	/**
+	 * Keep track of the singleton.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final ArchitectureEditPlugin INSTANCE = new ArchitectureEditPlugin();
+
+	/**
+	 * Keep track of the singleton.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static Implementation plugin;
+
+	/**
+	 * Create the instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ArchitectureEditPlugin() {
+		super
+		  (new ResourceLocator [] {
+		     TypesConfigurationsEditPlugin.INSTANCE,
+		   });
+	}
+
+	/**
+	 * Returns the singleton instance of the Eclipse plugin.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the singleton instance.
+	 * @generated
+	 */
+	@Override
+	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 EclipsePlugin {
+		/**
+		 * Creates an instance.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public Implementation() {
+			super();
+
+			// Remember the static instance.
+			//
+			plugin = this;
+		}
+
+		@Override
+		public Object doGetImage(String key) throws IOException {
+			if (key.startsWith("platform:/plugin")) {
+			    URL url = new URL(key);
+			    InputStream inputStream = url.openStream();
+			    inputStream.close();
+			    return url;
+			}
+			return super.doGetImage(key); 
+		}
+		
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureFrameworkItemProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureFrameworkItemProvider.java
new file mode 100644
index 00000000000..5917ce5a2aa
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureFrameworkItemProvider.java
@@ -0,0 +1,112 @@
+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture.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.IItemPropertyDescriptor;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureFramework;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.core.architecture.ArchitectureFramework} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ArchitectureFrameworkItemProvider extends ArchitectureContextItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ArchitectureFrameworkItemProvider(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 returns ArchitectureFramework.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	@Override
+	public Object getImage(Object object) {
+		ArchitectureFramework framework = (ArchitectureFramework)object;
+		if (framework.getIcon() != null)
+			return overlayImage(object, getResourceLocator().getImage(framework.getIcon()));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ArchitectureFramework"));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((ArchitectureFramework)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_ArchitectureFramework_type") :
+			getString("_UI_ArchitectureFramework_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/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/Iso42010ItemProviderAdapterFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureItemProviderAdapterFactory.java
index 7697a8a3237..8bd64971452 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/Iso42010ItemProviderAdapterFactory.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureItemProviderAdapterFactory.java
@@ -1,590 +1,418 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010.provider;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Adapter;

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

-import org.eclipse.emf.common.notify.Notifier;

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

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

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

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

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

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

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

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

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

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

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

-import org.eclipse.papyrus.infra.viewpoints.iso42010.util.Iso42010AdapterFactory;

-

-/**

- * This is the factory that is used to provide the interfaces needed to support Viewers.

- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

- * The adapters also support Eclipse property sheets.

- * Note that most of the adapters are shared among multiple instances.

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

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

- *

- * @generated

- */

-public class Iso42010ItemProviderAdapterFactory extends Iso42010AdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

-	/**

-	 * This keeps track of the root adapter factory that delegates to this adapter factory.

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

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

-	 *

-	 * @generated

-	 */

-	protected ComposedAdapterFactory parentAdapterFactory;

-

-	/**

-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

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

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

-	 *

-	 * @generated

-	 */

-	protected IChangeNotifier changeNotifier = new ChangeNotifier();

-

-	/**

-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

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

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

-	 *

-	 * @generated

-	 */

-	protected Collection<Object> supportedTypes = new ArrayList<Object>();

-

-	/**

-	 * This constructs an instance.

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

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

-	 *

-	 * @generated

-	 */

-	public Iso42010ItemProviderAdapterFactory() {

-		supportedTypes.add(IEditingDomainItemProvider.class);

-		supportedTypes.add(IStructuredItemContentProvider.class);

-		supportedTypes.add(ITreeItemContentProvider.class);

-		supportedTypes.add(IItemLabelProvider.class);

-		supportedTypes.add(IItemPropertySource.class);

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription} instances.

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

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

-	 *

-	 * @generated

-	 */

-	protected ArchitectureDescriptionItemProvider architectureDescriptionItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription}.

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createArchitectureDescriptionAdapter() {

-		if (architectureDescriptionItemProvider == null) {

-			architectureDescriptionItemProvider = new ArchitectureDescriptionItemProvider(this);

-		}

-

-		return architectureDescriptionItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder} instances.

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

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

-	 *

-	 * @generated

-	 */

-	protected StakeholderItemProvider stakeholderItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder}.

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createStakeholderAdapter() {

-		if (stakeholderItemProvider == null) {

-			stakeholderItemProvider = new StakeholderItemProvider(this);

-		}

-

-		return stakeholderItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint} instances.

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

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

-	 *

-	 * @generated

-	 */

-	protected ArchitectureViewpointItemProvider architectureViewpointItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint}.

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createArchitectureViewpointAdapter() {

-		if (architectureViewpointItemProvider == null) {

-			architectureViewpointItemProvider = new ArchitectureViewpointItemProvider(this);

-		}

-

-		return architectureViewpointItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ModelKind} instances.

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

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

-	 *

-	 * @generated

-	 */

-	protected ModelKindItemProvider modelKindItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ModelKind}.

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createModelKindAdapter() {

-		if (modelKindItemProvider == null) {

-			modelKindItemProvider = new ModelKindItemProvider(this);

-		}

-

-		return modelKindItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureModel} instances.

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

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

-	 *

-	 * @generated

-	 */

-	protected ArchitectureModelItemProvider architectureModelItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureModel}.

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createArchitectureModelAdapter() {

-		if (architectureModelItemProvider == null) {

-			architectureModelItemProvider = new ArchitectureModelItemProvider(this);

-		}

-

-		return architectureModelItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureView} instances.

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

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

-	 *

-	 * @generated

-	 */

-	protected ArchitectureViewItemProvider architectureViewItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureView}.

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createArchitectureViewAdapter() {

-		if (architectureViewItemProvider == null) {

-			architectureViewItemProvider = new ArchitectureViewItemProvider(this);

-		}

-

-		return architectureViewItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.viewpoints.iso42010.Concern} instances.

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

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

-	 *

-	 * @generated

-	 */

-	protected ConcernItemProvider concernItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.viewpoints.iso42010.Concern}.

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createConcernAdapter() {

-		if (concernItemProvider == null) {

-			concernItemProvider = new ConcernItemProvider(this);

-		}

-

-		return concernItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.viewpoints.iso42010.System} instances.

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

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

-	 *

-	 * @generated

-	 */

-	protected SystemItemProvider systemItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.viewpoints.iso42010.System}.

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createSystemAdapter() {

-		if (systemItemProvider == null) {

-			systemItemProvider = new SystemItemProvider(this);

-		}

-

-		return systemItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.viewpoints.iso42010.Architecture} instances.

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

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

-	 *

-	 * @generated

-	 */

-	protected ArchitectureItemProvider architectureItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.viewpoints.iso42010.Architecture}.

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createArchitectureAdapter() {

-		if (architectureItemProvider == null) {

-			architectureItemProvider = new ArchitectureItemProvider(this);

-		}

-

-		return architectureItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureRationale} instances.

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

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

-	 *

-	 * @generated

-	 */

-	protected ArchitectureRationaleItemProvider architectureRationaleItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureRationale}.

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createArchitectureRationaleAdapter() {

-		if (architectureRationaleItemProvider == null) {

-			architectureRationaleItemProvider = new ArchitectureRationaleItemProvider(this);

-		}

-

-		return architectureRationaleItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.viewpoints.iso42010.Correspondence} instances.

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

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

-	 *

-	 * @generated

-	 */

-	protected CorrespondenceItemProvider correspondenceItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.viewpoints.iso42010.Correspondence}.

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createCorrespondenceAdapter() {

-		if (correspondenceItemProvider == null) {

-			correspondenceItemProvider = new CorrespondenceItemProvider(this);

-		}

-

-		return correspondenceItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.viewpoints.iso42010.CorrespondenceRule} instances.

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

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

-	 *

-	 * @generated

-	 */

-	protected CorrespondenceRuleItemProvider correspondenceRuleItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.viewpoints.iso42010.CorrespondenceRule}.

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createCorrespondenceRuleAdapter() {

-		if (correspondenceRuleItemProvider == null) {

-			correspondenceRuleItemProvider = new CorrespondenceRuleItemProvider(this);

-		}

-

-		return correspondenceRuleItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision} instances.

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

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

-	 *

-	 * @generated

-	 */

-	protected ArchitectureDecisionItemProvider architectureDecisionItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision}.

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createArchitectureDecisionAdapter() {

-		if (architectureDecisionItemProvider == null) {

-			architectureDecisionItemProvider = new ArchitectureDecisionItemProvider(this);

-		}

-

-		return architectureDecisionItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureFramework} instances.

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

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

-	 *

-	 * @generated

-	 */

-	protected ArchitectureFrameworkItemProvider architectureFrameworkItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureFramework}.

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createArchitectureFrameworkAdapter() {

-		if (architectureFrameworkItemProvider == null) {

-			architectureFrameworkItemProvider = new ArchitectureFrameworkItemProvider(this);

-		}

-

-		return architectureFrameworkItemProvider;

-	}

-

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	public ComposeableAdapterFactory getRootAdapterFactory() {

-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

-	}

-

-	/**

-	 * This sets the composed adapter factory that contains this factory.

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

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

-	 *

-	 * @generated

-	 */

-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

-		this.parentAdapterFactory = parentAdapterFactory;

-	}

-

-	/**

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object type) {

-		return supportedTypes.contains(type) || super.isFactoryForType(type);

-	}

-

-	/**

-	 * This implementation substitutes the factory itself as the key for the adapter.

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter adapt(Notifier notifier, Object type) {

-		return super.adapt(notifier, this);

-	}

-

-	/**

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object adapt(Object object, Object type) {

-		if (isFactoryForType(type)) {

-			Object adapter = super.adapt(object, type);

-			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {

-				return adapter;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * This adds a listener.

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

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

-	 *

-	 * @generated

-	 */

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

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

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

-	 *

-	 * @generated

-	 */

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

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

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

-	 *

-	 * @generated

-	 */

-	public void fireNotifyChanged(Notification notification) {

-		changeNotifier.fireNotifyChanged(notification);

-

-		if (parentAdapterFactory != null) {

-			parentAdapterFactory.fireNotifyChanged(notification);

-		}

-	}

-

-	/**

-	 * This disposes all of the item providers created by this factory.

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

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

-	 *

-	 * @generated

-	 */

-	public void dispose() {

-		if (architectureDescriptionItemProvider != null) {

-			architectureDescriptionItemProvider.dispose();

-		}

-		if (stakeholderItemProvider != null) {

-			stakeholderItemProvider.dispose();

-		}

-		if (architectureViewpointItemProvider != null) {

-			architectureViewpointItemProvider.dispose();

-		}

-		if (modelKindItemProvider != null) {

-			modelKindItemProvider.dispose();

-		}

-		if (architectureModelItemProvider != null) {

-			architectureModelItemProvider.dispose();

-		}

-		if (architectureViewItemProvider != null) {

-			architectureViewItemProvider.dispose();

-		}

-		if (concernItemProvider != null) {

-			concernItemProvider.dispose();

-		}

-		if (systemItemProvider != null) {

-			systemItemProvider.dispose();

-		}

-		if (architectureItemProvider != null) {

-			architectureItemProvider.dispose();

-		}

-		if (architectureRationaleItemProvider != null) {

-			architectureRationaleItemProvider.dispose();

-		}

-		if (correspondenceItemProvider != null) {

-			correspondenceItemProvider.dispose();

-		}

-		if (correspondenceRuleItemProvider != null) {

-			correspondenceRuleItemProvider.dispose();

-		}

-		if (architectureDecisionItemProvider != null) {

-			architectureDecisionItemProvider.dispose();

-		}

-		if (architectureFrameworkItemProvider != null) {

-			architectureFrameworkItemProvider.dispose();

-		}

-	}

-

-}

+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import java.util.List;
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.provider.ChangeNotifier;
+import org.eclipse.emf.edit.provider.ChildCreationExtenderManager;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IChangeNotifier;
+import org.eclipse.emf.edit.provider.IChildCreationExtender;
+import org.eclipse.emf.edit.provider.IDisposable;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.INotifyChangedListener;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
+import org.eclipse.papyrus.infra.core.architecture.util.ArchitectureAdapterFactory;
+
+/**
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * Note that most of the adapters are shared among multiple instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ArchitectureItemProviderAdapterFactory extends ArchitectureAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable, IChildCreationExtender {
+	/**
+	 * This keeps track of the root adapter factory that delegates to this adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory parentAdapterFactory;
+
+	/**
+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IChangeNotifier changeNotifier = new ChangeNotifier();
+
+	/**
+	 * This helps manage the child creation extenders.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(ArchitectureEditPlugin.INSTANCE, ArchitecturePackage.eNS_URI);
+
+	/**
+	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Object> supportedTypes = new ArrayList<Object>();
+
+	/**
+	 * This constructs an instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ArchitectureItemProviderAdapterFactory() {
+		supportedTypes.add(IEditingDomainItemProvider.class);
+		supportedTypes.add(IStructuredItemContentProvider.class);
+		supportedTypes.add(ITreeItemContentProvider.class);
+		supportedTypes.add(IItemLabelProvider.class);
+		supportedTypes.add(IItemPropertySource.class);
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ArchitectureDomainItemProvider architectureDomainItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createArchitectureDomainAdapter() {
+		if (architectureDomainItemProvider == null) {
+			architectureDomainItemProvider = new ArchitectureDomainItemProvider(this);
+		}
+
+		return architectureDomainItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ArchitectureDescriptionLanguageItemProvider architectureDescriptionLanguageItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createArchitectureDescriptionLanguageAdapter() {
+		if (architectureDescriptionLanguageItemProvider == null) {
+			architectureDescriptionLanguageItemProvider = new ArchitectureDescriptionLanguageItemProvider(this);
+		}
+
+		return architectureDescriptionLanguageItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.core.architecture.Stakeholder} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected StakeholderItemProvider stakeholderItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.core.architecture.Stakeholder}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createStakeholderAdapter() {
+		if (stakeholderItemProvider == null) {
+			stakeholderItemProvider = new StakeholderItemProvider(this);
+		}
+
+		return stakeholderItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.core.architecture.Concern} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ConcernItemProvider concernItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.core.architecture.Concern}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createConcernAdapter() {
+		if (concernItemProvider == null) {
+			concernItemProvider = new ConcernItemProvider(this);
+		}
+
+		return concernItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ArchitectureViewpointItemProvider architectureViewpointItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createArchitectureViewpointAdapter() {
+		if (architectureViewpointItemProvider == null) {
+			architectureViewpointItemProvider = new ArchitectureViewpointItemProvider(this);
+		}
+
+		return architectureViewpointItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.core.architecture.ArchitectureFramework} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ArchitectureFrameworkItemProvider architectureFrameworkItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.core.architecture.ArchitectureFramework}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createArchitectureFrameworkAdapter() {
+		if (architectureFrameworkItemProvider == null) {
+			architectureFrameworkItemProvider = new ArchitectureFrameworkItemProvider(this);
+		}
+
+		return architectureFrameworkItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDescription} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ArchitectureDescriptionItemProvider architectureDescriptionItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDescription}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createArchitectureDescriptionAdapter() {
+		if (architectureDescriptionItemProvider == null) {
+			architectureDescriptionItemProvider = new ArchitectureDescriptionItemProvider(this);
+		}
+
+		return architectureDescriptionItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionPreferences} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ArchitectureDescriptionPreferencesItemProvider architectureDescriptionPreferencesItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionPreferences}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createArchitectureDescriptionPreferencesAdapter() {
+		if (architectureDescriptionPreferencesItemProvider == null) {
+			architectureDescriptionPreferencesItemProvider = new ArchitectureDescriptionPreferencesItemProvider(this);
+		}
+
+		return architectureDescriptionPreferencesItemProvider;
+	}
+
+	/**
+	 * This returns the root adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ComposeableAdapterFactory getRootAdapterFactory() {
+		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
+	}
+
+	/**
+	 * This sets the composed adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
+		this.parentAdapterFactory = parentAdapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object type) {
+		return supportedTypes.contains(type) || super.isFactoryForType(type);
+	}
+
+	/**
+	 * This implementation substitutes the factory itself as the key for the adapter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter adapt(Notifier notifier, Object type) {
+		return super.adapt(notifier, this);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object adapt(Object object, Object type) {
+		if (isFactoryForType(type)) {
+			Object adapter = super.adapt(object, type);
+			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
+				return adapter;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public List<IChildCreationExtender> getChildCreationExtenders() {
+		return childCreationExtenderManager.getChildCreationExtenders();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Collection<?> getNewChildDescriptors(Object object, EditingDomain editingDomain) {
+		return childCreationExtenderManager.getNewChildDescriptors(object, editingDomain);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ResourceLocator getResourceLocator() {
+		return childCreationExtenderManager;
+	}
+
+	/**
+	 * This adds a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void addListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.addListener(notifyChangedListener);
+	}
+
+	/**
+	 * This removes a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void removeListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.removeListener(notifyChangedListener);
+	}
+
+	/**
+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void fireNotifyChanged(Notification notification) {
+		changeNotifier.fireNotifyChanged(notification);
+
+		if (parentAdapterFactory != null) {
+			parentAdapterFactory.fireNotifyChanged(notification);
+		}
+	}
+
+	/**
+	 * This disposes all of the item providers created by this factory. 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void dispose() {
+		if (architectureDomainItemProvider != null) architectureDomainItemProvider.dispose();
+		if (architectureDescriptionLanguageItemProvider != null) architectureDescriptionLanguageItemProvider.dispose();
+		if (stakeholderItemProvider != null) stakeholderItemProvider.dispose();
+		if (concernItemProvider != null) concernItemProvider.dispose();
+		if (architectureViewpointItemProvider != null) architectureViewpointItemProvider.dispose();
+		if (architectureFrameworkItemProvider != null) architectureFrameworkItemProvider.dispose();
+		if (architectureDescriptionItemProvider != null) architectureDescriptionItemProvider.dispose();
+		if (architectureDescriptionPreferencesItemProvider != null) architectureDescriptionPreferencesItemProvider.dispose();
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureViewpointItemProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureViewpointItemProvider.java
new file mode 100644
index 00000000000..5fa1c273ce4
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureViewpointItemProvider.java
@@ -0,0 +1,188 @@
+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture.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.IItemPropertyDescriptor;
+
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ArchitectureViewpointItemProvider extends ADElementItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ArchitectureViewpointItemProvider(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);
+
+			addConcernsPropertyDescriptor(object);
+			addRepresentationKindsPropertyDescriptor(object);
+			addIdPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Concerns feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addConcernsPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ArchitectureViewpoint_concerns_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_ArchitectureViewpoint_concerns_feature", "_UI_ArchitectureViewpoint_type"),
+				 ArchitecturePackage.Literals.ARCHITECTURE_VIEWPOINT__CONCERNS,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Representation Kinds feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addRepresentationKindsPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ArchitectureViewpoint_representationKinds_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_ArchitectureViewpoint_representationKinds_feature", "_UI_ArchitectureViewpoint_type"),
+				 ArchitecturePackage.Literals.ARCHITECTURE_VIEWPOINT__REPRESENTATION_KINDS,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Id feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addIdPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ArchitectureViewpoint_id_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_ArchitectureViewpoint_id_feature", "_UI_ArchitectureViewpoint_type"),
+				 ArchitecturePackage.Literals.ARCHITECTURE_VIEWPOINT__ID,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns ArchitectureViewpoint.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ArchitectureViewpoint"));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((ArchitectureViewpoint)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_ArchitectureViewpoint_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(ArchitectureViewpoint.class)) {
+			case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__ID:
+				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/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/ArchitectureModelItemProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ConcernItemProvider.java
index bf855b87d29..d2f200f53cf 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/ArchitectureModelItemProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ConcernItemProvider.java
@@ -1,152 +1,109 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010.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.infra.viewpoints.iso42010.ArchitectureModel;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureModel} object.

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

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

- *

- * @generated

- */

-public class ArchitectureModelItemProvider

-		extends ADElementItemProvider

-		implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	public ArchitectureModelItemProvider(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);

-

-			addGovernedByPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Governed By feature.

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

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

-	 *

-	 * @generated

-	 */

-	protected void addGovernedByPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_ArchitectureModel_governedBy_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_ArchitectureModel_governedBy_feature", "_UI_ArchitectureModel_type"),

-						Iso42010Package.Literals.ARCHITECTURE_MODEL__GOVERNED_BY,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

-	 * This returns ArchitectureModel.gif.

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

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

-	}

-

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((ArchitectureModel) object).getName();

-		return label == null || label.length() == 0 ?

-				getString("_UI_ArchitectureModel_type") :

-				getString("_UI_ArchitectureModel_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);

-	}

-

-}

+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture.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.IItemPropertyDescriptor;
+import org.eclipse.papyrus.infra.core.architecture.Concern;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.core.architecture.Concern} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ConcernItemProvider extends ADElementItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ConcernItemProvider(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 returns Concern.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/Concern"));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((Concern)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_Concern_type") :
+			getString("_UI_Concern_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/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/ArchitectureRationaleItemProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/RepresentationKindItemProvider.java
index 132f5cd26a3..65b4a3a5f14 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/ArchitectureRationaleItemProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/RepresentationKindItemProvider.java
@@ -1,152 +1,155 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010.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.infra.viewpoints.iso42010.ArchitectureRationale;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureRationale} object.

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

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

- *

- * @generated

- */

-public class ArchitectureRationaleItemProvider

-		extends ADElementItemProvider

-		implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	public ArchitectureRationaleItemProvider(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);

-

-			addJustifiesPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	protected void addJustifiesPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_ArchitectureRationale_justifies_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_ArchitectureRationale_justifies_feature", "_UI_ArchitectureRationale_type"),

-						Iso42010Package.Literals.ARCHITECTURE_RATIONALE__JUSTIFIES,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

-	 * This returns ArchitectureRationale.gif.

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

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

-	}

-

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((ArchitectureRationale) object).getName();

-		return label == null || label.length() == 0 ?

-				getString("_UI_ArchitectureRationale_type") :

-				getString("_UI_ArchitectureRationale_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);

-	}

-

-}

+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture.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.IItemPropertyDescriptor;
+
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
+import org.eclipse.papyrus.infra.core.architecture.RepresentationKind;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.core.architecture.RepresentationKind} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class RepresentationKindItemProvider extends ADElementItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RepresentationKindItemProvider(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);
+
+			addConcernsPropertyDescriptor(object);
+			addIconPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Concerns feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addConcernsPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_RepresentationKind_concerns_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_RepresentationKind_concerns_feature", "_UI_RepresentationKind_type"),
+				 ArchitecturePackage.Literals.REPRESENTATION_KIND__CONCERNS,
+				 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_RepresentationKind_icon_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_RepresentationKind_icon_feature", "_UI_RepresentationKind_type"),
+				 ArchitecturePackage.Literals.REPRESENTATION_KIND__ICON,
+				 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 = ((RepresentationKind)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_RepresentationKind_type") :
+			getString("_UI_RepresentationKind_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(RepresentationKind.class)) {
+			case ArchitecturePackage.REPRESENTATION_KIND__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);
+	}
+
+}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/ModelKindItemProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/StakeholderItemProvider.java
index f2c64101807..a7a950928e0 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/ModelKindItemProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/StakeholderItemProvider.java
@@ -1,152 +1,134 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010.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.infra.viewpoints.iso42010.Iso42010Package;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ModelKind;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ModelKind} object.

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

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

- *

- * @generated

- */

-public class ModelKindItemProvider

-		extends ADElementItemProvider

-		implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	public ModelKindItemProvider(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);

-

-			addGovernsPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	protected void addGovernsPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_ModelKind_governs_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_ModelKind_governs_feature", "_UI_ModelKind_type"),

-						Iso42010Package.Literals.MODEL_KIND__GOVERNS,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

-	 * This returns ModelKind.gif.

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

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

-	}

-

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((ModelKind) object).getName();

-		return label == null || label.length() == 0 ?

-				getString("_UI_ModelKind_type") :

-				getString("_UI_ModelKind_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);

-	}

-

-}

+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture.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.IItemPropertyDescriptor;
+import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
+import org.eclipse.papyrus.infra.core.architecture.Stakeholder;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.core.architecture.Stakeholder} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class StakeholderItemProvider extends ADElementItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public StakeholderItemProvider(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);
+
+			addConcernsPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Concerns feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addConcernsPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_Stakeholder_concerns_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_Stakeholder_concerns_feature", "_UI_Stakeholder_type"),
+				 ArchitecturePackage.Literals.STAKEHOLDER__CONCERNS,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns Stakeholder.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/Stakeholder"));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((Stakeholder)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_Stakeholder_type") :
+			getString("_UI_Stakeholder_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/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/EPackagePropertyDescriptor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src/org/eclipse/papyrus/infra/core/architecture/provider/EPackagePropertyDescriptor.java
index 59e1e78be4b..f41c20271a8 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/EPackagePropertyDescriptor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src/org/eclipse/papyrus/infra/core/architecture/provider/EPackagePropertyDescriptor.java
@@ -8,10 +8,10 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *  Maged Elaasar - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.infra.viewpoints.configuration;
+package org.eclipse.papyrus.infra.core.architecture.provider;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -35,13 +35,17 @@ public class EPackagePropertyDescriptor extends SurrogateItemPropertyDescriptor
 	public Collection<?> getChoiceOfValues(Object object) {
 		EPackage.Registry reg = EPackage.Registry.INSTANCE;
 		Collection<EPackage> result = new ArrayList<EPackage>(reg.size());
-		Collection<String> keys = new ArrayList<String>(reg.keySet());
-		for (String key : keys) {
-			EPackage pack = reg.getEPackage(key);
-			if (!result.contains(pack)) {
-				result.add(reg.getEPackage(key));
+			Collection<String> keys = new ArrayList<String>(reg.keySet());
+			for (String key : keys) {
+				try {
+					EPackage pack = reg.getEPackage(key);
+					if (!result.contains(pack)) {
+						result.add(reg.getEPackage(key));
+					}
+				} catch (Throwable e) {
+					continue;
+				}
 			}
-		}
 		return result;
 	}
 
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/ProfilePropertyDescriptor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src/org/eclipse/papyrus/infra/core/architecture/provider/ProfilePropertyDescriptor.java
index c9a716e472d..4e027f9c315 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/ProfilePropertyDescriptor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src/org/eclipse/papyrus/infra/core/architecture/provider/ProfilePropertyDescriptor.java
@@ -8,10 +8,10 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *  Maged Elaasar - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.infra.viewpoints.configuration;
+package org.eclipse.papyrus.infra.core.architecture.provider;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EPackage;
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/SurrogateItemPropertyDescriptor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src/org/eclipse/papyrus/infra/core/architecture/provider/SurrogateItemPropertyDescriptor.java
index a195f2bfeb0..ccd289506f0 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/SurrogateItemPropertyDescriptor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src/org/eclipse/papyrus/infra/core/architecture/provider/SurrogateItemPropertyDescriptor.java
@@ -8,10 +8,10 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *  Maged Elaasar - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.infra.viewpoints.configuration;
+package org.eclipse.papyrus.infra.core.architecture.provider;
 
 import java.util.Collection;
 
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/.classpath b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/.classpath
index 1bdc2a0ba05..858bac421b8 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/.classpath
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/.classpath
@@ -1,7 +1,7 @@
 <?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-gen"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/.project b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/.project
new file mode 100644
index 00000000000..56e93529b03
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.core.architecture</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.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/.settings/org.eclipse.core.resources.prefs b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000000..0081e162807
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding//model/Architecture.ecore_diagram=UTF-8
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..700d32b2ea2
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/META-INF/MANIFEST.MF
@@ -0,0 +1,18 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.infra.core.architecture;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.papyrus.infra.core.architecture,
+ org.eclipse.papyrus.infra.core.architecture.impl,
+ org.eclipse.papyrus.infra.core.architecture.util
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
+Bundle-ActivationPolicy: lazy
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/about.html b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/about.html
new file mode 100644
index 00000000000..bbf2bd6aac7
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/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>January 30, 2017</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/infra/core/org.eclipse.papyrus.infra.core.architecture/build.properties b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/build.properties
new file mode 100644
index 00000000000..f1e95a9b343
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/build.properties
@@ -0,0 +1,20 @@
+* Copyright (c) 2017 CEA LIST.
+# 
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#  
+#  Contributors:
+#  Maged Elaasar - Initial API and implementation
+#  
+# 
+
+bin.includes = .,\
+               model/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties
+jars.compile.order = .
+source.. = src-gen/
+output.. = bin/
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.aird b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.aird
new file mode 100644
index 00000000000..6069591253c
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.aird
@@ -0,0 +1,977 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style">
+  <viewpoint:DAnalysis xmi:id="_xGjjUO0AEeaf8aQEde1Z1Q" selectedViews="_ya3q4O0AEeaf8aQEde1Z1Q _ybEfMO0AEeaf8aQEde1Z1Q _ybFtUO0AEeaf8aQEde1Z1Q _ybMbAO0AEeaf8aQEde1Z1Q" version="11.1.0.201608251200">
+    <semanticResources>Architecture.ecore</semanticResources>
+    <semanticResources>http://www.eclipse.org/emf/2002/Ecore</semanticResources>
+    <semanticResources>platform:/resource/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore</semanticResources>
+    <semanticResources>Architecture.genmodel</semanticResources>
+    <semanticResources>platform:/resource/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel</semanticResources>
+    <ownedViews xmi:type="viewpoint:DView" xmi:id="_ya3q4O0AEeaf8aQEde1Z1Q">
+      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" xmi:id="_5z_NgO0AEeaf8aQEde1Z1Q" name="architecture class diagram" representation="_5z_0kO0AEeaf8aQEde1Z1Q">
+        <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
+        <target xmi:type="ecore:EPackage" href="Architecture.ecore#/"/>
+      </ownedRepresentationDescriptors>
+    </ownedViews>
+    <ownedViews xmi:type="viewpoint:DView" xmi:id="_ybEfMO0AEeaf8aQEde1Z1Q">
+      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']"/>
+    </ownedViews>
+    <ownedViews xmi:type="viewpoint:DView" xmi:id="_ybFtUO0AEeaf8aQEde1Z1Q">
+      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Archetype']"/>
+    </ownedViews>
+    <ownedViews xmi:type="viewpoint:DView" xmi:id="_ybMbAO0AEeaf8aQEde1Z1Q">
+      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Generation']"/>
+    </ownedViews>
+  </viewpoint:DAnalysis>
+  <diagram:DSemanticDiagram xmi:id="_5z_0kO0AEeaf8aQEde1Z1Q" name="architecture class diagram">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_5z_0ke0AEeaf8aQEde1Z1Q" source="DANNOTATION_CUSTOMIZATION_KEY">
+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_5z_0ku0AEeaf8aQEde1Z1Q">
+        <computedStyleDescriptions xmi:type="style:BundledImageDescription" xmi:id="_7Qb9YO0AEeaf8aQEde1Z1Q" labelExpression="service:render" labelAlignment="LEFT" tooltipExpression="service:renderTooltip" sizeComputationExpression="1">
+          <borderColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <labelFormat>bold</labelFormat>
+          <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <color xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+        </computedStyleDescriptions>
+        <computedStyleDescriptions xmi:type="style:BundledImageDescription" xmi:id="_7QirEO0AEeaf8aQEde1Z1Q" labelExpression="service:render" labelAlignment="LEFT" tooltipExpression="service:renderTooltip" sizeComputationExpression="1">
+          <borderColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
+          <color xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+        </computedStyleDescriptions>
+        <computedStyleDescriptions xmi:type="style:BundledImageDescription" xmi:id="_7Qr1AO0AEeaf8aQEde1Z1Q" labelExpression="service:renderAsNode" labelAlignment="LEFT" tooltipExpression="service:renderTooltip" sizeComputationExpression="1">
+          <borderColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <labelFormat>bold</labelFormat>
+          <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <color xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
+        </computedStyleDescriptions>
+        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_7SFjMO0AEeaf8aQEde1Z1Q" sourceArrow="FillDiamond" routingStyle="manhattan">
+          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <beginLabelStyleDescription xmi:type="style:BeginLabelStyleDescription" xmi:id="_7SFjMe0AEeaf8aQEde1Z1Q" showIcon="false" labelExpression="service:renderEOpposite">
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          </beginLabelStyleDescription>
+          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_7SFjMu0AEeaf8aQEde1Z1Q" showIcon="false" labelExpression="service:render">
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          </endLabelStyleDescription>
+        </computedStyleDescriptions>
+        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_7SMQ4O0AEeaf8aQEde1Z1Q" sourceArrow="InputArrow" targetArrow="FillDiamond" routingStyle="manhattan">
+          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <beginLabelStyleDescription xmi:type="style:BeginLabelStyleDescription" xmi:id="_7SMQ4e0AEeaf8aQEde1Z1Q" showIcon="false" labelExpression="service:renderEOpposite">
+            <labelFormat>bold</labelFormat>
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          </beginLabelStyleDescription>
+          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_7SMQ4u0AEeaf8aQEde1Z1Q" showIcon="false" labelExpression="service:render">
+            <labelFormat>bold</labelFormat>
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          </endLabelStyleDescription>
+        </computedStyleDescriptions>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_53Qj8O0AEeaf8aQEde1Z1Q" source="GMF_DIAGRAMS">
+      <data xmi:type="notation:Diagram" xmi:id="_53Qj8e0AEeaf8aQEde1Z1Q" type="Sirius" element="_5z_0kO0AEeaf8aQEde1Z1Q" measurementUnit="Pixel">
+        <children xmi:type="notation:Node" xmi:id="_7SZsQO0AEeaf8aQEde1Z1Q" type="2003" element="_7PdF8O0AEeaf8aQEde1Z1Q">
+          <children xmi:type="notation:Node" xmi:id="_7SbhcO0AEeaf8aQEde1Z1Q" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_7Sfy4O0AEeaf8aQEde1Z1Q" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_7StOQO0AEeaf8aQEde1Z1Q" type="3010" element="_7QZhIO0AEeaf8aQEde1Z1Q">
+              <styles xmi:type="notation:FontStyle" xmi:id="_7StOQe0AEeaf8aQEde1Z1Q" fontName=".SF NS Text" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_7StOQu0AEeaf8aQEde1Z1Q"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_7St1UO0AEeaf8aQEde1Z1Q" type="3010" element="_7Qg14O0AEeaf8aQEde1Z1Q">
+              <styles xmi:type="notation:FontStyle" xmi:id="_7St1Ue0AEeaf8aQEde1Z1Q" fontName=".SF NS Text" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_7St1Uu0AEeaf8aQEde1Z1Q"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_7St1U-0AEeaf8aQEde1Z1Q" type="3010" element="_7QiEAO0AEeaf8aQEde1Z1Q">
+              <styles xmi:type="notation:FontStyle" xmi:id="_7St1VO0AEeaf8aQEde1Z1Q" fontColor="7490599" fontName=".SF NS Text" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_7St1Ve0AEeaf8aQEde1Z1Q"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_7Sfy4e0AEeaf8aQEde1Z1Q"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_7Sfy4u0AEeaf8aQEde1Z1Q"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_7SZsQe0AEeaf8aQEde1Z1Q" fontName=".SF NS Text" fontHeight="8" italic="true"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7SZsQu0AEeaf8aQEde1Z1Q" x="267" y="21" height="82"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_7SgZ8O0AEeaf8aQEde1Z1Q" type="2003" element="_7Pp6QO0AEeaf8aQEde1Z1Q">
+          <children xmi:type="notation:Node" xmi:id="_7ShoEO0AEeaf8aQEde1Z1Q" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_7ShoEe0AEeaf8aQEde1Z1Q" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_7ShoEu0AEeaf8aQEde1Z1Q"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_7ShoE-0AEeaf8aQEde1Z1Q"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_7SgZ8e0AEeaf8aQEde1Z1Q" fontName=".SF NS Text" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7SgZ8u0AEeaf8aQEde1Z1Q" x="123" y="117" height="57"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_7SiPIO0AEeaf8aQEde1Z1Q" type="2003" element="_7Ps9kO0AEeaf8aQEde1Z1Q">
+          <children xmi:type="notation:Node" xmi:id="_7SjdQO0AEeaf8aQEde1Z1Q" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_7SjdQe0AEeaf8aQEde1Z1Q" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_7SucYO0AEeaf8aQEde1Z1Q" type="3010" element="_7QkgQO0AEeaf8aQEde1Z1Q">
+              <styles xmi:type="notation:FontStyle" xmi:id="_7SucYe0AEeaf8aQEde1Z1Q" fontName=".SF NS Text" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_7SucYu0AEeaf8aQEde1Z1Q"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_7SucY-0AEeaf8aQEde1Z1Q" type="3010" element="_7QtDIO0AEeaf8aQEde1Z1Q">
+              <styles xmi:type="notation:FontStyle" xmi:id="_7SucZO0AEeaf8aQEde1Z1Q" fontName=".SF NS Text" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_7SucZe0AEeaf8aQEde1Z1Q"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_7SjdQu0AEeaf8aQEde1Z1Q"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_7SjdQ-0AEeaf8aQEde1Z1Q"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_7SiPIe0AEeaf8aQEde1Z1Q" fontName=".SF NS Text" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7SiPIu0AEeaf8aQEde1Z1Q" x="324" y="270" height="66"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_7SkEUO0AEeaf8aQEde1Z1Q" type="2003" element="_7PvZ0O0AEeaf8aQEde1Z1Q">
+          <children xmi:type="notation:Node" xmi:id="_7SkrYO0AEeaf8aQEde1Z1Q" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_7SlScO0AEeaf8aQEde1Z1Q" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_7SlSce0AEeaf8aQEde1Z1Q"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_7SlScu0AEeaf8aQEde1Z1Q"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_7SkEUe0AEeaf8aQEde1Z1Q" fontName=".SF NS Text" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7SkEUu0AEeaf8aQEde1Z1Q" x="126" y="274" height="57"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_7SlSc-0AEeaf8aQEde1Z1Q" type="2003" element="_7PxPAO0AEeaf8aQEde1Z1Q">
+          <children xmi:type="notation:Node" xmi:id="_7Sl5gO0AEeaf8aQEde1Z1Q" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_7Sl5ge0AEeaf8aQEde1Z1Q" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_7SmgkO0AEeaf8aQEde1Z1Q"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_7Smgke0AEeaf8aQEde1Z1Q"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_7SlSdO0AEeaf8aQEde1Z1Q" fontName=".SF NS Text" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7SlSde0AEeaf8aQEde1Z1Q" x="123" y="432" height="57"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_7Smgku0AEeaf8aQEde1Z1Q" type="2003" element="_7PzEMO0AEeaf8aQEde1Z1Q">
+          <children xmi:type="notation:Node" xmi:id="_7SnHoO0AEeaf8aQEde1Z1Q" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_7SnHoe0AEeaf8aQEde1Z1Q" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_7SvDcO0AEeaf8aQEde1Z1Q" type="3010" element="_7Qu4UO0AEeaf8aQEde1Z1Q">
+              <styles xmi:type="notation:FontStyle" xmi:id="_7SvDce0AEeaf8aQEde1Z1Q" fontName=".SF NS Text" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_7SvDcu0AEeaf8aQEde1Z1Q"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_7SnHou0AEeaf8aQEde1Z1Q"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_7SnHo-0AEeaf8aQEde1Z1Q"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_7Smgk-0AEeaf8aQEde1Z1Q" fontName=".SF NS Text" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7SmglO0AEeaf8aQEde1Z1Q" x="600" y="432" height="57"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_7SnHpO0AEeaf8aQEde1Z1Q" type="2003" element="_7P1gcO0AEeaf8aQEde1Z1Q">
+          <children xmi:type="notation:Node" xmi:id="_7SnusO0AEeaf8aQEde1Z1Q" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_7So80O0AEeaf8aQEde1Z1Q" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_7SvqgO0AEeaf8aQEde1Z1Q" type="3010" element="_7QxUkO0AEeaf8aQEde1Z1Q">
+              <styles xmi:type="notation:FontStyle" xmi:id="_7Svqge0AEeaf8aQEde1Z1Q" fontName=".SF NS Text" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_7Svqgu0AEeaf8aQEde1Z1Q"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_7So80e0AEeaf8aQEde1Z1Q"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_7So80u0AEeaf8aQEde1Z1Q"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_7SnHpe0AEeaf8aQEde1Z1Q" fontName=".SF NS Text" fontHeight="8" italic="true"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7SnHpu0AEeaf8aQEde1Z1Q" x="339" y="432" height="57"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_7So80-0AEeaf8aQEde1Z1Q" type="2003" element="_7P5x4O0AEeaf8aQEde1Z1Q">
+          <children xmi:type="notation:Node" xmi:id="_7Spj4O0AEeaf8aQEde1Z1Q" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_7Spj4e0AEeaf8aQEde1Z1Q" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_7Svqg-0AEeaf8aQEde1Z1Q" type="3010" element="_7QyisO0AEeaf8aQEde1Z1Q">
+              <styles xmi:type="notation:FontStyle" xmi:id="_7SvqhO0AEeaf8aQEde1Z1Q" fontName=".SF NS Text" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_7Svqhe0AEeaf8aQEde1Z1Q"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_7SwRkO0AEeaf8aQEde1Z1Q" type="3010" element="_7Q0X4O0AEeaf8aQEde1Z1Q">
+              <styles xmi:type="notation:FontStyle" xmi:id="_7SwRke0AEeaf8aQEde1Z1Q" fontName=".SF NS Text" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_7SwRku0AEeaf8aQEde1Z1Q"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_7SwRk-0AEeaf8aQEde1Z1Q" type="3010" element="_7Q0-8e0AEeaf8aQEde1Z1Q">
+              <styles xmi:type="notation:FontStyle" xmi:id="_7SwRlO0AEeaf8aQEde1Z1Q" fontName=".SF NS Text" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_7SwRle0AEeaf8aQEde1Z1Q"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_7SwRlu0AEeaf8aQEde1Z1Q" type="3010" element="_7Q2NEO0AEeaf8aQEde1Z1Q">
+              <styles xmi:type="notation:FontStyle" xmi:id="_7SwRl-0AEeaf8aQEde1Z1Q" fontName=".SF NS Text" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_7SwRmO0AEeaf8aQEde1Z1Q"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_7Sw4oO0AEeaf8aQEde1Z1Q" type="3010" element="_7Q3bMO0AEeaf8aQEde1Z1Q">
+              <styles xmi:type="notation:FontStyle" xmi:id="_7Sw4oe0AEeaf8aQEde1Z1Q" fontName=".SF NS Text" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_7Sw4ou0AEeaf8aQEde1Z1Q"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_7Sw4o-0AEeaf8aQEde1Z1Q" type="3010" element="_7Q4pUO0AEeaf8aQEde1Z1Q">
+              <styles xmi:type="notation:FontStyle" xmi:id="_7Sw4pO0AEeaf8aQEde1Z1Q" fontName=".SF NS Text" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_7Sw4pe0AEeaf8aQEde1Z1Q"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_7Spj4u0AEeaf8aQEde1Z1Q"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_7Spj4-0AEeaf8aQEde1Z1Q"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_7So81O0AEeaf8aQEde1Z1Q" fontName=".SF NS Text" fontHeight="8" italic="true"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7So81e0AEeaf8aQEde1Z1Q" x="376" y="117"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_7SqK8O0AEeaf8aQEde1Z1Q" type="2003" element="_7P7nEO0AEeaf8aQEde1Z1Q">
+          <children xmi:type="notation:Node" xmi:id="_7SqK8-0AEeaf8aQEde1Z1Q" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_7SqyAO0AEeaf8aQEde1Z1Q" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_7SqyAe0AEeaf8aQEde1Z1Q"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_7SqyAu0AEeaf8aQEde1Z1Q"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_7SqK8e0AEeaf8aQEde1Z1Q" fontName=".SF NS Text" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7SqK8u0AEeaf8aQEde1Z1Q" x="495" y="270" height="66"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_7SqyA-0AEeaf8aQEde1Z1Q" type="2003" element="_7P9cQO0AEeaf8aQEde1Z1Q">
+          <children xmi:type="notation:Node" xmi:id="_7SrZEO0AEeaf8aQEde1Z1Q" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_7SrZEe0AEeaf8aQEde1Z1Q" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_7SxfsO0AEeaf8aQEde1Z1Q" type="3010" element="_7Q53cO0AEeaf8aQEde1Z1Q">
+              <styles xmi:type="notation:FontStyle" xmi:id="_7Sxfse0AEeaf8aQEde1Z1Q" fontName=".SF NS Text" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_7Sxfsu0AEeaf8aQEde1Z1Q"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_7SrZEu0AEeaf8aQEde1Z1Q"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_7SrZE-0AEeaf8aQEde1Z1Q"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_7SqyBO0AEeaf8aQEde1Z1Q" fontName=".SF NS Text" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7SqyBe0AEeaf8aQEde1Z1Q" x="234" y="189" height="55"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_anAukPaMEeazb43LOF1y5w" type="2003" element="_amJL4PaMEeazb43LOF1y5w">
+          <children xmi:type="notation:Node" xmi:id="_anjhIPaMEeazb43LOF1y5w" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_ankIMPaMEeazb43LOF1y5w" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_NLxcAPaNEeazb43LOF1y5w" type="3010" element="_7Q7FkO0AEeaf8aQEde1Z1Q">
+              <styles xmi:type="notation:FontStyle" xmi:id="_NLxcAfaNEeazb43LOF1y5w" fontName=".SF NS Text" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_NLxcAvaNEeazb43LOF1y5w"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_ankIMfaMEeazb43LOF1y5w"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_ankIMvaMEeazb43LOF1y5w"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_anAukfaMEeazb43LOF1y5w" fontName=".SF NS Text" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_anAukvaMEeazb43LOF1y5w" x="234" y="351" height="57"/>
+        </children>
+        <styles xmi:type="notation:DiagramStyle" xmi:id="_53Qj8u0AEeaf8aQEde1Z1Q"/>
+        <edges xmi:type="notation:Edge" xmi:id="_7S-UAO0AEeaf8aQEde1Z1Q" type="4001" element="_7REPgO0AEeaf8aQEde1Z1Q" source="_7SkEUO0AEeaf8aQEde1Z1Q" target="_7SlSc-0AEeaf8aQEde1Z1Q">
+          <children xmi:type="notation:Node" xmi:id="_7TAwQO0AEeaf8aQEde1Z1Q" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TAwQe0AEeaf8aQEde1Z1Q" x="38" y="33"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_7TB-YO0AEeaf8aQEde1Z1Q" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TB-Ye0AEeaf8aQEde1Z1Q" x="39" y="-7"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_7TDMgO0AEeaf8aQEde1Z1Q" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TDMge0AEeaf8aQEde1Z1Q" x="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_7S-UAe0AEeaf8aQEde1Z1Q" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_7S-UAu0AEeaf8aQEde1Z1Q" fontColor="7490599" fontName=".SF NS Text" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7S-UA-0AEeaf8aQEde1Z1Q" points="[-60, -10, 61, -122]$[-60, 93, 61, -19]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7TQA0O0AEeaf8aQEde1Z1Q" id="(1.0,1.1878787425648083)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7TQn4O0AEeaf8aQEde1Z1Q" id="(0.0,0.3563636363636364)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_7TQn4e0AEeaf8aQEde1Z1Q" type="4001" element="_7Rvk8O0AEeaf8aQEde1Z1Q" source="_7Smgku0AEeaf8aQEde1Z1Q" target="_7SlSc-0AEeaf8aQEde1Z1Q">
+          <children xmi:type="notation:Node" xmi:id="_7TRO8O0AEeaf8aQEde1Z1Q" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TRO8e0AEeaf8aQEde1Z1Q" x="198" y="13"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_7TR2AO0AEeaf8aQEde1Z1Q" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TR2Ae0AEeaf8aQEde1Z1Q" x="45" y="-9"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_7TR2Au0AEeaf8aQEde1Z1Q" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TR2A-0AEeaf8aQEde1Z1Q" x="-2" y="36"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_7TQn4u0AEeaf8aQEde1Z1Q" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_7TQn4-0AEeaf8aQEde1Z1Q" fontColor="7490599" fontName=".SF NS Text" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7TQn5O0AEeaf8aQEde1Z1Q" points="[-58, -3, 537, -23]$[-58, 19, 537, -1]$[-535, 19, 60, -1]$[-535, -3, 60, -23]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7TSdEO0AEeaf8aQEde1Z1Q" id="(1.0,1.069090909090909)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7TSdEe0AEeaf8aQEde1Z1Q" id="(0.0,1.4254545454545455)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_7TSdEu0AEeaf8aQEde1Z1Q" type="4001" element="_7RxaIO0AEeaf8aQEde1Z1Q" source="_7Smgku0AEeaf8aQEde1Z1Q" target="_7SnHpO0AEeaf8aQEde1Z1Q">
+          <children xmi:type="notation:Node" xmi:id="_7TTEIO0AEeaf8aQEde1Z1Q" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TTEIe0AEeaf8aQEde1Z1Q" x="12" y="-14"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_7TTEIu0AEeaf8aQEde1Z1Q" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TTEI-0AEeaf8aQEde1Z1Q" x="85" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_7TTEJO0AEeaf8aQEde1Z1Q" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TTEJe0AEeaf8aQEde1Z1Q" x="14" y="-10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_7TSdE-0AEeaf8aQEde1Z1Q" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_7TSdFO0AEeaf8aQEde1Z1Q" fontColor="7490599" fontName=".SF NS Text" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7TSdFe0AEeaf8aQEde1Z1Q" points="[-118, -3, 261, -29]$[-261, -3, 118, -29]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7TTrMO0AEeaf8aQEde1Z1Q" id="(1.0,0.7127272727272728)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7TTrMe0AEeaf8aQEde1Z1Q" id="(0.0,1.1878786066228695)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_7TTrMu0AEeaf8aQEde1Z1Q" type="4001" element="_7RyBM-0AEeaf8aQEde1Z1Q" source="_7SnHpO0AEeaf8aQEde1Z1Q" target="_7SlSc-0AEeaf8aQEde1Z1Q">
+          <children xmi:type="notation:Node" xmi:id="_7TUSQO0AEeaf8aQEde1Z1Q" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TUSQe0AEeaf8aQEde1Z1Q" x="12" y="-14"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_7TUSQu0AEeaf8aQEde1Z1Q" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TUSQ-0AEeaf8aQEde1Z1Q" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_7TU5UO0AEeaf8aQEde1Z1Q" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TU5Ue0AEeaf8aQEde1Z1Q" x="3" y="-10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_7TTrM-0AEeaf8aQEde1Z1Q" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_7TTrNO0AEeaf8aQEde1Z1Q" fontColor="7490599" fontName=".SF NS Text" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7TTrNe0AEeaf8aQEde1Z1Q" points="[-118, -5, 216, -31]$[-216, -5, 118, -31]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7TU5Uu0AEeaf8aQEde1Z1Q" id="(1.0,0.5939395751953125)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7TU5U-0AEeaf8aQEde1Z1Q" id="(0.0,1.069090909090909)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_7TU5VO0AEeaf8aQEde1Z1Q" type="4001" element="_7R0dcO0AEeaf8aQEde1Z1Q" source="_7SgZ8O0AEeaf8aQEde1Z1Q" target="_7SZsQO0AEeaf8aQEde1Z1Q">
+          <children xmi:type="notation:Node" xmi:id="_7TVgYO0AEeaf8aQEde1Z1Q" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TVgYe0AEeaf8aQEde1Z1Q" x="-2" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_7TVgYu0AEeaf8aQEde1Z1Q" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TVgY-0AEeaf8aQEde1Z1Q" x="-18" y="53"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_7TVgZO0AEeaf8aQEde1Z1Q" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TVgZe0AEeaf8aQEde1Z1Q" x="2" y="-31"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_7TU5Ve0AEeaf8aQEde1Z1Q" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_7TU5Vu0AEeaf8aQEde1Z1Q" fontName=".SF NS Text" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7TU5V-0AEeaf8aQEde1Z1Q" points="[-14, -39, -40, 69]$[-14, -65, -40, 43]$[26, -65, 0, 43]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7TWHcO0AEeaf8aQEde1Z1Q" id="(1.0,0.7127272727272728)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7TWHce0AEeaf8aQEde1Z1Q" id="(0.0,0.3499999732971191)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_7TWHcu0AEeaf8aQEde1Z1Q" type="4001" element="_7R5V8O0AEeaf8aQEde1Z1Q" source="_7SiPIO0AEeaf8aQEde1Z1Q" target="_7So80-0AEeaf8aQEde1Z1Q">
+          <children xmi:type="notation:Node" xmi:id="_7TWugO0AEeaf8aQEde1Z1Q" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TWuge0AEeaf8aQEde1Z1Q" x="-4" y="1"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_7TWugu0AEeaf8aQEde1Z1Q" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TWug-0AEeaf8aQEde1Z1Q" x="4" y="-5"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_7TWuhO0AEeaf8aQEde1Z1Q" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TWuhe0AEeaf8aQEde1Z1Q" x="-12"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_7TWHc-0AEeaf8aQEde1Z1Q" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_7TWHdO0AEeaf8aQEde1Z1Q" fontName=".SF NS Text" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7TWHde0AEeaf8aQEde1Z1Q" points="[-58, -32, 40, 78]$[-58, -60, 40, 50]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7TXVkO0AEeaf8aQEde1Z1Q" id="(1.0,0.5104168224334716)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7TXVke0AEeaf8aQEde1Z1Q" id="(0.0,0.6000000961183563)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_7TXVku0AEeaf8aQEde1Z1Q" type="4001" element="_7R7LIO0AEeaf8aQEde1Z1Q" source="_7SkEUO0AEeaf8aQEde1Z1Q" target="_7SZsQO0AEeaf8aQEde1Z1Q">
+          <children xmi:type="notation:Node" xmi:id="_7TX8oO0AEeaf8aQEde1Z1Q" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TX8oe0AEeaf8aQEde1Z1Q" x="-194" y="3"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_7TX8ou0AEeaf8aQEde1Z1Q" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TX8o-0AEeaf8aQEde1Z1Q" x="-14" y="12"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_7TX8pO0AEeaf8aQEde1Z1Q" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TX8pe0AEeaf8aQEde1Z1Q" x="12" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_7TXVk-0AEeaf8aQEde1Z1Q" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_7TXVlO0AEeaf8aQEde1Z1Q" fontName=".SF NS Text" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7TXVle0AEeaf8aQEde1Z1Q" points="[-118, 0, -141, 271]$[-193, 0, -216, 271]$[-193, -246, -216, 25]$[23, -246, 0, 25]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7TYjsO0AEeaf8aQEde1Z1Q" id="(1.0,0.5939393033114347)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7TYjse0AEeaf8aQEde1Z1Q" id="(0.0,0.1750000801086426)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_7TYjsu0AEeaf8aQEde1Z1Q" type="4001" element="_7R8ZQO0AEeaf8aQEde1Z1Q" source="_7SlSc-0AEeaf8aQEde1Z1Q" target="_7SZsQO0AEeaf8aQEde1Z1Q">
+          <children xmi:type="notation:Node" xmi:id="_7TZKwO0AEeaf8aQEde1Z1Q" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TZKwe0AEeaf8aQEde1Z1Q" x="-40" y="-8"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_7TZKwu0AEeaf8aQEde1Z1Q" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TZKw-0AEeaf8aQEde1Z1Q" x="-108" y="-5"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_7TZKxO0AEeaf8aQEde1Z1Q" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TZKxe0AEeaf8aQEde1Z1Q" x="-114" y="43"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_7TYjs-0AEeaf8aQEde1Z1Q" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_7TYjtO0AEeaf8aQEde1Z1Q" fontName=".SF NS Text" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7TYjte0AEeaf8aQEde1Z1Q" points="[-118, -4, -144, 414]$[-208, -4, -234, 414]$[-208, -444, -234, -26]$[26, -444, 0, -26]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7TZx0O0AEeaf8aQEde1Z1Q" id="(1.0,0.8909090909090909)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7TZx0e0AEeaf8aQEde1Z1Q" id="(0.0,0.5250000534057617)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_7TZx0u0AEeaf8aQEde1Z1Q" type="4001" element="_7R9nYO0AEeaf8aQEde1Z1Q" source="_7Smgku0AEeaf8aQEde1Z1Q" target="_7SZsQO0AEeaf8aQEde1Z1Q">
+          <children xmi:type="notation:Node" xmi:id="_7TZx1u0AEeaf8aQEde1Z1Q" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TaY4O0AEeaf8aQEde1Z1Q" x="-284" y="14"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_7TaY4e0AEeaf8aQEde1Z1Q" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TaY4u0AEeaf8aQEde1Z1Q" x="-76"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_7TaY4-0AEeaf8aQEde1Z1Q" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TaY5O0AEeaf8aQEde1Z1Q" x="-181" y="-217"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_7TZx0-0AEeaf8aQEde1Z1Q" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_7TZx1O0AEeaf8aQEde1Z1Q" fontName=".SF NS Text" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7TZx1e0AEeaf8aQEde1Z1Q" points="[-37, -78, 414, 327]$[-37, -450, 414, -45]$[-330, -450, 121, -45]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7TaY5e0AEeaf8aQEde1Z1Q" id="(1.0,1.4254545454545455)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7TaY5u0AEeaf8aQEde1Z1Q" id="(0.0,1.0500001068115234)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_7Ta_8O0AEeaf8aQEde1Z1Q" type="4001" element="_7R-1gO0AEeaf8aQEde1Z1Q" source="_7SnHpO0AEeaf8aQEde1Z1Q" target="_7SZsQO0AEeaf8aQEde1Z1Q">
+          <children xmi:type="notation:Node" xmi:id="_7Ta_9O0AEeaf8aQEde1Z1Q" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7Ta_9e0AEeaf8aQEde1Z1Q" x="-57" y="-1"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_7Ta_9u0AEeaf8aQEde1Z1Q" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7Ta_9-0AEeaf8aQEde1Z1Q" x="163" y="-50"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_7TbnAO0AEeaf8aQEde1Z1Q" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TbnAe0AEeaf8aQEde1Z1Q" x="-144" y="-175"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_7Ta_8e0AEeaf8aQEde1Z1Q" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_7Ta_8u0AEeaf8aQEde1Z1Q" fontName=".SF NS Text" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7Ta_8-0AEeaf8aQEde1Z1Q" points="[-58, -10, 132, 396]$[-58, -2, 132, 404]$[272, -2, 462, 404]$[272, -460, 462, -54]$[-69, -460, 121, -54]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7TbnAu0AEeaf8aQEde1Z1Q" id="(1.0,1.1878786066228695)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7TbnA-0AEeaf8aQEde1Z1Q" id="(0.0,0.8750000267028808)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_7TcOEO0AEeaf8aQEde1Z1Q" type="4001" element="_7SAqsO0AEeaf8aQEde1Z1Q" source="_7So80-0AEeaf8aQEde1Z1Q" target="_7SZsQO0AEeaf8aQEde1Z1Q">
+          <children xmi:type="notation:Node" xmi:id="_7TcOFO0AEeaf8aQEde1Z1Q" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TcOFe0AEeaf8aQEde1Z1Q" x="-3" y="-23"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_7Tc1IO0AEeaf8aQEde1Z1Q" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7Tc1Ie0AEeaf8aQEde1Z1Q" x="-15" y="18"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_7Tc1Iu0AEeaf8aQEde1Z1Q" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7Tc1I-0AEeaf8aQEde1Z1Q" x="-35" y="-10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_7TcOEe0AEeaf8aQEde1Z1Q" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_7TcOEu0AEeaf8aQEde1Z1Q" fontName=".SF NS Text" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7TcOE-0AEeaf8aQEde1Z1Q" points="[-102, -62, 219, 40]$[-102, -88, 219, 14]$[-195, -88, 126, 14]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7TdcMO0AEeaf8aQEde1Z1Q" id="(1.0,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7TeDQO0AEeaf8aQEde1Z1Q" id="(0.0,0.7000001335144044)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_7TeDQe0AEeaf8aQEde1Z1Q" type="4001" element="_7SB40O0AEeaf8aQEde1Z1Q" source="_7SqK8O0AEeaf8aQEde1Z1Q" target="_7So80-0AEeaf8aQEde1Z1Q">
+          <children xmi:type="notation:Node" xmi:id="_7TeDRe0AEeaf8aQEde1Z1Q" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TeDRu0AEeaf8aQEde1Z1Q" x="-7"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_7TeqUO0AEeaf8aQEde1Z1Q" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TeqUe0AEeaf8aQEde1Z1Q" x="1" y="9"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_7TeqUu0AEeaf8aQEde1Z1Q" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TeqU-0AEeaf8aQEde1Z1Q" x="-18" y="-9"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_7TeDQu0AEeaf8aQEde1Z1Q" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_7TeDQ-0AEeaf8aQEde1Z1Q" fontName=".SF NS Text" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7TeDRO0AEeaf8aQEde1Z1Q" points="[-60, -48, 177, 104]$[-60, -76, 177, 76]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7TeqVO0AEeaf8aQEde1Z1Q" id="(1.0,0.7656247663497925)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7TeqVe0AEeaf8aQEde1Z1Q" id="(0.0,0.3999999038816437)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_7TeqVu0AEeaf8aQEde1Z1Q" type="4001" element="_7SDuAO0AEeaf8aQEde1Z1Q" source="_7SgZ8O0AEeaf8aQEde1Z1Q" target="_7SlSc-0AEeaf8aQEde1Z1Q">
+          <children xmi:type="notation:Node" xmi:id="_7TfRYO0AEeaf8aQEde1Z1Q" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TfRYe0AEeaf8aQEde1Z1Q" x="35"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_7TfRYu0AEeaf8aQEde1Z1Q" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TfRY-0AEeaf8aQEde1Z1Q" x="-41" y="9"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_7TfRZO0AEeaf8aQEde1Z1Q" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TfRZe0AEeaf8aQEde1Z1Q" x="41" y="5"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_7TeqV-0AEeaf8aQEde1Z1Q" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_7TeqWO0AEeaf8aQEde1Z1Q" fontName=".SF NS Text" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7TeqWe0AEeaf8aQEde1Z1Q" points="[-118, -30, 0, -326]$[-145, -30, -27, -326]$[-145, 275, -27, -21]$[-118, 275, 0, -21]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7Tf4cO0AEeaf8aQEde1Z1Q" id="(1.0,1.069090909090909)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7Tf4ce0AEeaf8aQEde1Z1Q" id="(0.0,0.7127272727272728)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_7Tf4cu0AEeaf8aQEde1Z1Q" type="4001" element="_7SGKQO0AEeaf8aQEde1Z1Q" source="_7SgZ8O0AEeaf8aQEde1Z1Q" target="_7So80-0AEeaf8aQEde1Z1Q">
+          <children xmi:type="notation:Node" xmi:id="_7Tf4du0AEeaf8aQEde1Z1Q" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7Tf4d-0AEeaf8aQEde1Z1Q" x="-40" y="19"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_7TgfgO0AEeaf8aQEde1Z1Q" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7Tgfge0AEeaf8aQEde1Z1Q" x="15" y="14"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_7Tgfgu0AEeaf8aQEde1Z1Q" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7Tgfg-0AEeaf8aQEde1Z1Q" x="-16" y="-13"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_7Tf4c-0AEeaf8aQEde1Z1Q" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_7Tf4dO0AEeaf8aQEde1Z1Q" fontName=".SF NS Text" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7Tf4de0AEeaf8aQEde1Z1Q" points="[0, -51, -135, 3]$[135, -51, 0, 3]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7TgfhO0AEeaf8aQEde1Z1Q" id="(1.0,1.4254545454545455)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7Tgfhe0AEeaf8aQEde1Z1Q" id="(0.0,0.19999995194082185)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_7Tgfhu0AEeaf8aQEde1Z1Q" type="4001" element="_7SHYY-0AEeaf8aQEde1Z1Q" source="_7SgZ8O0AEeaf8aQEde1Z1Q" target="_7SkEUO0AEeaf8aQEde1Z1Q">
+          <children xmi:type="notation:Node" xmi:id="_7ThGkO0AEeaf8aQEde1Z1Q" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7ThGke0AEeaf8aQEde1Z1Q" x="34"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_7ThGku0AEeaf8aQEde1Z1Q" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7ThGk-0AEeaf8aQEde1Z1Q" x="7" y="38"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_7ThGlO0AEeaf8aQEde1Z1Q" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7ThGle0AEeaf8aQEde1Z1Q" x="-2" y="46"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_7Tgfh-0AEeaf8aQEde1Z1Q" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_7TgfiO0AEeaf8aQEde1Z1Q" fontName=".SF NS Text" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7Tgfie0AEeaf8aQEde1Z1Q" points="[-52, 36, 63, -151]$[-52, 138, 63, -49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7ThtoO0AEeaf8aQEde1Z1Q" id="(1.0,0.3563636363636364)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7Thtoe0AEeaf8aQEde1Z1Q" id="(0.0,0.8909090909090909)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_7TiUsO0AEeaf8aQEde1Z1Q" type="4001" element="_7SJNkO0AEeaf8aQEde1Z1Q" source="_7SiPIO0AEeaf8aQEde1Z1Q" target="_7SnHpO0AEeaf8aQEde1Z1Q">
+          <children xmi:type="notation:Node" xmi:id="_7Tji0O0AEeaf8aQEde1Z1Q" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7Tji0e0AEeaf8aQEde1Z1Q" x="6"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_7TkJ4O0AEeaf8aQEde1Z1Q" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TkJ4e0AEeaf8aQEde1Z1Q" x="-2" y="-41"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_7TkJ4u0AEeaf8aQEde1Z1Q" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TkJ4-0AEeaf8aQEde1Z1Q" x="2" y="-59"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_7TiUse0AEeaf8aQEde1Z1Q" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_7TiUsu0AEeaf8aQEde1Z1Q" fontName=".SF NS Text" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7TiUs-0AEeaf8aQEde1Z1Q" points="[-87, -1, 48, -130]$[-87, 97, 48, -32]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7Tkw8O0AEeaf8aQEde1Z1Q" id="(1.0,1.0208336448669433)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7Tkw8e0AEeaf8aQEde1Z1Q" id="(0.0,0.5939395751953125)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_7Tkw8u0AEeaf8aQEde1Z1Q" type="4001" element="_7SLCwO0AEeaf8aQEde1Z1Q" source="_7Smgku0AEeaf8aQEde1Z1Q" target="_7So80-0AEeaf8aQEde1Z1Q">
+          <children xmi:type="notation:Node" xmi:id="_7TlYAO0AEeaf8aQEde1Z1Q" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TlYAe0AEeaf8aQEde1Z1Q" x="-25"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_7TlYAu0AEeaf8aQEde1Z1Q" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7TlYA-0AEeaf8aQEde1Z1Q" x="-34" y="-42"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_7Tl_EO0AEeaf8aQEde1Z1Q" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7Tl_Ee0AEeaf8aQEde1Z1Q" x="6" y="13"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_7Tkw8-0AEeaf8aQEde1Z1Q" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_7Tkw9O0AEeaf8aQEde1Z1Q" fontName=".SF NS Text" fontHeight="8" bold="true"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7Tkw9e0AEeaf8aQEde1Z1Q" points="[-75, -19, 267, 215]$[-75, -271, 267, -37]$[-133, -271, 209, -37]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7Tl_Eu0AEeaf8aQEde1Z1Q" id="(1.0,0.3563636363636364)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7Tl_E-0AEeaf8aQEde1Z1Q" id="(0.0,0.8000000480591781)"/>
+        </edges>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_7PdF8O0AEeaf8aQEde1Z1Q" name="ADElement" tooltipText="" incomingEdges="_7R0dcO0AEeaf8aQEde1Z1Q _7R7LIO0AEeaf8aQEde1Z1Q _7R8ZQO0AEeaf8aQEde1Z1Q _7R9nYO0AEeaf8aQEde1Z1Q _7R-1gO0AEeaf8aQEde1Z1Q _7SAqsO0AEeaf8aQEde1Z1Q" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="Architecture.ecore#//ADElement"/>
+      <semanticElements xmi:type="ecore:EClass" href="Architecture.ecore#//ADElement"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7Plo0O0AEeaf8aQEde1Z1Q" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+        <labelFormat>italic</labelFormat>
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_7QZhIO0AEeaf8aQEde1Z1Q" name="name : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="Architecture.ecore#//ADElement/name"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="Architecture.ecore#//ADElement/name"/>
+        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7QgO0O0AEeaf8aQEde1Z1Q" labelAlignment="LEFT" description="_7Qb9YO0AEeaf8aQEde1Z1Q">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_7Qg14O0AEeaf8aQEde1Z1Q" name="desciption : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="Architecture.ecore#//ADElement/desciption"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="Architecture.ecore#//ADElement/desciption"/>
+        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Qhc8O0AEeaf8aQEde1Z1Q" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_7QiEAO0AEeaf8aQEde1Z1Q" name="/qualifiedName : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="Architecture.ecore#//ADElement/qualifiedName"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="Architecture.ecore#//ADElement/qualifiedName"/>
+        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7QjSIO0AEeaf8aQEde1Z1Q" labelColor="39,76,114" labelAlignment="LEFT" description="_7QirEO0AEeaf8aQEde1Z1Q"/>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_7Pp6QO0AEeaf8aQEde1Z1Q" name="ArchitectureDomain" tooltipText="" outgoingEdges="_7R0dcO0AEeaf8aQEde1Z1Q _7SDuAO0AEeaf8aQEde1Z1Q _7SGKQO0AEeaf8aQEde1Z1Q _7SHYY-0AEeaf8aQEde1Z1Q" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="Architecture.ecore#//ArchitectureDomain"/>
+      <semanticElements xmi:type="ecore:EClass" href="Architecture.ecore#//ArchitectureDomain"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7PrIYO0AEeaf8aQEde1Z1Q" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_7Ps9kO0AEeaf8aQEde1Z1Q" name="ArchitectureDescriptionLanguage" tooltipText="" outgoingEdges="_7R5V8O0AEeaf8aQEde1Z1Q _7SJNkO0AEeaf8aQEde1Z1Q" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="Architecture.ecore#//ArchitectureDescriptionLanguage"/>
+      <semanticElements xmi:type="ecore:EClass" href="Architecture.ecore#//ArchitectureDescriptionLanguage"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7PuLsO0AEeaf8aQEde1Z1Q" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_7QkgQO0AEeaf8aQEde1Z1Q" name=" metamodel : EPackage" tooltipText="">
+        <target xmi:type="ecore:EReference" href="Architecture.ecore#//ArchitectureDescriptionLanguage/metamodel"/>
+        <semanticElements xmi:type="ecore:EReference" href="Architecture.ecore#//ArchitectureDescriptionLanguage/metamodel"/>
+        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7QscEO0AEeaf8aQEde1Z1Q" labelAlignment="LEFT" description="_7Qr1AO0AEeaf8aQEde1Z1Q" color="114,159,207">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_7QtDIO0AEeaf8aQEde1Z1Q" name=" profiles : EPackage" tooltipText="">
+        <target xmi:type="ecore:EReference" href="Architecture.ecore#//ArchitectureDescriptionLanguage/profiles"/>
+        <semanticElements xmi:type="ecore:EReference" href="Architecture.ecore#//ArchitectureDescriptionLanguage/profiles"/>
+        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7QtqMO0AEeaf8aQEde1Z1Q" labelAlignment="LEFT" color="114,159,207">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_7PvZ0O0AEeaf8aQEde1Z1Q" name="Stakeholder" tooltipText="" outgoingEdges="_7REPgO0AEeaf8aQEde1Z1Q _7R7LIO0AEeaf8aQEde1Z1Q" incomingEdges="_7SHYY-0AEeaf8aQEde1Z1Q" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="Architecture.ecore#//Stakeholder"/>
+      <semanticElements xmi:type="ecore:EClass" href="Architecture.ecore#//Stakeholder"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7PwA4O0AEeaf8aQEde1Z1Q" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_7PxPAO0AEeaf8aQEde1Z1Q" name="Concern" tooltipText="" outgoingEdges="_7R8ZQO0AEeaf8aQEde1Z1Q" incomingEdges="_7REPgO0AEeaf8aQEde1Z1Q _7Rvk8O0AEeaf8aQEde1Z1Q _7RyBM-0AEeaf8aQEde1Z1Q _7SDuAO0AEeaf8aQEde1Z1Q" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="Architecture.ecore#//Concern"/>
+      <semanticElements xmi:type="ecore:EClass" href="Architecture.ecore#//Concern"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7Px2EO0AEeaf8aQEde1Z1Q" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_7PzEMO0AEeaf8aQEde1Z1Q" name="ArchitectureViewpoint" tooltipText="" outgoingEdges="_7Rvk8O0AEeaf8aQEde1Z1Q _7RxaIO0AEeaf8aQEde1Z1Q _7R9nYO0AEeaf8aQEde1Z1Q _7SLCwO0AEeaf8aQEde1Z1Q" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="Architecture.ecore#//ArchitectureViewpoint"/>
+      <semanticElements xmi:type="ecore:EClass" href="Architecture.ecore#//ArchitectureViewpoint"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7P0SUO0AEeaf8aQEde1Z1Q" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_7Qu4UO0AEeaf8aQEde1Z1Q" name="id : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="Architecture.ecore#//ArchitectureViewpoint/id"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="Architecture.ecore#//ArchitectureViewpoint/id"/>
+        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7QwGcO0AEeaf8aQEde1Z1Q" labelAlignment="LEFT" description="_7Qb9YO0AEeaf8aQEde1Z1Q">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_7P1gcO0AEeaf8aQEde1Z1Q" name="RepresentationKind" tooltipText="" outgoingEdges="_7RyBM-0AEeaf8aQEde1Z1Q _7R-1gO0AEeaf8aQEde1Z1Q" incomingEdges="_7RxaIO0AEeaf8aQEde1Z1Q _7SJNkO0AEeaf8aQEde1Z1Q" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="Architecture.ecore#//RepresentationKind"/>
+      <semanticElements xmi:type="ecore:EClass" href="Architecture.ecore#//RepresentationKind"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7P5K0O0AEeaf8aQEde1Z1Q" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+        <labelFormat>italic</labelFormat>
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_7QxUkO0AEeaf8aQEde1Z1Q" name="icon : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="Architecture.ecore#//RepresentationKind/icon"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="Architecture.ecore#//RepresentationKind/icon"/>
+        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Qx7oO0AEeaf8aQEde1Z1Q" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_7P5x4O0AEeaf8aQEde1Z1Q" name="ArchitectureContext" tooltipText="" outgoingEdges="_7SAqsO0AEeaf8aQEde1Z1Q" incomingEdges="_7R5V8O0AEeaf8aQEde1Z1Q _7SB40O0AEeaf8aQEde1Z1Q _7SGKQO0AEeaf8aQEde1Z1Q _7SLCwO0AEeaf8aQEde1Z1Q" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="Architecture.ecore#//ArchitectureContext"/>
+      <semanticElements xmi:type="ecore:EClass" href="Architecture.ecore#//ArchitectureContext"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7P7AAO0AEeaf8aQEde1Z1Q" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+        <labelFormat>italic</labelFormat>
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_7QyisO0AEeaf8aQEde1Z1Q" name="id : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="Architecture.ecore#//ArchitectureContext/id"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="Architecture.ecore#//ArchitectureContext/id"/>
+        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Qzw0O0AEeaf8aQEde1Z1Q" labelAlignment="LEFT" description="_7Qb9YO0AEeaf8aQEde1Z1Q">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_7Q0X4O0AEeaf8aQEde1Z1Q" name="icon : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="Architecture.ecore#//ArchitectureContext/icon"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="Architecture.ecore#//ArchitectureContext/icon"/>
+        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Q0-8O0AEeaf8aQEde1Z1Q" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_7Q0-8e0AEeaf8aQEde1Z1Q" name="extensionPrefix : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="Architecture.ecore#//ArchitectureContext/extensionPrefix"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="Architecture.ecore#//ArchitectureContext/extensionPrefix"/>
+        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Q1mAO0AEeaf8aQEde1Z1Q" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_7Q2NEO0AEeaf8aQEde1Z1Q" name="creationCommandClass : EJavaClass" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="Architecture.ecore#//ArchitectureContext/creationCommandClass"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="Architecture.ecore#//ArchitectureContext/creationCommandClass"/>
+        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Q20IO0AEeaf8aQEde1Z1Q" labelAlignment="LEFT" description="_7Qb9YO0AEeaf8aQEde1Z1Q">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_7Q3bMO0AEeaf8aQEde1Z1Q" name="conversionCommandClass : EJavaClass" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="Architecture.ecore#//ArchitectureContext/conversionCommandClass"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="Architecture.ecore#//ArchitectureContext/conversionCommandClass"/>
+        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Q4CQO0AEeaf8aQEde1Z1Q" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_7Q4pUO0AEeaf8aQEde1Z1Q" name=" elementTypes : ElementTypeSetConfiguration" tooltipText="">
+        <target xmi:type="ecore:EReference" href="Architecture.ecore#//ArchitectureContext/elementTypes"/>
+        <semanticElements xmi:type="ecore:EReference" href="Architecture.ecore#//ArchitectureContext/elementTypes"/>
+        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Q5QYO0AEeaf8aQEde1Z1Q" labelAlignment="LEFT" color="114,159,207">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_7P7nEO0AEeaf8aQEde1Z1Q" name="ArchitectureFramework" tooltipText="" outgoingEdges="_7SB40O0AEeaf8aQEde1Z1Q" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="Architecture.ecore#//ArchitectureFramework"/>
+      <semanticElements xmi:type="ecore:EClass" href="Architecture.ecore#//ArchitectureFramework"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7P81MO0AEeaf8aQEde1Z1Q" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_7P9cQO0AEeaf8aQEde1Z1Q" name="ArchitectureDescription" tooltipText="" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="Architecture.ecore#//ArchitectureDescription"/>
+      <semanticElements xmi:type="ecore:EClass" href="Architecture.ecore#//ArchitectureDescription"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7P-qYO0AEeaf8aQEde1Z1Q" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_7Q53cO0AEeaf8aQEde1Z1Q" name="contextId : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="Architecture.ecore#//ArchitectureDescription/contextId"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="Architecture.ecore#//ArchitectureDescription/contextId"/>
+        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Q6egO0AEeaf8aQEde1Z1Q" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_7REPgO0AEeaf8aQEde1Z1Q" name="[0..*] concerns" sourceNode="_7PvZ0O0AEeaf8aQEde1Z1Q" targetNode="_7PxPAO0AEeaf8aQEde1Z1Q">
+      <target xmi:type="ecore:EReference" href="Architecture.ecore#//Stakeholder/concerns"/>
+      <semanticElements xmi:type="ecore:EReference" href="Architecture.ecore#//Stakeholder/concerns"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_7RuW0O0AEeaf8aQEde1Z1Q" routingStyle="manhattan" strokeColor="0,0,0">
+        <customFeatures>routingStyle</customFeatures>
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_7RuW0e0AEeaf8aQEde1Z1Q" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_7RuW0u0AEeaf8aQEde1Z1Q" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_7Rvk8O0AEeaf8aQEde1Z1Q" name="[0..*] concerns" sourceNode="_7PzEMO0AEeaf8aQEde1Z1Q" targetNode="_7PxPAO0AEeaf8aQEde1Z1Q">
+      <target xmi:type="ecore:EReference" href="Architecture.ecore#//ArchitectureViewpoint/concerns"/>
+      <semanticElements xmi:type="ecore:EReference" href="Architecture.ecore#//ArchitectureViewpoint/concerns"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_7RwzEO0AEeaf8aQEde1Z1Q" routingStyle="manhattan" strokeColor="0,0,0">
+        <customFeatures>routingStyle</customFeatures>
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_7RwzEe0AEeaf8aQEde1Z1Q" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_7RwzEu0AEeaf8aQEde1Z1Q" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_7RxaIO0AEeaf8aQEde1Z1Q" name="[0..*] representationKinds" sourceNode="_7PzEMO0AEeaf8aQEde1Z1Q" targetNode="_7P1gcO0AEeaf8aQEde1Z1Q">
+      <target xmi:type="ecore:EReference" href="Architecture.ecore#//ArchitectureViewpoint/representationKinds"/>
+      <semanticElements xmi:type="ecore:EReference" href="Architecture.ecore#//ArchitectureViewpoint/representationKinds"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_7RyBMO0AEeaf8aQEde1Z1Q" routingStyle="manhattan" strokeColor="0,0,0">
+        <customFeatures>routingStyle</customFeatures>
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_7RyBMe0AEeaf8aQEde1Z1Q" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_7RyBMu0AEeaf8aQEde1Z1Q" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_7RyBM-0AEeaf8aQEde1Z1Q" name="[0..*] concerns" sourceNode="_7P1gcO0AEeaf8aQEde1Z1Q" targetNode="_7PxPAO0AEeaf8aQEde1Z1Q">
+      <target xmi:type="ecore:EReference" href="Architecture.ecore#//RepresentationKind/concerns"/>
+      <semanticElements xmi:type="ecore:EReference" href="Architecture.ecore#//RepresentationKind/concerns"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_7RyoQO0AEeaf8aQEde1Z1Q" routingStyle="manhattan" strokeColor="0,0,0">
+        <customFeatures>routingStyle</customFeatures>
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_7RyoQe0AEeaf8aQEde1Z1Q" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_7RyoQu0AEeaf8aQEde1Z1Q" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_7R0dcO0AEeaf8aQEde1Z1Q" sourceNode="_7Pp6QO0AEeaf8aQEde1Z1Q" targetNode="_7PdF8O0AEeaf8aQEde1Z1Q">
+      <target xmi:type="ecore:EClass" href="Architecture.ecore#//ArchitectureDomain"/>
+      <semanticElements xmi:type="ecore:EGenericType" href="Architecture.ecore#//ArchitectureDomain/@eGenericSuperTypes.0"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_7R4u4O0AEeaf8aQEde1Z1Q" targetArrow="InputClosedArrow" routingStyle="manhattan">
+        <customFeatures>routingStyle</customFeatures>
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_7R4u4e0AEeaf8aQEde1Z1Q" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_7R4u4u0AEeaf8aQEde1Z1Q" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_7R5V8O0AEeaf8aQEde1Z1Q" sourceNode="_7Ps9kO0AEeaf8aQEde1Z1Q" targetNode="_7P5x4O0AEeaf8aQEde1Z1Q">
+      <target xmi:type="ecore:EClass" href="Architecture.ecore#//ArchitectureDescriptionLanguage"/>
+      <semanticElements xmi:type="ecore:EGenericType" href="Architecture.ecore#//ArchitectureDescriptionLanguage/@eGenericSuperTypes.0"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_7R6kEO0AEeaf8aQEde1Z1Q" targetArrow="InputClosedArrow" routingStyle="manhattan">
+        <customFeatures>routingStyle</customFeatures>
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_7R6kEe0AEeaf8aQEde1Z1Q" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_7R6kEu0AEeaf8aQEde1Z1Q" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_7R7LIO0AEeaf8aQEde1Z1Q" sourceNode="_7PvZ0O0AEeaf8aQEde1Z1Q" targetNode="_7PdF8O0AEeaf8aQEde1Z1Q">
+      <target xmi:type="ecore:EClass" href="Architecture.ecore#//Stakeholder"/>
+      <semanticElements xmi:type="ecore:EGenericType" href="Architecture.ecore#//Stakeholder/@eGenericSuperTypes.0"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_7R7yMO0AEeaf8aQEde1Z1Q" targetArrow="InputClosedArrow" routingStyle="manhattan">
+        <customFeatures>routingStyle</customFeatures>
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_7R7yMe0AEeaf8aQEde1Z1Q" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_7R7yMu0AEeaf8aQEde1Z1Q" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_7R8ZQO0AEeaf8aQEde1Z1Q" sourceNode="_7PxPAO0AEeaf8aQEde1Z1Q" targetNode="_7PdF8O0AEeaf8aQEde1Z1Q">
+      <target xmi:type="ecore:EClass" href="Architecture.ecore#//Concern"/>
+      <semanticElements xmi:type="ecore:EGenericType" href="Architecture.ecore#//Concern/@eGenericSuperTypes.0"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_7R9AUO0AEeaf8aQEde1Z1Q" targetArrow="InputClosedArrow" routingStyle="manhattan">
+        <customFeatures>routingStyle</customFeatures>
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_7R9AUe0AEeaf8aQEde1Z1Q" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_7R9AUu0AEeaf8aQEde1Z1Q" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_7R9nYO0AEeaf8aQEde1Z1Q" sourceNode="_7PzEMO0AEeaf8aQEde1Z1Q" targetNode="_7PdF8O0AEeaf8aQEde1Z1Q">
+      <target xmi:type="ecore:EClass" href="Architecture.ecore#//ArchitectureViewpoint"/>
+      <semanticElements xmi:type="ecore:EGenericType" href="Architecture.ecore#//ArchitectureViewpoint/@eGenericSuperTypes.0"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_7R-OcO0AEeaf8aQEde1Z1Q" targetArrow="InputClosedArrow" routingStyle="manhattan">
+        <customFeatures>routingStyle</customFeatures>
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_7R-Oce0AEeaf8aQEde1Z1Q" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_7R-Ocu0AEeaf8aQEde1Z1Q" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_7R-1gO0AEeaf8aQEde1Z1Q" sourceNode="_7P1gcO0AEeaf8aQEde1Z1Q" targetNode="_7PdF8O0AEeaf8aQEde1Z1Q">
+      <target xmi:type="ecore:EClass" href="Architecture.ecore#//RepresentationKind"/>
+      <semanticElements xmi:type="ecore:EGenericType" href="Architecture.ecore#//RepresentationKind/@eGenericSuperTypes.0"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_7SADoO0AEeaf8aQEde1Z1Q" targetArrow="InputClosedArrow" routingStyle="manhattan">
+        <customFeatures>routingStyle</customFeatures>
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_7SADoe0AEeaf8aQEde1Z1Q" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_7SADou0AEeaf8aQEde1Z1Q" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_7SAqsO0AEeaf8aQEde1Z1Q" sourceNode="_7P5x4O0AEeaf8aQEde1Z1Q" targetNode="_7PdF8O0AEeaf8aQEde1Z1Q">
+      <target xmi:type="ecore:EClass" href="Architecture.ecore#//ArchitectureContext"/>
+      <semanticElements xmi:type="ecore:EGenericType" href="Architecture.ecore#//ArchitectureContext/@eGenericSuperTypes.0"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_7SBRwO0AEeaf8aQEde1Z1Q" targetArrow="InputClosedArrow" routingStyle="manhattan">
+        <customFeatures>routingStyle</customFeatures>
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_7SBRwe0AEeaf8aQEde1Z1Q" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_7SBRwu0AEeaf8aQEde1Z1Q" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_7SB40O0AEeaf8aQEde1Z1Q" sourceNode="_7P7nEO0AEeaf8aQEde1Z1Q" targetNode="_7P5x4O0AEeaf8aQEde1Z1Q">
+      <target xmi:type="ecore:EClass" href="Architecture.ecore#//ArchitectureFramework"/>
+      <semanticElements xmi:type="ecore:EGenericType" href="Architecture.ecore#//ArchitectureFramework/@eGenericSuperTypes.0"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_7SCf4O0AEeaf8aQEde1Z1Q" targetArrow="InputClosedArrow" routingStyle="manhattan">
+        <customFeatures>routingStyle</customFeatures>
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_7SCf4e0AEeaf8aQEde1Z1Q" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_7SCf4u0AEeaf8aQEde1Z1Q" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_7SDuAO0AEeaf8aQEde1Z1Q" sourceNode="_7Pp6QO0AEeaf8aQEde1Z1Q" targetNode="_7PxPAO0AEeaf8aQEde1Z1Q" beginLabel="[1..1] domain" endLabel="[0..*] concerns">
+      <target xmi:type="ecore:EReference" href="Architecture.ecore#//ArchitectureDomain/concerns"/>
+      <semanticElements xmi:type="ecore:EReference" href="Architecture.ecore#//ArchitectureDomain/concerns"/>
+      <semanticElements xmi:type="ecore:EReference" href="Architecture.ecore#//Concern/domain"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_7SFjM-0AEeaf8aQEde1Z1Q" description="_7SFjMO0AEeaf8aQEde1Z1Q" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <customFeatures>routingStyle</customFeatures>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_7SFjNO0AEeaf8aQEde1Z1Q" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_7SFjNe0AEeaf8aQEde1Z1Q" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_7SGKQO0AEeaf8aQEde1Z1Q" sourceNode="_7Pp6QO0AEeaf8aQEde1Z1Q" targetNode="_7P5x4O0AEeaf8aQEde1Z1Q" beginLabel="[1..1] domain" endLabel="[0..*] contexts">
+      <target xmi:type="ecore:EReference" href="Architecture.ecore#//ArchitectureDomain/contexts"/>
+      <semanticElements xmi:type="ecore:EReference" href="Architecture.ecore#//ArchitectureDomain/contexts"/>
+      <semanticElements xmi:type="ecore:EReference" href="Architecture.ecore#//ArchitectureContext/domain"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_7SHYYO0AEeaf8aQEde1Z1Q" description="_7SFjMO0AEeaf8aQEde1Z1Q" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <customFeatures>routingStyle</customFeatures>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_7SHYYe0AEeaf8aQEde1Z1Q" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_7SHYYu0AEeaf8aQEde1Z1Q" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_7SHYY-0AEeaf8aQEde1Z1Q" sourceNode="_7Pp6QO0AEeaf8aQEde1Z1Q" targetNode="_7PvZ0O0AEeaf8aQEde1Z1Q" beginLabel="[1..1] domain" endLabel="[0..*] stakeholders">
+      <target xmi:type="ecore:EReference" href="Architecture.ecore#//ArchitectureDomain/stakeholders"/>
+      <semanticElements xmi:type="ecore:EReference" href="Architecture.ecore#//Stakeholder/domain"/>
+      <semanticElements xmi:type="ecore:EReference" href="Architecture.ecore#//ArchitectureDomain/stakeholders"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_7SImgO0AEeaf8aQEde1Z1Q" description="_7SFjMO0AEeaf8aQEde1Z1Q" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <customFeatures>routingStyle</customFeatures>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_7SImge0AEeaf8aQEde1Z1Q" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_7SImgu0AEeaf8aQEde1Z1Q" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_7SJNkO0AEeaf8aQEde1Z1Q" sourceNode="_7Ps9kO0AEeaf8aQEde1Z1Q" targetNode="_7P1gcO0AEeaf8aQEde1Z1Q" beginLabel="[1..1] language" endLabel="[0..*] representationKinds">
+      <target xmi:type="ecore:EReference" href="Architecture.ecore#//ArchitectureDescriptionLanguage/representationKinds"/>
+      <semanticElements xmi:type="ecore:EReference" href="Architecture.ecore#//RepresentationKind/language"/>
+      <semanticElements xmi:type="ecore:EReference" href="Architecture.ecore#//ArchitectureDescriptionLanguage/representationKinds"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_7SKbsO0AEeaf8aQEde1Z1Q" description="_7SFjMO0AEeaf8aQEde1Z1Q" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <customFeatures>routingStyle</customFeatures>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_7SKbse0AEeaf8aQEde1Z1Q" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_7SKbsu0AEeaf8aQEde1Z1Q" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_7SLCwO0AEeaf8aQEde1Z1Q" sourceNode="_7PzEMO0AEeaf8aQEde1Z1Q" targetNode="_7P5x4O0AEeaf8aQEde1Z1Q" beginLabel="[0..*] viewpoints" endLabel="[1..1] context">
+      <target xmi:type="ecore:EReference" href="Architecture.ecore#//ArchitectureViewpoint/context"/>
+      <semanticElements xmi:type="ecore:EReference" href="Architecture.ecore#//ArchitectureViewpoint/context"/>
+      <semanticElements xmi:type="ecore:EReference" href="Architecture.ecore#//ArchitectureContext/viewpoints"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_7SMQ4-0AEeaf8aQEde1Z1Q" description="_7SMQ4O0AEeaf8aQEde1Z1Q" sourceArrow="InputArrow" targetArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <customFeatures>routingStyle</customFeatures>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_7SM38O0AEeaf8aQEde1Z1Q" showIcon="false">
+          <labelFormat>bold</labelFormat>
+        </beginLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_7SM38e0AEeaf8aQEde1Z1Q" showIcon="false">
+          <labelFormat>bold</labelFormat>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_amJL4PaMEeazb43LOF1y5w" name="ArchitectureDescriptionPreferences" tooltipText="" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="Architecture.ecore#//ArchitectureDescriptionPreferences"/>
+      <semanticElements xmi:type="ecore:EClass" href="Architecture.ecore#//ArchitectureDescriptionPreferences"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_amKaAPaMEeazb43LOF1y5w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_7Q7FkO0AEeaf8aQEde1Z1Q" name="viewpointIds : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="Architecture.ecore#//ArchitectureDescriptionPreferences/viewpointIds"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="Architecture.ecore#//ArchitectureDescriptionPreferences/viewpointIds"/>
+        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_7Q7soO0AEeaf8aQEde1Z1Q" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
+    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_5z_0le0AEeaf8aQEde1Z1Q"/>
+    <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>
+    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']"/>
+    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Validation']"/>
+    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Archetype']/@ownedRepresentationExtensions[name='Entities%20With%20Archetypes']/@layers[name='Archetypes']"/>
+    <target xmi:type="ecore:EPackage" href="Architecture.ecore#/"/>
+  </diagram:DSemanticDiagram>
+</xmi:XMI>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.ecore b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.ecore
new file mode 100755
index 00000000000..15fc48d2a08
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.ecore
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="architecture" nsURI="http://www.eclipse.org/papyrus/infra/core/architecture"
+    nsPrefix="architecture">
+  <eClassifiers xsi:type="ecore:EClass" name="ADElement" abstract="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="desciption" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="qualifiedName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+        changeable="false" volatile="true" transient="true" derived="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ArchitectureDomain" eSuperTypes="#//ADElement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="stakeholders" upperBound="-1"
+        eType="#//Stakeholder" containment="true" eOpposite="#//Stakeholder/domain"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="concerns" upperBound="-1"
+        eType="#//Concern" containment="true" eOpposite="#//Concern/domain"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="contexts" upperBound="-1"
+        eType="#//ArchitectureContext" containment="true" eOpposite="#//ArchitectureContext/domain"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ArchitectureDescriptionLanguage" eSuperTypes="#//ArchitectureContext">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="representationKinds" upperBound="-1"
+        eType="#//RepresentationKind" containment="true" eOpposite="#//RepresentationKind/language"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="metamodel" lowerBound="1"
+        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EPackage"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="profiles" upperBound="-1"
+        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EPackage"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Stakeholder" eSuperTypes="#//ADElement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="concerns" upperBound="-1"
+        eType="#//Concern"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="domain" lowerBound="1"
+        eType="#//ArchitectureDomain" eOpposite="#//ArchitectureDomain/stakeholders"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Concern" eSuperTypes="#//ADElement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="domain" lowerBound="1"
+        eType="#//ArchitectureDomain" eOpposite="#//ArchitectureDomain/concerns"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ArchitectureViewpoint" eSuperTypes="#//ADElement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="concerns" upperBound="-1"
+        eType="#//Concern"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="representationKinds" upperBound="-1"
+        eType="#//RepresentationKind"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="context" lowerBound="1"
+        eType="#//ArchitectureContext" eOpposite="#//ArchitectureContext/viewpoints"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="RepresentationKind" abstract="true"
+      eSuperTypes="#//ADElement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="language" lowerBound="1"
+        eType="#//ArchitectureDescriptionLanguage" eOpposite="#//ArchitectureDescriptionLanguage/representationKinds"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="concerns" upperBound="-1"
+        eType="#//Concern"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="icon" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ArchitectureContext" abstract="true"
+      eSuperTypes="#//ADElement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="viewpoints" upperBound="-1"
+        eType="#//ArchitectureViewpoint" containment="true" eOpposite="#//ArchitectureViewpoint/context"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="elementTypes" upperBound="-1"
+        eType="ecore:EClass ../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore#//ElementTypeSetConfiguration"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="domain" lowerBound="1"
+        eType="#//ArchitectureDomain" eOpposite="#//ArchitectureDomain/contexts"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="icon" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="extensionPrefix" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="creationCommandClass" lowerBound="1">
+      <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
+        <eTypeArguments/>
+      </eGenericType>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="conversionCommandClass">
+      <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
+        <eTypeArguments/>
+      </eGenericType>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ArchitectureFramework" eSuperTypes="#//ArchitectureContext"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ArchitectureDescription">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="contextId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ArchitectureDescriptionPreferences">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="viewpointIds" upperBound="-1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.ecore_diagram b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.ecore_diagram
new file mode 100644
index 00000000000..0009a025822
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.ecore_diagram
@@ -0,0 +1,365 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_jPuUwLeqEearJ4erliAKEg" type="Ecore" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_jpWVsLeqEearJ4erliAKEg" type="2001" fontName="Lucida Grande">
+    <children xmi:type="notation:DecorationNode" xmi:id="_jph74LeqEearJ4erliAKEg" type="5001"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_jpnbcLeqEearJ4erliAKEg" type="7001">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_jpnbcbeqEearJ4erliAKEg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_jpnbcreqEearJ4erliAKEg"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_jpoCgLeqEearJ4erliAKEg" type="7002">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_jpoCgbeqEearJ4erliAKEg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_jpoCgreqEearJ4erliAKEg"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_jpoCg7eqEearJ4erliAKEg" type="7003">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_jpoChLeqEearJ4erliAKEg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_jpoChbeqEearJ4erliAKEg"/>
+    </children>
+    <element xmi:type="ecore:EClass" href="Architecture.ecore#//ADElement"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jpWVsbeqEearJ4erliAKEg" x="234" y="63"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_jpopkLeqEearJ4erliAKEg" type="2001" fontName="Lucida Grande">
+    <children xmi:type="notation:DecorationNode" xmi:id="_jpopkreqEearJ4erliAKEg" type="5001"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_jppQoLeqEearJ4erliAKEg" type="7001">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_jppQobeqEearJ4erliAKEg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_jppQoreqEearJ4erliAKEg"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_jppQo7eqEearJ4erliAKEg" type="7002">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_jppQpLeqEearJ4erliAKEg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_jppQpbeqEearJ4erliAKEg"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_jppQpreqEearJ4erliAKEg" type="7003">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_jppQp7eqEearJ4erliAKEg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_jppQqLeqEearJ4erliAKEg"/>
+    </children>
+    <element xmi:type="ecore:EClass" href="Architecture.ecore#//ArchitectureDomain"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jpopkbeqEearJ4erliAKEg" x="99" y="198"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_jpqewLeqEearJ4erliAKEg" type="2001" fontName="Lucida Grande">
+    <children xmi:type="notation:DecorationNode" xmi:id="_jprF0LeqEearJ4erliAKEg" type="5001"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_jprF0beqEearJ4erliAKEg" type="7001">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_jprF0reqEearJ4erliAKEg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_jprF07eqEearJ4erliAKEg"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_jprF1LeqEearJ4erliAKEg" type="7002">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_jprF1beqEearJ4erliAKEg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_jprF1reqEearJ4erliAKEg"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_jprs4LeqEearJ4erliAKEg" type="7003">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_jprs4beqEearJ4erliAKEg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_jprs4reqEearJ4erliAKEg"/>
+    </children>
+    <element xmi:type="ecore:EClass" href="Architecture.ecore#//ArchitectureDescriptionLanguage"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jpqewbeqEearJ4erliAKEg" x="270" y="378"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_jprs47eqEearJ4erliAKEg" type="2001" fontName="Lucida Grande">
+    <children xmi:type="notation:DecorationNode" xmi:id="_jpsT8LeqEearJ4erliAKEg" type="5001"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_jpsT8beqEearJ4erliAKEg" type="7001">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_jpsT8reqEearJ4erliAKEg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_jpsT87eqEearJ4erliAKEg"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_jpsT9LeqEearJ4erliAKEg" type="7002">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_jpsT9beqEearJ4erliAKEg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_jpsT9reqEearJ4erliAKEg"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_jpsT97eqEearJ4erliAKEg" type="7003">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_jpsT-LeqEearJ4erliAKEg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_jpsT-beqEearJ4erliAKEg"/>
+    </children>
+    <element xmi:type="ecore:EClass" href="Architecture.ecore#//Stakeholder"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jprs5LeqEearJ4erliAKEg" x="54" y="324" width="109"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_jps7ALeqEearJ4erliAKEg" type="2001" fontName="Lucida Grande">
+    <children xmi:type="notation:DecorationNode" xmi:id="_jps7AreqEearJ4erliAKEg" type="5001"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_jps7A7eqEearJ4erliAKEg" type="7001">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_jps7BLeqEearJ4erliAKEg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_jps7BbeqEearJ4erliAKEg"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_jps7BreqEearJ4erliAKEg" type="7002">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_jps7B7eqEearJ4erliAKEg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_jps7CLeqEearJ4erliAKEg"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_jps7CbeqEearJ4erliAKEg" type="7003">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_jps7CreqEearJ4erliAKEg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_jps7C7eqEearJ4erliAKEg"/>
+    </children>
+    <element xmi:type="ecore:EClass" href="Architecture.ecore#//Concern"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jps7AbeqEearJ4erliAKEg" x="99" y="486" width="109"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_jptiELeqEearJ4erliAKEg" type="2001" fontName="Lucida Grande">
+    <children xmi:type="notation:DecorationNode" xmi:id="_jpuJILeqEearJ4erliAKEg" type="5001"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_jpuJIbeqEearJ4erliAKEg" type="7001">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_jpuJIreqEearJ4erliAKEg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_jpuJI7eqEearJ4erliAKEg"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_jpuJJLeqEearJ4erliAKEg" type="7002">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_jpuJJbeqEearJ4erliAKEg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_jpuJJreqEearJ4erliAKEg"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_jpuwMLeqEearJ4erliAKEg" type="7003">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_jpuwMbeqEearJ4erliAKEg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_jpuwMreqEearJ4erliAKEg"/>
+    </children>
+    <element xmi:type="ecore:EClass" href="Architecture.ecore#//ArchitectureViewpoint"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jptiEbeqEearJ4erliAKEg" x="513" y="486"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_jpvXQLeqEearJ4erliAKEg" type="2001" fontName="Lucida Grande">
+    <children xmi:type="notation:DecorationNode" xmi:id="_jpvXQreqEearJ4erliAKEg" type="5001"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_jpvXQ7eqEearJ4erliAKEg" type="7001">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_jpvXRLeqEearJ4erliAKEg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_jpvXRbeqEearJ4erliAKEg"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_jpv-ULeqEearJ4erliAKEg" type="7002">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_jpv-UbeqEearJ4erliAKEg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_jpv-UreqEearJ4erliAKEg"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_jpv-U7eqEearJ4erliAKEg" type="7003">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_jpv-VLeqEearJ4erliAKEg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_jpv-VbeqEearJ4erliAKEg"/>
+    </children>
+    <element xmi:type="ecore:EClass" href="Architecture.ecore#//RepresentationKind"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jpvXQbeqEearJ4erliAKEg" x="297" y="486"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_jpv-VreqEearJ4erliAKEg" type="2001" fontName="Lucida Grande">
+    <children xmi:type="notation:DecorationNode" xmi:id="_jpwlYLeqEearJ4erliAKEg" type="5001"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_jpwlYbeqEearJ4erliAKEg" type="7001">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_jpwlYreqEearJ4erliAKEg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_jpwlY7eqEearJ4erliAKEg"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_jpwlZLeqEearJ4erliAKEg" type="7002">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_jpwlZbeqEearJ4erliAKEg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_jpwlZreqEearJ4erliAKEg"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_jpxMcLeqEearJ4erliAKEg" type="7003">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_jpxMcbeqEearJ4erliAKEg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_jpxMcreqEearJ4erliAKEg"/>
+    </children>
+    <element xmi:type="ecore:EClass" href="Architecture.ecore#//ArchitectureContext"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jpv-V7eqEearJ4erliAKEg" x="351" y="171"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_jpxMc7eqEearJ4erliAKEg" type="2001" fontName="Lucida Grande">
+    <children xmi:type="notation:DecorationNode" xmi:id="_jpxzgLeqEearJ4erliAKEg" type="5001"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_jpxzgbeqEearJ4erliAKEg" type="7001">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_jpxzgreqEearJ4erliAKEg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_jpxzg7eqEearJ4erliAKEg"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_jpxzhLeqEearJ4erliAKEg" type="7002">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_jpxzhbeqEearJ4erliAKEg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_jpxzhreqEearJ4erliAKEg"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_jpxzh7eqEearJ4erliAKEg" type="7003">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_jpxziLeqEearJ4erliAKEg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_jpxzibeqEearJ4erliAKEg"/>
+    </children>
+    <element xmi:type="ecore:EClass" href="Architecture.ecore#//ArchitectureFramework"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jpxMdLeqEearJ4erliAKEg" x="450" y="378"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_jpyakLeqEearJ4erliAKEg" type="2001" fontName="Lucida Grande">
+    <children xmi:type="notation:DecorationNode" xmi:id="_jpzBoLeqEearJ4erliAKEg" type="5001"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_jpzBobeqEearJ4erliAKEg" type="7001">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_jpzBoreqEearJ4erliAKEg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_jpzBo7eqEearJ4erliAKEg"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_jpzBpLeqEearJ4erliAKEg" type="7002">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_jpzBpbeqEearJ4erliAKEg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_jpzBpreqEearJ4erliAKEg"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_jpzosLeqEearJ4erliAKEg" type="7003">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_jpzosbeqEearJ4erliAKEg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_jpzosreqEearJ4erliAKEg"/>
+    </children>
+    <element xmi:type="ecore:EClass" href="Architecture.ecore#//ArchitectureDescription"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jpyakbeqEearJ4erliAKEg" x="414" y="36"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_UOZmMAP_EeeD5ZWpL2ysEA" type="2001" fontName=".SF NS Text">
+    <children xmi:type="notation:DecorationNode" xmi:id="_UOa0UAP_EeeD5ZWpL2ysEA" type="5001"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_UOa0UQP_EeeD5ZWpL2ysEA" type="7001">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_UOa0UgP_EeeD5ZWpL2ysEA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_UOa0UwP_EeeD5ZWpL2ysEA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_UOa0VAP_EeeD5ZWpL2ysEA" type="7002">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_UOa0VQP_EeeD5ZWpL2ysEA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_UOa0VgP_EeeD5ZWpL2ysEA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_UObbYAP_EeeD5ZWpL2ysEA" type="7003">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_UObbYQP_EeeD5ZWpL2ysEA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_UObbYgP_EeeD5ZWpL2ysEA"/>
+    </children>
+    <element xmi:type="ecore:EClass" href="Architecture.ecore#//ArchitectureDescriptionPreferences"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UOZmMQP_EeeD5ZWpL2ysEA" x="36" y="36"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_jPuUwbeqEearJ4erliAKEg"/>
+  <element xmi:type="ecore:EPackage" href="Architecture.ecore#/"/>
+  <edges xmi:type="notation:Connector" xmi:id="_jvgBALeqEearJ4erliAKEg" type="4003" source="_jpopkLeqEearJ4erliAKEg" target="_jprs47eqEearJ4erliAKEg" routing="Rectilinear">
+    <children xmi:type="notation:DecorationNode" xmi:id="_jvgoELeqEearJ4erliAKEg" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_jvgoEbeqEearJ4erliAKEg" x="24" y="34"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_jvgoEreqEearJ4erliAKEg" type="6004">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_jvgoE7eqEearJ4erliAKEg" x="-2" y="-18"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_jvgBAbeqEearJ4erliAKEg" fontName="Lucida Grande"/>
+    <element xmi:type="ecore:EReference" href="Architecture.ecore#//ArchitectureDomain/stakeholders"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jvgBAreqEearJ4erliAKEg" points="[-8, 0, 37, -74]$[-8, 74, 37, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jy1B0LeqEearJ4erliAKEg" id="(0.4953271028037383,1.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jy1B0beqEearJ4erliAKEg" id="(0.49295774647887325,0.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_jv_wQLeqEearJ4erliAKEg" type="4003" source="_jpopkLeqEearJ4erliAKEg" target="_jps7ALeqEearJ4erliAKEg" routing="Rectilinear">
+    <children xmi:type="notation:DecorationNode" xmi:id="_jwAXULeqEearJ4erliAKEg" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_jwAXUbeqEearJ4erliAKEg" x="96" y="-29"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_jwAXUreqEearJ4erliAKEg" type="6004">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_jwAXU7eqEearJ4erliAKEg" x="13" y="10"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_jv_wQbeqEearJ4erliAKEg" fontName="Lucida Grande"/>
+    <element xmi:type="ecore:EReference" href="Architecture.ecore#//ArchitectureDomain/concerns"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jv_wQreqEearJ4erliAKEg" points="[19, 0, 52, -200]$[19, 200, 52, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jy1B1LeqEearJ4erliAKEg" id="(0.6635514018691588,1.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jy1B1beqEearJ4erliAKEg" id="(0.35714285714285715,0.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_jwEBsLeqEearJ4erliAKEg" type="4003" source="_jpopkLeqEearJ4erliAKEg" target="_jpv-VreqEearJ4erliAKEg" routing="Rectilinear">
+    <children xmi:type="notation:DecorationNode" xmi:id="_jwEowLeqEearJ4erliAKEg" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_jwEowbeqEearJ4erliAKEg" x="46" y="14"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_jwEowreqEearJ4erliAKEg" type="6004">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_jwEow7eqEearJ4erliAKEg" x="-6" y="-13"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_jwEBsbeqEearJ4erliAKEg" fontName="Lucida Grande"/>
+    <element xmi:type="ecore:EReference" href="Architecture.ecore#//ArchitectureDomain/contexts"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jwEBsreqEearJ4erliAKEg" points="[18, -34, -193, 45]$[163, -34, -48, 45]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jyzztbeqEearJ4erliAKEg" id="(0.8317757009345794,1.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jy0awLeqEearJ4erliAKEg" id="(0.24299065420560748,0.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_jwITILeqEearJ4erliAKEg" type="4004" source="_jpopkLeqEearJ4erliAKEg" target="_jpWVsLeqEearJ4erliAKEg" routing="Rectilinear">
+    <styles xmi:type="notation:FontStyle" xmi:id="_jwITIbeqEearJ4erliAKEg" fontName="Lucida Grande"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jwITIreqEearJ4erliAKEg" points="[19, -52, -106, 135]$[19, -106, -106, 81]$[109, -106, -16, 81]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jy1B0reqEearJ4erliAKEg" id="(0.24299065420560748,1.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jy1B07eqEearJ4erliAKEg" id="(0.12121212121212122,0.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_jwMkkLeqEearJ4erliAKEg" type="4003" source="_jpqewLeqEearJ4erliAKEg" target="_jpvXQLeqEearJ4erliAKEg" routing="Rectilinear">
+    <children xmi:type="notation:DecorationNode" xmi:id="_jwMkk7eqEearJ4erliAKEg" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_jwMklLeqEearJ4erliAKEg" x="15" y="46"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_jwMklbeqEearJ4erliAKEg" type="6004">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_jwMklreqEearJ4erliAKEg" x="-5" y="-17"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_jwMkkbeqEearJ4erliAKEg" fontName="Lucida Grande"/>
+    <element xmi:type="ecore:EReference" href="Architecture.ecore#//ArchitectureDescriptionLanguage/representationKinds"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jwMkkreqEearJ4erliAKEg" points="[69, 0, -24, -56]$[69, 56, -24, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jy1o4LeqEearJ4erliAKEg" id="(0.07272727272727272,1.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jy1o4beqEearJ4erliAKEg" id="(0.7428571428571429,0.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_jwPn4LeqEearJ4erliAKEg" type="4004" source="_jpqewLeqEearJ4erliAKEg" target="_jpv-VreqEearJ4erliAKEg" routing="Rectilinear">
+    <styles xmi:type="notation:FontStyle" xmi:id="_jwPn4beqEearJ4erliAKEg" fontName="Lucida Grande"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jwPn4reqEearJ4erliAKEg" points="[104, -52, -119, 180]$[104, -109, -119, 123]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jyzMpLeqEearJ4erliAKEg" id="(0.03636363636363636,1.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jyzzsLeqEearJ4erliAKEg" id="(0.7476635514018691,0.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_jwRdELeqEearJ4erliAKEg" type="4002" source="_jprs47eqEearJ4erliAKEg" target="_jps7ALeqEearJ4erliAKEg" routing="Rectilinear">
+    <children xmi:type="notation:DecorationNode" xmi:id="_jwRdE7eqEearJ4erliAKEg" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_jwRdFLeqEearJ4erliAKEg" x="33" y="26"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_jwRdFbeqEearJ4erliAKEg" type="6003">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_jwRdFreqEearJ4erliAKEg" x="-6" y="-16"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_jwRdEbeqEearJ4erliAKEg" fontName="Lucida Grande"/>
+    <element xmi:type="ecore:EReference" href="Architecture.ecore#//Stakeholder/concerns"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jwRdEreqEearJ4erliAKEg" points="[-29, 0, -5, -47]$[-29, 47, -5, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jyzMoLeqEearJ4erliAKEg" id="(0.6619718309859155,1.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jyzMobeqEearJ4erliAKEg" id="(0.17857142857142858,0.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_jwYKwLeqEearJ4erliAKEg" type="4004" source="_jprs47eqEearJ4erliAKEg" target="_jpWVsLeqEearJ4erliAKEg" routing="Rectilinear">
+    <styles xmi:type="notation:FontStyle" xmi:id="_jwYKwbeqEearJ4erliAKEg" fontName="Lucida Grande"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jwYKwreqEearJ4erliAKEg" points="[-23, -52, -201, 261]$[-23, -250, -201, 63]$[145, -250, -33, 63]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jy1o4reqEearJ4erliAKEg" id="(0.323943661971831,1.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jy1o47eqEearJ4erliAKEg" id="(0.25,0.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_jwanALeqEearJ4erliAKEg" type="4004" source="_jps7ALeqEearJ4erliAKEg" target="_jpWVsLeqEearJ4erliAKEg" routing="Rectilinear">
+    <styles xmi:type="notation:FontStyle" xmi:id="_jwanAbeqEearJ4erliAKEg" fontName="Lucida Grande"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jwanAreqEearJ4erliAKEg" points="[-54, -40, -184, 435]$[-117, -40, -247, 435]$[-117, -430, -247, 45]$[81, -430, -49, 45]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jyzzs7eqEearJ4erliAKEg" id="(0.5,1.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jyzztLeqEearJ4erliAKEg" id="(0.3712121212121212,0.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_jwccMLeqEearJ4erliAKEg" type="4002" source="_jptiELeqEearJ4erliAKEg" target="_jps7ALeqEearJ4erliAKEg" routing="Rectilinear">
+    <children xmi:type="notation:DecorationNode" xmi:id="_jwccM7eqEearJ4erliAKEg" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_jwccNLeqEearJ4erliAKEg" x="183" y="17"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_jwccNbeqEearJ4erliAKEg" type="6003">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_jwccNreqEearJ4erliAKEg" x="60" y="17"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_jwccMbeqEearJ4erliAKEg" fontName="Lucida Grande"/>
+    <element xmi:type="ecore:EReference" href="Architecture.ecore#//ArchitectureViewpoint/concerns"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jwccMreqEearJ4erliAKEg" points="[23, 0, 439, 52]$[23, 29, 439, 81]$[-418, 29, -2, 81]$[-418, 0, -2, 52]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jy2P8LeqEearJ4erliAKEg" id="(0.2672413793103448,1.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jy2P8beqEearJ4erliAKEg" id="(0.5178571428571429,0.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_jwgGkLeqEearJ4erliAKEg" type="4002" source="_jptiELeqEearJ4erliAKEg" target="_jpvXQLeqEearJ4erliAKEg" routing="Rectilinear">
+    <children xmi:type="notation:DecorationNode" xmi:id="_jwgGk7eqEearJ4erliAKEg" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_jwgGlLeqEearJ4erliAKEg" x="5" y="-8"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_jwgGlbeqEearJ4erliAKEg" type="6003">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_jwgGlreqEearJ4erliAKEg" x="1" y="13"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_jwgGkbeqEearJ4erliAKEg" fontName="Lucida Grande"/>
+    <element xmi:type="ecore:EReference" href="Architecture.ecore#//ArchitectureViewpoint/representationKinds"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jwgGkreqEearJ4erliAKEg" points="[-63, -32, 164, 27]$[-174, -32, 53, 27]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jy0awbeqEearJ4erliAKEg" id="(0.5431034482758621,1.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jy0awreqEearJ4erliAKEg" id="(0.49523809523809526,0.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_jwkYALeqEearJ4erliAKEg" type="4004" source="_jptiELeqEearJ4erliAKEg" target="_jpWVsLeqEearJ4erliAKEg" routing="Rectilinear">
+    <styles xmi:type="notation:FontStyle" xmi:id="_jwkYAbeqEearJ4erliAKEg" fontName="Lucida Grande"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jwkYAreqEearJ4erliAKEg" points="[10, -59, 290, 423]$[10, -419, 290, 63]$[-236, -419, 44, 63]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jy1o5LeqEearJ4erliAKEg" id="(0.7672413793103449,1.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jy1o5beqEearJ4erliAKEg" id="(0.6666666666666666,0.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_jwm0QLeqEearJ4erliAKEg" type="4002" source="_jpvXQLeqEearJ4erliAKEg" target="_jps7ALeqEearJ4erliAKEg" routing="Rectilinear">
+    <children xmi:type="notation:DecorationNode" xmi:id="_jwm0Q7eqEearJ4erliAKEg" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_jwm0RLeqEearJ4erliAKEg" x="16" y="-14"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_jwm0RbeqEearJ4erliAKEg" type="6003">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_jwm0RreqEearJ4erliAKEg" x="-6" y="13"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_jwm0QbeqEearJ4erliAKEg" fontName="Lucida Grande"/>
+    <element xmi:type="ecore:EReference" href="Architecture.ecore#//RepresentationKind/concerns"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jwm0QreqEearJ4erliAKEg" points="[-26, -32, 115, 27]$[-115, -32, 26, 27]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jyzMoreqEearJ4erliAKEg" id="(0.24761904761904763,1.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jyzMo7eqEearJ4erliAKEg" id="(0.7678571428571429,0.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_jwrswLeqEearJ4erliAKEg" type="4004" source="_jpvXQLeqEearJ4erliAKEg" target="_jpWVsLeqEearJ4erliAKEg" routing="Rectilinear">
+    <styles xmi:type="notation:FontStyle" xmi:id="_jwrswbeqEearJ4erliAKEg" fontName="Lucida Grande"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jwrswreqEearJ4erliAKEg" points="[29, 0, 78, 482]$[29, 40, 78, 522]$[290, 40, 339, 522]$[290, -437, 339, 45]$[17, -437, 66, 45]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jy2P8reqEearJ4erliAKEg" id="(0.49523809523809526,1.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jy2P87eqEearJ4erliAKEg" id="(0.5,0.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_jwuwELeqEearJ4erliAKEg" type="4003" source="_jpv-VreqEearJ4erliAKEg" target="_jptiELeqEearJ4erliAKEg" routing="Rectilinear">
+    <children xmi:type="notation:DecorationNode" xmi:id="_jwuwE7eqEearJ4erliAKEg" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_jwuwFLeqEearJ4erliAKEg" x="101" y="31"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_jwuwFbeqEearJ4erliAKEg" type="6004">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_jwuwFreqEearJ4erliAKEg" x="27" y="19"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_jwuwEbeqEearJ4erliAKEg" fontName="Lucida Grande"/>
+    <element xmi:type="ecore:EReference" href="Architecture.ecore#//ArchitectureContext/viewpoints"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jwuwEreqEearJ4erliAKEg" points="[100, -46, -26, -211]$[136, -46, 10, -211]$[136, 165, 10, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jyylkLeqEearJ4erliAKEg" id="(0.4953271028037383,1.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jyylkbeqEearJ4erliAKEg" id="(0.5344827586206896,0.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_jwyacLeqEearJ4erliAKEg" type="4004" source="_jpv-VreqEearJ4erliAKEg" target="_jpWVsLeqEearJ4erliAKEg" routing="Rectilinear">
+    <styles xmi:type="notation:FontStyle" xmi:id="_jwyacbeqEearJ4erliAKEg" fontName="Lucida Grande"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jwyacreqEearJ4erliAKEg" points="[-33, -123, 122, 108]$[-33, -150, 122, 81]$[-133, -150, 22, 81]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jy2P9LeqEearJ4erliAKEg" id="(0.7476635514018691,1.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jy2P9beqEearJ4erliAKEg" id="(0.8333333333333334,0.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_jw02sLeqEearJ4erliAKEg" type="4004" source="_jpxMc7eqEearJ4erliAKEg" target="_jpv-VreqEearJ4erliAKEg" routing="Rectilinear">
+    <styles xmi:type="notation:FontStyle" xmi:id="_jw02sbeqEearJ4erliAKEg" fontName="Lucida Grande"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jw02sreqEearJ4erliAKEg" points="[-32, -52, 64, 180]$[-32, -109, 64, 123]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jyzzsbeqEearJ4erliAKEg" id="(0.7851239669421488,1.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jyzzsreqEearJ4erliAKEg" id="(0.4953271028037383,0.0)"/>
+  </edges>
+</notation:Diagram>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.genmodel b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.genmodel
new file mode 100644
index 00000000000..da9eddcbbd8
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.genmodel
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2017 CEA LIST.&#xD;&#xA;&#xD;&#xA; All rights reserved. This program and the accompanying materials&#xD;&#xA; are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA; which accompanies this distribution, and is available at&#xD;&#xA; http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA; &#xD;&#xA; Contributors:&#xD;&#xA; Maged Elaasar - Initial API and implementation&#xD;&#xA; &#xD;&#xA;"
+    modelDirectory="/org.eclipse.papyrus.infra.core.architecture/src-gen" editDirectory="/org.eclipse.papyrus.infra.core.architecture.edit/src-gen"
+    editorDirectory="/org.eclipse.papyrus.infra.core.architecture.editor/src-gen"
+    modelPluginID="org.eclipse.papyrus.infra.core.architecture" modelName="Architecture"
+    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory="/org.eclipse.papyrus.infra.core.architecture.tests/src-gen"
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
+    usedGenPackages="../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel#//types"
+    operationReflection="true" importOrganizing="true">
+  <foreignModel>Architecture.ecore</foreignModel>
+  <genPackages prefix="Architecture" basePackage="org.eclipse.papyrus.infra.core"
+      resource="XMI" disposableProviderFactory="true" extensibleProviderFactory="true"
+      ecorePackage="Architecture.ecore#/">
+    <genClasses image="false" ecoreClass="Architecture.ecore#//ADElement">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Architecture.ecore#//ADElement/name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Architecture.ecore#//ADElement/desciption"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Architecture.ecore#//ADElement/qualifiedName"/>
+    </genClasses>
+    <genClasses ecoreClass="Architecture.ecore#//ArchitectureDomain">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureDomain/stakeholders"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureDomain/concerns"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureDomain/contexts"/>
+    </genClasses>
+    <genClasses ecoreClass="Architecture.ecore#//ArchitectureDescriptionLanguage">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureDescriptionLanguage/representationKinds"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureDescriptionLanguage/metamodel"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureDescriptionLanguage/profiles"/>
+    </genClasses>
+    <genClasses ecoreClass="Architecture.ecore#//Stakeholder">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Architecture.ecore#//Stakeholder/concerns"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference Architecture.ecore#//Stakeholder/domain"/>
+    </genClasses>
+    <genClasses ecoreClass="Architecture.ecore#//Concern">
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference Architecture.ecore#//Concern/domain"/>
+    </genClasses>
+    <genClasses ecoreClass="Architecture.ecore#//ArchitectureViewpoint">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureViewpoint/concerns"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureViewpoint/representationKinds"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureViewpoint/context"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Architecture.ecore#//ArchitectureViewpoint/id"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="Architecture.ecore#//RepresentationKind">
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference Architecture.ecore#//RepresentationKind/language"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Architecture.ecore#//RepresentationKind/concerns"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Architecture.ecore#//RepresentationKind/icon"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="Architecture.ecore#//ArchitectureContext">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureContext/viewpoints"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureContext/elementTypes"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureContext/domain"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Architecture.ecore#//ArchitectureContext/id"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Architecture.ecore#//ArchitectureContext/icon"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Architecture.ecore#//ArchitectureContext/extensionPrefix"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Architecture.ecore#//ArchitectureContext/creationCommandClass"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Architecture.ecore#//ArchitectureContext/conversionCommandClass"/>
+    </genClasses>
+    <genClasses ecoreClass="Architecture.ecore#//ArchitectureFramework"/>
+    <genClasses ecoreClass="Architecture.ecore#//ArchitectureDescription">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Architecture.ecore#//ArchitectureDescription/contextId"/>
+    </genClasses>
+    <genClasses ecoreClass="Architecture.ecore#//ArchitectureDescriptionPreferences">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Architecture.ecore#//ArchitectureDescriptionPreferences/viewpointIds"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/plugin.properties b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/plugin.properties
new file mode 100644
index 00000000000..3c83e2e9911
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/plugin.properties
@@ -0,0 +1,14 @@
+* Copyright (c) 2017 CEA LIST.
+# 
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#  
+#  Contributors:
+#  Maged Elaasar - Initial API and implementation
+#  
+# 
+
+pluginName = Architecture Model
+providerName=Eclipse Modeling Project
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/plugin.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/plugin.xml
new file mode 100644
index 00000000000..2a2316fe91e
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/plugin.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+* Copyright (c) 2017 CEA LIST.
+ 
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/legal/epl-v10.html
+  
+  Contributors:
+  Maged Elaasar - Initial API and implementation
+  
+ 
+-->
+
+<plugin>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated Architecture -->
+      <package
+            uri="http://www.eclipse.org/papyrus/infra/core/architecture"
+            class="org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage"
+            genModel="model/Architecture.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.extension_parser">
+      <!-- @generated Architecture -->
+      <parser
+            type="architecture"
+            class="org.eclipse.papyrus.infra.core.architecture.util.ArchitectureResourceFactoryImpl"/>
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/pom.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/pom.xml
index abd91b76f69..3b10e0906b4 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/pom.xml
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/pom.xml
@@ -3,11 +3,11 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.infra-viewpoints</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
+		<artifactId>org.eclipse.papyrus.infra-core</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<artifactId>org.eclipse.papyrus.infra.viewpoints.iso42010.edit</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
+	<artifactId>org.eclipse.papyrus.infra.core.architecture</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ADElement.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ADElement.java
new file mode 100644
index 00000000000..c69ce6f01ae
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ADElement.java
@@ -0,0 +1,104 @@
+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>AD Element</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.ADElement#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.ADElement#getDesciption <em>Desciption</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.ADElement#getQualifiedName <em>Qualified Name</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getADElement()
+ * @model abstract="true"
+ * @generated
+ */
+public interface ADElement 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.infra.core.architecture.ArchitecturePackage#getADElement_Name()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.core.architecture.ADElement#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);
+
+	/**
+	 * Returns the value of the '<em><b>Desciption</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Desciption</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Desciption</em>' attribute.
+	 * @see #setDesciption(String)
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getADElement_Desciption()
+	 * @model
+	 * @generated
+	 */
+	String getDesciption();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.core.architecture.ADElement#getDesciption <em>Desciption</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Desciption</em>' attribute.
+	 * @see #getDesciption()
+	 * @generated
+	 */
+	void setDesciption(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Qualified 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>Qualified Name</em>' attribute.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getADElement_QualifiedName()
+	 * @model transient="true" changeable="false" volatile="true" derived="true"
+	 * @generated
+	 */
+	String getQualifiedName();
+
+} // ADElement
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureContext.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureContext.java
new file mode 100644
index 00000000000..877547958ca
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureContext.java
@@ -0,0 +1,235 @@
+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Context</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getViewpoints <em>Viewpoints</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getElementTypes <em>Element Types</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getDomain <em>Domain</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getId <em>Id</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getIcon <em>Icon</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getExtensionPrefix <em>Extension Prefix</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getCreationCommandClass <em>Creation Command Class</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getConversionCommandClass <em>Conversion Command Class</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureContext()
+ * @model abstract="true"
+ * @generated
+ */
+public interface ArchitectureContext extends ADElement {
+	/**
+	 * Returns the value of the '<em><b>Viewpoints</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint}.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint#getContext <em>Context</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Viewpoints</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>Viewpoints</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureContext_Viewpoints()
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint#getContext
+	 * @model opposite="context" containment="true"
+	 * @generated
+	 */
+	EList<ArchitectureViewpoint> getViewpoints();
+
+	/**
+	 * Returns the value of the '<em><b>Element Types</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Element Types</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>Element Types</em>' reference list.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureContext_ElementTypes()
+	 * @model
+	 * @generated
+	 */
+	EList<ElementTypeSetConfiguration> getElementTypes();
+
+	/**
+	 * Returns the value of the '<em><b>Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>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>Id</em>' attribute.
+	 * @see #setId(String)
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureContext_Id()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getId();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getId <em>Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * @see #getId()
+	 * @generated
+	 */
+	void setId(String 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.infra.core.architecture.ArchitecturePackage#getArchitectureContext_Icon()
+	 * @model
+	 * @generated
+	 */
+	String getIcon();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#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);
+
+	/**
+	 * Returns the value of the '<em><b>Extension Prefix</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Extension Prefix</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Extension Prefix</em>' attribute.
+	 * @see #setExtensionPrefix(String)
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureContext_ExtensionPrefix()
+	 * @model
+	 * @generated
+	 */
+	String getExtensionPrefix();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getExtensionPrefix <em>Extension Prefix</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Extension Prefix</em>' attribute.
+	 * @see #getExtensionPrefix()
+	 * @generated
+	 */
+	void setExtensionPrefix(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Creation Command Class</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Creation Command Class</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Creation Command Class</em>' attribute.
+	 * @see #setCreationCommandClass(Class)
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureContext_CreationCommandClass()
+	 * @model required="true"
+	 * @generated
+	 */
+	Class<?> getCreationCommandClass();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getCreationCommandClass <em>Creation Command Class</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Creation Command Class</em>' attribute.
+	 * @see #getCreationCommandClass()
+	 * @generated
+	 */
+	void setCreationCommandClass(Class<?> value);
+
+	/**
+	 * Returns the value of the '<em><b>Conversion Command Class</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Conversion Command Class</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Conversion Command Class</em>' attribute.
+	 * @see #setConversionCommandClass(Class)
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureContext_ConversionCommandClass()
+	 * @model
+	 * @generated
+	 */
+	Class<?> getConversionCommandClass();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getConversionCommandClass <em>Conversion Command Class</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Conversion Command Class</em>' attribute.
+	 * @see #getConversionCommandClass()
+	 * @generated
+	 */
+	void setConversionCommandClass(Class<?> value);
+
+	/**
+	 * Returns the value of the '<em><b>Domain</b></em>' container reference.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain#getContexts <em>Contexts</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(ArchitectureDomain)
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureContext_Domain()
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain#getContexts
+	 * @model opposite="contexts" required="true" transient="false"
+	 * @generated
+	 */
+	ArchitectureDomain getDomain();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#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(ArchitectureDomain value);
+
+} // ArchitectureContext
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureDescription.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureDescription.java
new file mode 100644
index 00000000000..e7386326323
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureDescription.java
@@ -0,0 +1,61 @@
+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Description</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDescription#getContextId <em>Context Id</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureDescription()
+ * @model
+ * @generated
+ */
+public interface ArchitectureDescription extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Context Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>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>Context Id</em>' attribute.
+	 * @see #setContextId(String)
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureDescription_ContextId()
+	 * @model
+	 * @generated
+	 */
+	String getContextId();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDescription#getContextId <em>Context Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Context Id</em>' attribute.
+	 * @see #getContextId()
+	 * @generated
+	 */
+	void setContextId(String value);
+
+} // ArchitectureDescription
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureDescriptionLanguage.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureDescriptionLanguage.java
new file mode 100644
index 00000000000..d4fc61e950b
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureDescriptionLanguage.java
@@ -0,0 +1,98 @@
+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Description Language</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage#getRepresentationKinds <em>Representation Kinds</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage#getMetamodel <em>Metamodel</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage#getProfiles <em>Profiles</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureDescriptionLanguage()
+ * @model
+ * @generated
+ */
+public interface ArchitectureDescriptionLanguage extends ArchitectureContext {
+	/**
+	 * Returns the value of the '<em><b>Representation Kinds</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.core.architecture.RepresentationKind}.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.core.architecture.RepresentationKind#getLanguage <em>Language</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Representation Kinds</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>Representation Kinds</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureDescriptionLanguage_RepresentationKinds()
+	 * @see org.eclipse.papyrus.infra.core.architecture.RepresentationKind#getLanguage
+	 * @model opposite="language" containment="true"
+	 * @generated
+	 */
+	EList<RepresentationKind> getRepresentationKinds();
+
+	/**
+	 * Returns the value of the '<em><b>Metamodel</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Metamodel</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Metamodel</em>' reference.
+	 * @see #setMetamodel(EPackage)
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureDescriptionLanguage_Metamodel()
+	 * @model required="true"
+	 * @generated
+	 */
+	EPackage getMetamodel();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage#getMetamodel <em>Metamodel</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Metamodel</em>' reference.
+	 * @see #getMetamodel()
+	 * @generated
+	 */
+	void setMetamodel(EPackage value);
+
+	/**
+	 * Returns the value of the '<em><b>Profiles</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.emf.ecore.EPackage}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Profiles</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>Profiles</em>' reference list.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureDescriptionLanguage_Profiles()
+	 * @model
+	 * @generated
+	 */
+	EList<EPackage> getProfiles();
+
+} // ArchitectureDescriptionLanguage
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureDescriptionPreferences.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureDescriptionPreferences.java
new file mode 100644
index 00000000000..c5b8dda0e17
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureDescriptionPreferences.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Description Preferences</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionPreferences#getViewpointIds <em>Viewpoint Ids</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureDescriptionPreferences()
+ * @model
+ * @generated
+ */
+public interface ArchitectureDescriptionPreferences extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Viewpoint Ids</b></em>' attribute list.
+	 * The list contents are of type {@link java.lang.String}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Viewpoint Ids</em>' attribute list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Viewpoint Ids</em>' attribute list.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureDescriptionPreferences_ViewpointIds()
+	 * @model
+	 * @generated
+	 */
+	EList<String> getViewpointIds();
+
+} // ArchitectureDescriptionPreferences
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureDomain.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureDomain.java
new file mode 100644
index 00000000000..8a19c42084a
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureDomain.java
@@ -0,0 +1,91 @@
+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Domain</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain#getStakeholders <em>Stakeholders</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain#getConcerns <em>Concerns</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain#getContexts <em>Contexts</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureDomain()
+ * @model
+ * @generated
+ */
+public interface ArchitectureDomain extends ADElement {
+	/**
+	 * Returns the value of the '<em><b>Stakeholders</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.core.architecture.Stakeholder}.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.core.architecture.Stakeholder#getDomain <em>Domain</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Stakeholders</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>Stakeholders</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureDomain_Stakeholders()
+	 * @see org.eclipse.papyrus.infra.core.architecture.Stakeholder#getDomain
+	 * @model opposite="domain" containment="true"
+	 * @generated
+	 */
+	EList<Stakeholder> getStakeholders();
+
+	/**
+	 * Returns the value of the '<em><b>Concerns</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.core.architecture.Concern}.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.core.architecture.Concern#getDomain <em>Domain</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Concerns</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>Concerns</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureDomain_Concerns()
+	 * @see org.eclipse.papyrus.infra.core.architecture.Concern#getDomain
+	 * @model opposite="domain" containment="true"
+	 * @generated
+	 */
+	EList<Concern> getConcerns();
+
+	/**
+	 * Returns the value of the '<em><b>Contexts</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext}.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getDomain <em>Domain</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Contexts</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>Contexts</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureDomain_Contexts()
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getDomain
+	 * @model opposite="domain" containment="true"
+	 * @generated
+	 */
+	EList<ArchitectureContext> getContexts();
+
+} // ArchitectureDomain
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureFactory.java
new file mode 100644
index 00000000000..d2ad64ff8cc
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureFactory.java
@@ -0,0 +1,116 @@
+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage
+ * @generated
+ */
+public interface ArchitectureFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	ArchitectureFactory eINSTANCE = org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Domain</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Domain</em>'.
+	 * @generated
+	 */
+	ArchitectureDomain createArchitectureDomain();
+
+	/**
+	 * Returns a new object of class '<em>Description Language</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Description Language</em>'.
+	 * @generated
+	 */
+	ArchitectureDescriptionLanguage createArchitectureDescriptionLanguage();
+
+	/**
+	 * Returns a new object of class '<em>Stakeholder</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Stakeholder</em>'.
+	 * @generated
+	 */
+	Stakeholder createStakeholder();
+
+	/**
+	 * Returns a new object of class '<em>Concern</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Concern</em>'.
+	 * @generated
+	 */
+	Concern createConcern();
+
+	/**
+	 * Returns a new object of class '<em>Viewpoint</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Viewpoint</em>'.
+	 * @generated
+	 */
+	ArchitectureViewpoint createArchitectureViewpoint();
+
+	/**
+	 * Returns a new object of class '<em>Framework</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Framework</em>'.
+	 * @generated
+	 */
+	ArchitectureFramework createArchitectureFramework();
+
+	/**
+	 * Returns a new object of class '<em>Description</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Description</em>'.
+	 * @generated
+	 */
+	ArchitectureDescription createArchitectureDescription();
+
+	/**
+	 * Returns a new object of class '<em>Description Preferences</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Description Preferences</em>'.
+	 * @generated
+	 */
+	ArchitectureDescriptionPreferences createArchitectureDescriptionPreferences();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	ArchitecturePackage getArchitecturePackage();
+
+} //ArchitectureFactory
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureFramework.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureFramework.java
new file mode 100644
index 00000000000..e08dfd79173
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureFramework.java
@@ -0,0 +1,28 @@
+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Framework</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureFramework()
+ * @model
+ * @generated
+ */
+public interface ArchitectureFramework extends ArchitectureContext {
+} // ArchitectureFramework
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitecturePackage.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitecturePackage.java
new file mode 100644
index 00000000000..113e4e2f861
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitecturePackage.java
@@ -0,0 +1,1796 @@
+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ *   <li>each class,</li>
+ *   <li>each feature of each class,</li>
+ *   <li>each operation of each class,</li>
+ *   <li>each enum,</li>
+ *   <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface ArchitecturePackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "architecture";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/infra/core/architecture";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "architecture";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	ArchitecturePackage eINSTANCE = org.eclipse.papyrus.infra.core.architecture.impl.ArchitecturePackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.core.architecture.impl.ADElementImpl <em>AD Element</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.core.architecture.impl.ADElementImpl
+	 * @see org.eclipse.papyrus.infra.core.architecture.impl.ArchitecturePackageImpl#getADElement()
+	 * @generated
+	 */
+	int AD_ELEMENT = 0;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AD_ELEMENT__NAME = 0;
+
+	/**
+	 * The feature id for the '<em><b>Desciption</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AD_ELEMENT__DESCIPTION = 1;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AD_ELEMENT__QUALIFIED_NAME = 2;
+
+	/**
+	 * The number of structural features of the '<em>AD Element</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AD_ELEMENT_FEATURE_COUNT = 3;
+
+	/**
+	 * The number of operations of the '<em>AD Element</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AD_ELEMENT_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureDomainImpl <em>Domain</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureDomainImpl
+	 * @see org.eclipse.papyrus.infra.core.architecture.impl.ArchitecturePackageImpl#getArchitectureDomain()
+	 * @generated
+	 */
+	int ARCHITECTURE_DOMAIN = 1;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_DOMAIN__NAME = AD_ELEMENT__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Desciption</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_DOMAIN__DESCIPTION = AD_ELEMENT__DESCIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_DOMAIN__QUALIFIED_NAME = AD_ELEMENT__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Stakeholders</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_DOMAIN__STAKEHOLDERS = AD_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Concerns</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_DOMAIN__CONCERNS = AD_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Contexts</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_DOMAIN__CONTEXTS = AD_ELEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Domain</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_DOMAIN_FEATURE_COUNT = AD_ELEMENT_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of operations of the '<em>Domain</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_DOMAIN_OPERATION_COUNT = AD_ELEMENT_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureContextImpl <em>Context</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureContextImpl
+	 * @see org.eclipse.papyrus.infra.core.architecture.impl.ArchitecturePackageImpl#getArchitectureContext()
+	 * @generated
+	 */
+	int ARCHITECTURE_CONTEXT = 7;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_CONTEXT__NAME = AD_ELEMENT__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Desciption</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_CONTEXT__DESCIPTION = AD_ELEMENT__DESCIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_CONTEXT__QUALIFIED_NAME = AD_ELEMENT__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Viewpoints</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_CONTEXT__VIEWPOINTS = AD_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Element Types</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_CONTEXT__ELEMENT_TYPES = AD_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Domain</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_CONTEXT__DOMAIN = AD_ELEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_CONTEXT__ID = AD_ELEMENT_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Icon</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_CONTEXT__ICON = AD_ELEMENT_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Extension Prefix</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_CONTEXT__EXTENSION_PREFIX = AD_ELEMENT_FEATURE_COUNT + 5;
+
+	/**
+	 * The feature id for the '<em><b>Creation Command Class</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_CONTEXT__CREATION_COMMAND_CLASS = AD_ELEMENT_FEATURE_COUNT + 6;
+
+	/**
+	 * The feature id for the '<em><b>Conversion Command Class</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_CONTEXT__CONVERSION_COMMAND_CLASS = AD_ELEMENT_FEATURE_COUNT + 7;
+
+	/**
+	 * The number of structural features of the '<em>Context</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_CONTEXT_FEATURE_COUNT = AD_ELEMENT_FEATURE_COUNT + 8;
+
+	/**
+	 * The number of operations of the '<em>Context</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_CONTEXT_OPERATION_COUNT = AD_ELEMENT_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureDescriptionLanguageImpl <em>Description Language</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureDescriptionLanguageImpl
+	 * @see org.eclipse.papyrus.infra.core.architecture.impl.ArchitecturePackageImpl#getArchitectureDescriptionLanguage()
+	 * @generated
+	 */
+	int ARCHITECTURE_DESCRIPTION_LANGUAGE = 2;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_DESCRIPTION_LANGUAGE__NAME = ARCHITECTURE_CONTEXT__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Desciption</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_DESCRIPTION_LANGUAGE__DESCIPTION = ARCHITECTURE_CONTEXT__DESCIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_DESCRIPTION_LANGUAGE__QUALIFIED_NAME = ARCHITECTURE_CONTEXT__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Viewpoints</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_DESCRIPTION_LANGUAGE__VIEWPOINTS = ARCHITECTURE_CONTEXT__VIEWPOINTS;
+
+	/**
+	 * The feature id for the '<em><b>Element Types</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_DESCRIPTION_LANGUAGE__ELEMENT_TYPES = ARCHITECTURE_CONTEXT__ELEMENT_TYPES;
+
+	/**
+	 * The feature id for the '<em><b>Domain</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_DESCRIPTION_LANGUAGE__DOMAIN = ARCHITECTURE_CONTEXT__DOMAIN;
+
+	/**
+	 * The feature id for the '<em><b>Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_DESCRIPTION_LANGUAGE__ID = ARCHITECTURE_CONTEXT__ID;
+
+	/**
+	 * The feature id for the '<em><b>Icon</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_DESCRIPTION_LANGUAGE__ICON = ARCHITECTURE_CONTEXT__ICON;
+
+	/**
+	 * The feature id for the '<em><b>Extension Prefix</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_DESCRIPTION_LANGUAGE__EXTENSION_PREFIX = ARCHITECTURE_CONTEXT__EXTENSION_PREFIX;
+
+	/**
+	 * The feature id for the '<em><b>Creation Command Class</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_DESCRIPTION_LANGUAGE__CREATION_COMMAND_CLASS = ARCHITECTURE_CONTEXT__CREATION_COMMAND_CLASS;
+
+	/**
+	 * The feature id for the '<em><b>Conversion Command Class</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_DESCRIPTION_LANGUAGE__CONVERSION_COMMAND_CLASS = ARCHITECTURE_CONTEXT__CONVERSION_COMMAND_CLASS;
+
+	/**
+	 * The feature id for the '<em><b>Representation Kinds</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS = ARCHITECTURE_CONTEXT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Metamodel</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_DESCRIPTION_LANGUAGE__METAMODEL = ARCHITECTURE_CONTEXT_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Profiles</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_DESCRIPTION_LANGUAGE__PROFILES = ARCHITECTURE_CONTEXT_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Description Language</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_DESCRIPTION_LANGUAGE_FEATURE_COUNT = ARCHITECTURE_CONTEXT_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of operations of the '<em>Description Language</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_DESCRIPTION_LANGUAGE_OPERATION_COUNT = ARCHITECTURE_CONTEXT_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.core.architecture.impl.StakeholderImpl <em>Stakeholder</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.core.architecture.impl.StakeholderImpl
+	 * @see org.eclipse.papyrus.infra.core.architecture.impl.ArchitecturePackageImpl#getStakeholder()
+	 * @generated
+	 */
+	int STAKEHOLDER = 3;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STAKEHOLDER__NAME = AD_ELEMENT__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Desciption</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STAKEHOLDER__DESCIPTION = AD_ELEMENT__DESCIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STAKEHOLDER__QUALIFIED_NAME = AD_ELEMENT__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Concerns</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STAKEHOLDER__CONCERNS = AD_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Domain</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STAKEHOLDER__DOMAIN = AD_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Stakeholder</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STAKEHOLDER_FEATURE_COUNT = AD_ELEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of operations of the '<em>Stakeholder</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STAKEHOLDER_OPERATION_COUNT = AD_ELEMENT_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.core.architecture.impl.ConcernImpl <em>Concern</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.core.architecture.impl.ConcernImpl
+	 * @see org.eclipse.papyrus.infra.core.architecture.impl.ArchitecturePackageImpl#getConcern()
+	 * @generated
+	 */
+	int CONCERN = 4;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONCERN__NAME = AD_ELEMENT__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Desciption</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONCERN__DESCIPTION = AD_ELEMENT__DESCIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONCERN__QUALIFIED_NAME = AD_ELEMENT__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Domain</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONCERN__DOMAIN = AD_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Concern</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONCERN_FEATURE_COUNT = AD_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Concern</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONCERN_OPERATION_COUNT = AD_ELEMENT_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureViewpointImpl <em>Viewpoint</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureViewpointImpl
+	 * @see org.eclipse.papyrus.infra.core.architecture.impl.ArchitecturePackageImpl#getArchitectureViewpoint()
+	 * @generated
+	 */
+	int ARCHITECTURE_VIEWPOINT = 5;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_VIEWPOINT__NAME = AD_ELEMENT__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Desciption</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_VIEWPOINT__DESCIPTION = AD_ELEMENT__DESCIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_VIEWPOINT__QUALIFIED_NAME = AD_ELEMENT__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Concerns</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_VIEWPOINT__CONCERNS = AD_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Representation Kinds</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_VIEWPOINT__REPRESENTATION_KINDS = AD_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Context</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_VIEWPOINT__CONTEXT = AD_ELEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_VIEWPOINT__ID = AD_ELEMENT_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of structural features of the '<em>Viewpoint</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_VIEWPOINT_FEATURE_COUNT = AD_ELEMENT_FEATURE_COUNT + 4;
+
+	/**
+	 * The number of operations of the '<em>Viewpoint</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_VIEWPOINT_OPERATION_COUNT = AD_ELEMENT_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.core.architecture.impl.RepresentationKindImpl <em>Representation Kind</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.core.architecture.impl.RepresentationKindImpl
+	 * @see org.eclipse.papyrus.infra.core.architecture.impl.ArchitecturePackageImpl#getRepresentationKind()
+	 * @generated
+	 */
+	int REPRESENTATION_KIND = 6;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int REPRESENTATION_KIND__NAME = AD_ELEMENT__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Desciption</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int REPRESENTATION_KIND__DESCIPTION = AD_ELEMENT__DESCIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int REPRESENTATION_KIND__QUALIFIED_NAME = AD_ELEMENT__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Language</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int REPRESENTATION_KIND__LANGUAGE = AD_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Concerns</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int REPRESENTATION_KIND__CONCERNS = AD_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Icon</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int REPRESENTATION_KIND__ICON = AD_ELEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Representation Kind</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int REPRESENTATION_KIND_FEATURE_COUNT = AD_ELEMENT_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of operations of the '<em>Representation Kind</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int REPRESENTATION_KIND_OPERATION_COUNT = AD_ELEMENT_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureFrameworkImpl <em>Framework</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureFrameworkImpl
+	 * @see org.eclipse.papyrus.infra.core.architecture.impl.ArchitecturePackageImpl#getArchitectureFramework()
+	 * @generated
+	 */
+	int ARCHITECTURE_FRAMEWORK = 8;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_FRAMEWORK__NAME = ARCHITECTURE_CONTEXT__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Desciption</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_FRAMEWORK__DESCIPTION = ARCHITECTURE_CONTEXT__DESCIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_FRAMEWORK__QUALIFIED_NAME = ARCHITECTURE_CONTEXT__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Viewpoints</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_FRAMEWORK__VIEWPOINTS = ARCHITECTURE_CONTEXT__VIEWPOINTS;
+
+	/**
+	 * The feature id for the '<em><b>Element Types</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_FRAMEWORK__ELEMENT_TYPES = ARCHITECTURE_CONTEXT__ELEMENT_TYPES;
+
+	/**
+	 * The feature id for the '<em><b>Domain</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_FRAMEWORK__DOMAIN = ARCHITECTURE_CONTEXT__DOMAIN;
+
+	/**
+	 * The feature id for the '<em><b>Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_FRAMEWORK__ID = ARCHITECTURE_CONTEXT__ID;
+
+	/**
+	 * The feature id for the '<em><b>Icon</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_FRAMEWORK__ICON = ARCHITECTURE_CONTEXT__ICON;
+
+	/**
+	 * The feature id for the '<em><b>Extension Prefix</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_FRAMEWORK__EXTENSION_PREFIX = ARCHITECTURE_CONTEXT__EXTENSION_PREFIX;
+
+	/**
+	 * The feature id for the '<em><b>Creation Command Class</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_FRAMEWORK__CREATION_COMMAND_CLASS = ARCHITECTURE_CONTEXT__CREATION_COMMAND_CLASS;
+
+	/**
+	 * The feature id for the '<em><b>Conversion Command Class</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_FRAMEWORK__CONVERSION_COMMAND_CLASS = ARCHITECTURE_CONTEXT__CONVERSION_COMMAND_CLASS;
+
+	/**
+	 * The number of structural features of the '<em>Framework</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_FRAMEWORK_FEATURE_COUNT = ARCHITECTURE_CONTEXT_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Framework</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_FRAMEWORK_OPERATION_COUNT = ARCHITECTURE_CONTEXT_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureDescriptionImpl <em>Description</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureDescriptionImpl
+	 * @see org.eclipse.papyrus.infra.core.architecture.impl.ArchitecturePackageImpl#getArchitectureDescription()
+	 * @generated
+	 */
+	int ARCHITECTURE_DESCRIPTION = 9;
+
+	/**
+	 * The feature id for the '<em><b>Context Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_DESCRIPTION__CONTEXT_ID = 0;
+
+	/**
+	 * The number of structural features of the '<em>Description</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_DESCRIPTION_FEATURE_COUNT = 1;
+
+	/**
+	 * The number of operations of the '<em>Description</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_DESCRIPTION_OPERATION_COUNT = 0;
+
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureDescriptionPreferencesImpl <em>Description Preferences</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureDescriptionPreferencesImpl
+	 * @see org.eclipse.papyrus.infra.core.architecture.impl.ArchitecturePackageImpl#getArchitectureDescriptionPreferences()
+	 * @generated
+	 */
+	int ARCHITECTURE_DESCRIPTION_PREFERENCES = 10;
+
+	/**
+	 * The feature id for the '<em><b>Viewpoint Ids</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_DESCRIPTION_PREFERENCES__VIEWPOINT_IDS = 0;
+
+	/**
+	 * The number of structural features of the '<em>Description Preferences</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_DESCRIPTION_PREFERENCES_FEATURE_COUNT = 1;
+
+	/**
+	 * The number of operations of the '<em>Description Preferences</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARCHITECTURE_DESCRIPTION_PREFERENCES_OPERATION_COUNT = 0;
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.core.architecture.ADElement <em>AD Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>AD Element</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ADElement
+	 * @generated
+	 */
+	EClass getADElement();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.core.architecture.ADElement#getName <em>Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Name</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ADElement#getName()
+	 * @see #getADElement()
+	 * @generated
+	 */
+	EAttribute getADElement_Name();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.core.architecture.ADElement#getDesciption <em>Desciption</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Desciption</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ADElement#getDesciption()
+	 * @see #getADElement()
+	 * @generated
+	 */
+	EAttribute getADElement_Desciption();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.core.architecture.ADElement#getQualifiedName <em>Qualified Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Qualified Name</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ADElement#getQualifiedName()
+	 * @see #getADElement()
+	 * @generated
+	 */
+	EAttribute getADElement_QualifiedName();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain <em>Domain</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Domain</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain
+	 * @generated
+	 */
+	EClass getArchitectureDomain();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain#getStakeholders <em>Stakeholders</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Stakeholders</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain#getStakeholders()
+	 * @see #getArchitectureDomain()
+	 * @generated
+	 */
+	EReference getArchitectureDomain_Stakeholders();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain#getConcerns <em>Concerns</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Concerns</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain#getConcerns()
+	 * @see #getArchitectureDomain()
+	 * @generated
+	 */
+	EReference getArchitectureDomain_Concerns();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain#getContexts <em>Contexts</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Contexts</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain#getContexts()
+	 * @see #getArchitectureDomain()
+	 * @generated
+	 */
+	EReference getArchitectureDomain_Contexts();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage <em>Description Language</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Description Language</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage
+	 * @generated
+	 */
+	EClass getArchitectureDescriptionLanguage();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage#getRepresentationKinds <em>Representation Kinds</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Representation Kinds</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage#getRepresentationKinds()
+	 * @see #getArchitectureDescriptionLanguage()
+	 * @generated
+	 */
+	EReference getArchitectureDescriptionLanguage_RepresentationKinds();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage#getMetamodel <em>Metamodel</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Metamodel</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage#getMetamodel()
+	 * @see #getArchitectureDescriptionLanguage()
+	 * @generated
+	 */
+	EReference getArchitectureDescriptionLanguage_Metamodel();
+
+	/**
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage#getProfiles <em>Profiles</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>Profiles</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage#getProfiles()
+	 * @see #getArchitectureDescriptionLanguage()
+	 * @generated
+	 */
+	EReference getArchitectureDescriptionLanguage_Profiles();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.core.architecture.Stakeholder <em>Stakeholder</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Stakeholder</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.Stakeholder
+	 * @generated
+	 */
+	EClass getStakeholder();
+
+	/**
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.core.architecture.Stakeholder#getConcerns <em>Concerns</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>Concerns</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.Stakeholder#getConcerns()
+	 * @see #getStakeholder()
+	 * @generated
+	 */
+	EReference getStakeholder_Concerns();
+
+	/**
+	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.infra.core.architecture.Stakeholder#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.infra.core.architecture.Stakeholder#getDomain()
+	 * @see #getStakeholder()
+	 * @generated
+	 */
+	EReference getStakeholder_Domain();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.core.architecture.Concern <em>Concern</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Concern</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.Concern
+	 * @generated
+	 */
+	EClass getConcern();
+
+	/**
+	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.infra.core.architecture.Concern#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.infra.core.architecture.Concern#getDomain()
+	 * @see #getConcern()
+	 * @generated
+	 */
+	EReference getConcern_Domain();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint <em>Viewpoint</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Viewpoint</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint
+	 * @generated
+	 */
+	EClass getArchitectureViewpoint();
+
+	/**
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint#getConcerns <em>Concerns</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>Concerns</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint#getConcerns()
+	 * @see #getArchitectureViewpoint()
+	 * @generated
+	 */
+	EReference getArchitectureViewpoint_Concerns();
+
+	/**
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint#getRepresentationKinds <em>Representation Kinds</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>Representation Kinds</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint#getRepresentationKinds()
+	 * @see #getArchitectureViewpoint()
+	 * @generated
+	 */
+	EReference getArchitectureViewpoint_RepresentationKinds();
+
+	/**
+	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint#getContext <em>Context</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the container reference '<em>Context</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint#getContext()
+	 * @see #getArchitectureViewpoint()
+	 * @generated
+	 */
+	EReference getArchitectureViewpoint_Context();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint#getId <em>Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Id</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint#getId()
+	 * @see #getArchitectureViewpoint()
+	 * @generated
+	 */
+	EAttribute getArchitectureViewpoint_Id();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.core.architecture.RepresentationKind <em>Representation Kind</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Representation Kind</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.RepresentationKind
+	 * @generated
+	 */
+	EClass getRepresentationKind();
+
+	/**
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.core.architecture.RepresentationKind#getConcerns <em>Concerns</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>Concerns</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.RepresentationKind#getConcerns()
+	 * @see #getRepresentationKind()
+	 * @generated
+	 */
+	EReference getRepresentationKind_Concerns();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.core.architecture.RepresentationKind#getIcon <em>Icon</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Icon</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.RepresentationKind#getIcon()
+	 * @see #getRepresentationKind()
+	 * @generated
+	 */
+	EAttribute getRepresentationKind_Icon();
+
+	/**
+	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.infra.core.architecture.RepresentationKind#getLanguage <em>Language</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the container reference '<em>Language</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.RepresentationKind#getLanguage()
+	 * @see #getRepresentationKind()
+	 * @generated
+	 */
+	EReference getRepresentationKind_Language();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext <em>Context</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Context</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureContext
+	 * @generated
+	 */
+	EClass getArchitectureContext();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getViewpoints <em>Viewpoints</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Viewpoints</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getViewpoints()
+	 * @see #getArchitectureContext()
+	 * @generated
+	 */
+	EReference getArchitectureContext_Viewpoints();
+
+	/**
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getElementTypes <em>Element Types</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>Element Types</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getElementTypes()
+	 * @see #getArchitectureContext()
+	 * @generated
+	 */
+	EReference getArchitectureContext_ElementTypes();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getId <em>Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Id</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getId()
+	 * @see #getArchitectureContext()
+	 * @generated
+	 */
+	EAttribute getArchitectureContext_Id();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getIcon <em>Icon</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Icon</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getIcon()
+	 * @see #getArchitectureContext()
+	 * @generated
+	 */
+	EAttribute getArchitectureContext_Icon();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getExtensionPrefix <em>Extension Prefix</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Extension Prefix</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getExtensionPrefix()
+	 * @see #getArchitectureContext()
+	 * @generated
+	 */
+	EAttribute getArchitectureContext_ExtensionPrefix();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getCreationCommandClass <em>Creation Command Class</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Creation Command Class</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getCreationCommandClass()
+	 * @see #getArchitectureContext()
+	 * @generated
+	 */
+	EAttribute getArchitectureContext_CreationCommandClass();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getConversionCommandClass <em>Conversion Command Class</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Conversion Command Class</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getConversionCommandClass()
+	 * @see #getArchitectureContext()
+	 * @generated
+	 */
+	EAttribute getArchitectureContext_ConversionCommandClass();
+
+	/**
+	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#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.infra.core.architecture.ArchitectureContext#getDomain()
+	 * @see #getArchitectureContext()
+	 * @generated
+	 */
+	EReference getArchitectureContext_Domain();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureFramework <em>Framework</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Framework</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureFramework
+	 * @generated
+	 */
+	EClass getArchitectureFramework();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDescription <em>Description</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Description</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureDescription
+	 * @generated
+	 */
+	EClass getArchitectureDescription();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDescription#getContextId <em>Context Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Context Id</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureDescription#getContextId()
+	 * @see #getArchitectureDescription()
+	 * @generated
+	 */
+	EAttribute getArchitectureDescription_ContextId();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionPreferences <em>Description Preferences</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Description Preferences</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionPreferences
+	 * @generated
+	 */
+	EClass getArchitectureDescriptionPreferences();
+
+	/**
+	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionPreferences#getViewpointIds <em>Viewpoint Ids</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute list '<em>Viewpoint Ids</em>'.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionPreferences#getViewpointIds()
+	 * @see #getArchitectureDescriptionPreferences()
+	 * @generated
+	 */
+	EAttribute getArchitectureDescriptionPreferences_ViewpointIds();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	ArchitectureFactory getArchitectureFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 *   <li>each class,</li>
+	 *   <li>each feature of each class,</li>
+	 *   <li>each operation of each class,</li>
+	 *   <li>each enum,</li>
+	 *   <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.core.architecture.impl.ADElementImpl <em>AD Element</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.core.architecture.impl.ADElementImpl
+		 * @see org.eclipse.papyrus.infra.core.architecture.impl.ArchitecturePackageImpl#getADElement()
+		 * @generated
+		 */
+		EClass AD_ELEMENT = eINSTANCE.getADElement();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute AD_ELEMENT__NAME = eINSTANCE.getADElement_Name();
+
+		/**
+		 * The meta object literal for the '<em><b>Desciption</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute AD_ELEMENT__DESCIPTION = eINSTANCE.getADElement_Desciption();
+
+		/**
+		 * The meta object literal for the '<em><b>Qualified Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute AD_ELEMENT__QUALIFIED_NAME = eINSTANCE.getADElement_QualifiedName();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureDomainImpl <em>Domain</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureDomainImpl
+		 * @see org.eclipse.papyrus.infra.core.architecture.impl.ArchitecturePackageImpl#getArchitectureDomain()
+		 * @generated
+		 */
+		EClass ARCHITECTURE_DOMAIN = eINSTANCE.getArchitectureDomain();
+
+		/**
+		 * The meta object literal for the '<em><b>Stakeholders</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ARCHITECTURE_DOMAIN__STAKEHOLDERS = eINSTANCE.getArchitectureDomain_Stakeholders();
+
+		/**
+		 * The meta object literal for the '<em><b>Concerns</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ARCHITECTURE_DOMAIN__CONCERNS = eINSTANCE.getArchitectureDomain_Concerns();
+
+		/**
+		 * The meta object literal for the '<em><b>Contexts</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ARCHITECTURE_DOMAIN__CONTEXTS = eINSTANCE.getArchitectureDomain_Contexts();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureDescriptionLanguageImpl <em>Description Language</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureDescriptionLanguageImpl
+		 * @see org.eclipse.papyrus.infra.core.architecture.impl.ArchitecturePackageImpl#getArchitectureDescriptionLanguage()
+		 * @generated
+		 */
+		EClass ARCHITECTURE_DESCRIPTION_LANGUAGE = eINSTANCE.getArchitectureDescriptionLanguage();
+
+		/**
+		 * The meta object literal for the '<em><b>Representation Kinds</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS = eINSTANCE.getArchitectureDescriptionLanguage_RepresentationKinds();
+
+		/**
+		 * The meta object literal for the '<em><b>Metamodel</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ARCHITECTURE_DESCRIPTION_LANGUAGE__METAMODEL = eINSTANCE.getArchitectureDescriptionLanguage_Metamodel();
+
+		/**
+		 * The meta object literal for the '<em><b>Profiles</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ARCHITECTURE_DESCRIPTION_LANGUAGE__PROFILES = eINSTANCE.getArchitectureDescriptionLanguage_Profiles();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.core.architecture.impl.StakeholderImpl <em>Stakeholder</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.core.architecture.impl.StakeholderImpl
+		 * @see org.eclipse.papyrus.infra.core.architecture.impl.ArchitecturePackageImpl#getStakeholder()
+		 * @generated
+		 */
+		EClass STAKEHOLDER = eINSTANCE.getStakeholder();
+
+		/**
+		 * The meta object literal for the '<em><b>Concerns</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference STAKEHOLDER__CONCERNS = eINSTANCE.getStakeholder_Concerns();
+
+		/**
+		 * The meta object literal for the '<em><b>Domain</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference STAKEHOLDER__DOMAIN = eINSTANCE.getStakeholder_Domain();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.core.architecture.impl.ConcernImpl <em>Concern</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.core.architecture.impl.ConcernImpl
+		 * @see org.eclipse.papyrus.infra.core.architecture.impl.ArchitecturePackageImpl#getConcern()
+		 * @generated
+		 */
+		EClass CONCERN = eINSTANCE.getConcern();
+
+		/**
+		 * The meta object literal for the '<em><b>Domain</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CONCERN__DOMAIN = eINSTANCE.getConcern_Domain();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureViewpointImpl <em>Viewpoint</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureViewpointImpl
+		 * @see org.eclipse.papyrus.infra.core.architecture.impl.ArchitecturePackageImpl#getArchitectureViewpoint()
+		 * @generated
+		 */
+		EClass ARCHITECTURE_VIEWPOINT = eINSTANCE.getArchitectureViewpoint();
+
+		/**
+		 * The meta object literal for the '<em><b>Concerns</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ARCHITECTURE_VIEWPOINT__CONCERNS = eINSTANCE.getArchitectureViewpoint_Concerns();
+
+		/**
+		 * The meta object literal for the '<em><b>Representation Kinds</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ARCHITECTURE_VIEWPOINT__REPRESENTATION_KINDS = eINSTANCE.getArchitectureViewpoint_RepresentationKinds();
+
+		/**
+		 * The meta object literal for the '<em><b>Context</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ARCHITECTURE_VIEWPOINT__CONTEXT = eINSTANCE.getArchitectureViewpoint_Context();
+
+		/**
+		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute ARCHITECTURE_VIEWPOINT__ID = eINSTANCE.getArchitectureViewpoint_Id();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.core.architecture.impl.RepresentationKindImpl <em>Representation Kind</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.core.architecture.impl.RepresentationKindImpl
+		 * @see org.eclipse.papyrus.infra.core.architecture.impl.ArchitecturePackageImpl#getRepresentationKind()
+		 * @generated
+		 */
+		EClass REPRESENTATION_KIND = eINSTANCE.getRepresentationKind();
+
+		/**
+		 * The meta object literal for the '<em><b>Concerns</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference REPRESENTATION_KIND__CONCERNS = eINSTANCE.getRepresentationKind_Concerns();
+
+		/**
+		 * The meta object literal for the '<em><b>Icon</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute REPRESENTATION_KIND__ICON = eINSTANCE.getRepresentationKind_Icon();
+
+		/**
+		 * The meta object literal for the '<em><b>Language</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference REPRESENTATION_KIND__LANGUAGE = eINSTANCE.getRepresentationKind_Language();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureContextImpl <em>Context</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureContextImpl
+		 * @see org.eclipse.papyrus.infra.core.architecture.impl.ArchitecturePackageImpl#getArchitectureContext()
+		 * @generated
+		 */
+		EClass ARCHITECTURE_CONTEXT = eINSTANCE.getArchitectureContext();
+
+		/**
+		 * The meta object literal for the '<em><b>Viewpoints</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ARCHITECTURE_CONTEXT__VIEWPOINTS = eINSTANCE.getArchitectureContext_Viewpoints();
+
+		/**
+		 * The meta object literal for the '<em><b>Element Types</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ARCHITECTURE_CONTEXT__ELEMENT_TYPES = eINSTANCE.getArchitectureContext_ElementTypes();
+
+		/**
+		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute ARCHITECTURE_CONTEXT__ID = eINSTANCE.getArchitectureContext_Id();
+
+		/**
+		 * The meta object literal for the '<em><b>Icon</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute ARCHITECTURE_CONTEXT__ICON = eINSTANCE.getArchitectureContext_Icon();
+
+		/**
+		 * The meta object literal for the '<em><b>Extension Prefix</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute ARCHITECTURE_CONTEXT__EXTENSION_PREFIX = eINSTANCE.getArchitectureContext_ExtensionPrefix();
+
+		/**
+		 * The meta object literal for the '<em><b>Creation Command Class</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute ARCHITECTURE_CONTEXT__CREATION_COMMAND_CLASS = eINSTANCE.getArchitectureContext_CreationCommandClass();
+
+		/**
+		 * The meta object literal for the '<em><b>Conversion Command Class</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute ARCHITECTURE_CONTEXT__CONVERSION_COMMAND_CLASS = eINSTANCE.getArchitectureContext_ConversionCommandClass();
+
+		/**
+		 * The meta object literal for the '<em><b>Domain</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ARCHITECTURE_CONTEXT__DOMAIN = eINSTANCE.getArchitectureContext_Domain();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureFrameworkImpl <em>Framework</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureFrameworkImpl
+		 * @see org.eclipse.papyrus.infra.core.architecture.impl.ArchitecturePackageImpl#getArchitectureFramework()
+		 * @generated
+		 */
+		EClass ARCHITECTURE_FRAMEWORK = eINSTANCE.getArchitectureFramework();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureDescriptionImpl <em>Description</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureDescriptionImpl
+		 * @see org.eclipse.papyrus.infra.core.architecture.impl.ArchitecturePackageImpl#getArchitectureDescription()
+		 * @generated
+		 */
+		EClass ARCHITECTURE_DESCRIPTION = eINSTANCE.getArchitectureDescription();
+
+		/**
+		 * The meta object literal for the '<em><b>Context Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute ARCHITECTURE_DESCRIPTION__CONTEXT_ID = eINSTANCE.getArchitectureDescription_ContextId();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureDescriptionPreferencesImpl <em>Description Preferences</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureDescriptionPreferencesImpl
+		 * @see org.eclipse.papyrus.infra.core.architecture.impl.ArchitecturePackageImpl#getArchitectureDescriptionPreferences()
+		 * @generated
+		 */
+		EClass ARCHITECTURE_DESCRIPTION_PREFERENCES = eINSTANCE.getArchitectureDescriptionPreferences();
+
+		/**
+		 * The meta object literal for the '<em><b>Viewpoint Ids</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute ARCHITECTURE_DESCRIPTION_PREFERENCES__VIEWPOINT_IDS = eINSTANCE.getArchitectureDescriptionPreferences_ViewpointIds();
+
+	}
+
+} //ArchitecturePackage
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureViewpoint.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureViewpoint.java
new file mode 100644
index 00000000000..6751688a169
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureViewpoint.java
@@ -0,0 +1,124 @@
+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Viewpoint</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint#getConcerns <em>Concerns</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint#getRepresentationKinds <em>Representation Kinds</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint#getContext <em>Context</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint#getId <em>Id</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureViewpoint()
+ * @model
+ * @generated
+ */
+public interface ArchitectureViewpoint extends ADElement {
+	/**
+	 * Returns the value of the '<em><b>Concerns</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.core.architecture.Concern}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Concerns</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>Concerns</em>' reference list.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureViewpoint_Concerns()
+	 * @model
+	 * @generated
+	 */
+	EList<Concern> getConcerns();
+
+	/**
+	 * Returns the value of the '<em><b>Representation Kinds</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.core.architecture.RepresentationKind}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Representation Kinds</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>Representation Kinds</em>' reference list.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureViewpoint_RepresentationKinds()
+	 * @model
+	 * @generated
+	 */
+	EList<RepresentationKind> getRepresentationKinds();
+
+	/**
+	 * Returns the value of the '<em><b>Context</b></em>' container reference.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getViewpoints <em>Viewpoints</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Context</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>Context</em>' container reference.
+	 * @see #setContext(ArchitectureContext)
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureViewpoint_Context()
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getViewpoints
+	 * @model opposite="viewpoints" required="true" transient="false"
+	 * @generated
+	 */
+	ArchitectureContext getContext();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint#getContext <em>Context</em>}' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Context</em>' container reference.
+	 * @see #getContext()
+	 * @generated
+	 */
+	void setContext(ArchitectureContext value);
+
+	/**
+	 * Returns the value of the '<em><b>Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>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>Id</em>' attribute.
+	 * @see #setId(String)
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureViewpoint_Id()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getId();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint#getId <em>Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * @see #getId()
+	 * @generated
+	 */
+	void setId(String value);
+
+} // ArchitectureViewpoint
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/Concern.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/Concern.java
new file mode 100644
index 00000000000..e5de014c4ab
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/Concern.java
@@ -0,0 +1,62 @@
+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Concern</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.Concern#getDomain <em>Domain</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getConcern()
+ * @model
+ * @generated
+ */
+public interface Concern extends ADElement {
+
+	/**
+	 * Returns the value of the '<em><b>Domain</b></em>' container reference.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain#getConcerns <em>Concerns</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(ArchitectureDomain)
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getConcern_Domain()
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain#getConcerns
+	 * @model opposite="concerns" required="true" transient="false"
+	 * @generated
+	 */
+	ArchitectureDomain getDomain();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.core.architecture.Concern#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(ArchitectureDomain value);
+} // Concern
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/RepresentationKind.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/RepresentationKind.java
new file mode 100644
index 00000000000..eb441b3759f
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/RepresentationKind.java
@@ -0,0 +1,107 @@
+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Representation Kind</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.RepresentationKind#getLanguage <em>Language</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.RepresentationKind#getConcerns <em>Concerns</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.RepresentationKind#getIcon <em>Icon</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getRepresentationKind()
+ * @model abstract="true"
+ * @generated
+ */
+public interface RepresentationKind extends ADElement {
+	/**
+	 * Returns the value of the '<em><b>Concerns</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.core.architecture.Concern}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Concerns</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>Concerns</em>' reference list.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getRepresentationKind_Concerns()
+	 * @model
+	 * @generated
+	 */
+	EList<Concern> getConcerns();
+
+	/**
+	 * 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.infra.core.architecture.ArchitecturePackage#getRepresentationKind_Icon()
+	 * @model
+	 * @generated
+	 */
+	String getIcon();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.core.architecture.RepresentationKind#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);
+
+	/**
+	 * Returns the value of the '<em><b>Language</b></em>' container reference.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage#getRepresentationKinds <em>Representation Kinds</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Language</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>Language</em>' container reference.
+	 * @see #setLanguage(ArchitectureDescriptionLanguage)
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getRepresentationKind_Language()
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage#getRepresentationKinds
+	 * @model opposite="representationKinds" required="true" transient="false"
+	 * @generated
+	 */
+	ArchitectureDescriptionLanguage getLanguage();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.core.architecture.RepresentationKind#getLanguage <em>Language</em>}' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Language</em>' container reference.
+	 * @see #getLanguage()
+	 * @generated
+	 */
+	void setLanguage(ArchitectureDescriptionLanguage value);
+
+} // RepresentationKind
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/Stakeholder.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/Stakeholder.java
new file mode 100644
index 00000000000..01ebf98df14
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/Stakeholder.java
@@ -0,0 +1,80 @@
+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Stakeholder</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.Stakeholder#getConcerns <em>Concerns</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.Stakeholder#getDomain <em>Domain</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getStakeholder()
+ * @model
+ * @generated
+ */
+public interface Stakeholder extends ADElement {
+	/**
+	 * Returns the value of the '<em><b>Concerns</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.core.architecture.Concern}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Concerns</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>Concerns</em>' reference list.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getStakeholder_Concerns()
+	 * @model
+	 * @generated
+	 */
+	EList<Concern> getConcerns();
+
+	/**
+	 * Returns the value of the '<em><b>Domain</b></em>' container reference.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain#getStakeholders <em>Stakeholders</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(ArchitectureDomain)
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getStakeholder_Domain()
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain#getStakeholders
+	 * @model opposite="stakeholders" required="true" transient="false"
+	 * @generated
+	 */
+	ArchitectureDomain getDomain();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.core.architecture.Stakeholder#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(ArchitectureDomain value);
+
+} // Stakeholder
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ADElementImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ADElementImpl.java
new file mode 100644
index 00000000000..7c2f7c08e15
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ADElementImpl.java
@@ -0,0 +1,257 @@
+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture.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.MinimalEObjectImpl;
+import org.eclipse.papyrus.infra.core.architecture.ADElement;
+import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>AD Element</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.impl.ADElementImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.impl.ADElementImpl#getDesciption <em>Desciption</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.impl.ADElementImpl#getQualifiedName <em>Qualified Name</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class ADElementImpl extends MinimalEObjectImpl.Container implements ADElement {
+	/**
+	 * 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;
+
+	/**
+	 * The default value of the '{@link #getDesciption() <em>Desciption</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDesciption()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DESCIPTION_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDesciption() <em>Desciption</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDesciption()
+	 * @generated
+	 * @ordered
+	 */
+	protected String desciption = DESCIPTION_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getQualifiedName() <em>Qualified Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getQualifiedName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String QUALIFIED_NAME_EDEFAULT = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ADElementImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ArchitecturePackage.Literals.AD_ELEMENT;
+	}
+
+	/**
+	 * <!-- 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, ArchitecturePackage.AD_ELEMENT__NAME, oldName, name));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getDesciption() {
+		return desciption;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDesciption(String newDesciption) {
+		String oldDesciption = desciption;
+		desciption = newDesciption;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ArchitecturePackage.AD_ELEMENT__DESCIPTION, oldDesciption, desciption));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	public String getQualifiedName() {
+		String qualifiedName = name;
+		ADElement parent = (ADElement) eContainer();
+		while (parent != null) {
+			qualifiedName = parent.getName()+"::"+qualifiedName;
+			parent = (ADElement) parent.eContainer();
+		}
+		return qualifiedName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case ArchitecturePackage.AD_ELEMENT__NAME:
+				return getName();
+			case ArchitecturePackage.AD_ELEMENT__DESCIPTION:
+				return getDesciption();
+			case ArchitecturePackage.AD_ELEMENT__QUALIFIED_NAME:
+				return getQualifiedName();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case ArchitecturePackage.AD_ELEMENT__NAME:
+				setName((String)newValue);
+				return;
+			case ArchitecturePackage.AD_ELEMENT__DESCIPTION:
+				setDesciption((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ArchitecturePackage.AD_ELEMENT__NAME:
+				setName(NAME_EDEFAULT);
+				return;
+			case ArchitecturePackage.AD_ELEMENT__DESCIPTION:
+				setDesciption(DESCIPTION_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ArchitecturePackage.AD_ELEMENT__NAME:
+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+			case ArchitecturePackage.AD_ELEMENT__DESCIPTION:
+				return DESCIPTION_EDEFAULT == null ? desciption != null : !DESCIPTION_EDEFAULT.equals(desciption);
+			case ArchitecturePackage.AD_ELEMENT__QUALIFIED_NAME:
+				return QUALIFIED_NAME_EDEFAULT == null ? getQualifiedName() != null : !QUALIFIED_NAME_EDEFAULT.equals(getQualifiedName());
+		}
+		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(", desciption: ");
+		result.append(desciption);
+		result.append(')');
+		return result.toString();
+	}
+
+} //ADElementImpl
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureContextImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureContextImpl.java
new file mode 100644
index 00000000000..3fb627cc7ad
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureContextImpl.java
@@ -0,0 +1,551 @@
+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture.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.util.EObjectContainmentWithInverseEList;
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureContext;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain;
+import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint;
+import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Context</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureContextImpl#getViewpoints <em>Viewpoints</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureContextImpl#getElementTypes <em>Element Types</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureContextImpl#getDomain <em>Domain</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureContextImpl#getId <em>Id</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureContextImpl#getIcon <em>Icon</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureContextImpl#getExtensionPrefix <em>Extension Prefix</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureContextImpl#getCreationCommandClass <em>Creation Command Class</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureContextImpl#getConversionCommandClass <em>Conversion Command Class</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class ArchitectureContextImpl extends ADElementImpl implements ArchitectureContext {
+	/**
+	 * The cached value of the '{@link #getViewpoints() <em>Viewpoints</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getViewpoints()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<ArchitectureViewpoint> viewpoints;
+
+	/**
+	 * The cached value of the '{@link #getElementTypes() <em>Element Types</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getElementTypes()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<ElementTypeSetConfiguration> elementTypes;
+
+	/**
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String id = ID_EDEFAULT;
+
+	/**
+	 * 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;
+
+	/**
+	 * The default value of the '{@link #getExtensionPrefix() <em>Extension Prefix</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getExtensionPrefix()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String EXTENSION_PREFIX_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getExtensionPrefix() <em>Extension Prefix</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getExtensionPrefix()
+	 * @generated
+	 * @ordered
+	 */
+	protected String extensionPrefix = EXTENSION_PREFIX_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getCreationCommandClass() <em>Creation Command Class</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCreationCommandClass()
+	 * @generated
+	 * @ordered
+	 */
+	protected Class<?> creationCommandClass;
+
+	/**
+	 * The cached value of the '{@link #getConversionCommandClass() <em>Conversion Command Class</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getConversionCommandClass()
+	 * @generated
+	 * @ordered
+	 */
+	protected Class<?> conversionCommandClass;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ArchitectureContextImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ArchitecturePackage.Literals.ARCHITECTURE_CONTEXT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<ArchitectureViewpoint> getViewpoints() {
+		if (viewpoints == null) {
+			viewpoints = new EObjectContainmentWithInverseEList<ArchitectureViewpoint>(ArchitectureViewpoint.class, this, ArchitecturePackage.ARCHITECTURE_CONTEXT__VIEWPOINTS, ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONTEXT);
+		}
+		return viewpoints;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<ElementTypeSetConfiguration> getElementTypes() {
+		if (elementTypes == null) {
+			elementTypes = new EObjectResolvingEList<ElementTypeSetConfiguration>(ElementTypeSetConfiguration.class, this, ArchitecturePackage.ARCHITECTURE_CONTEXT__ELEMENT_TYPES);
+		}
+		return elementTypes;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getId() {
+		return id;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setId(String newId) {
+		String oldId = id;
+		id = newId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ArchitecturePackage.ARCHITECTURE_CONTEXT__ID, oldId, id));
+	}
+
+	/**
+	 * <!-- 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, ArchitecturePackage.ARCHITECTURE_CONTEXT__ICON, oldIcon, icon));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getExtensionPrefix() {
+		return extensionPrefix;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setExtensionPrefix(String newExtensionPrefix) {
+		String oldExtensionPrefix = extensionPrefix;
+		extensionPrefix = newExtensionPrefix;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ArchitecturePackage.ARCHITECTURE_CONTEXT__EXTENSION_PREFIX, oldExtensionPrefix, extensionPrefix));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Class<?> getCreationCommandClass() {
+		return creationCommandClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCreationCommandClass(Class<?> newCreationCommandClass) {
+		Class<?> oldCreationCommandClass = creationCommandClass;
+		creationCommandClass = newCreationCommandClass;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ArchitecturePackage.ARCHITECTURE_CONTEXT__CREATION_COMMAND_CLASS, oldCreationCommandClass, creationCommandClass));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Class<?> getConversionCommandClass() {
+		return conversionCommandClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setConversionCommandClass(Class<?> newConversionCommandClass) {
+		Class<?> oldConversionCommandClass = conversionCommandClass;
+		conversionCommandClass = newConversionCommandClass;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ArchitecturePackage.ARCHITECTURE_CONTEXT__CONVERSION_COMMAND_CLASS, oldConversionCommandClass, conversionCommandClass));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ArchitectureDomain getDomain() {
+		if (eContainerFeatureID() != ArchitecturePackage.ARCHITECTURE_CONTEXT__DOMAIN) return null;
+		return (ArchitectureDomain)eInternalContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetDomain(ArchitectureDomain newDomain, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newDomain, ArchitecturePackage.ARCHITECTURE_CONTEXT__DOMAIN, msgs);
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDomain(ArchitectureDomain newDomain) {
+		if (newDomain != eInternalContainer() || (eContainerFeatureID() != ArchitecturePackage.ARCHITECTURE_CONTEXT__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, ArchitecturePackage.ARCHITECTURE_DOMAIN__CONTEXTS, ArchitectureDomain.class, msgs);
+			msgs = basicSetDomain(newDomain, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ArchitecturePackage.ARCHITECTURE_CONTEXT__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 ArchitecturePackage.ARCHITECTURE_CONTEXT__VIEWPOINTS:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getViewpoints()).basicAdd(otherEnd, msgs);
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__DOMAIN:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetDomain((ArchitectureDomain)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 ArchitecturePackage.ARCHITECTURE_CONTEXT__VIEWPOINTS:
+				return ((InternalEList<?>)getViewpoints()).basicRemove(otherEnd, msgs);
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__DOMAIN:
+				return basicSetDomain(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+		switch (eContainerFeatureID()) {
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__DOMAIN:
+				return eInternalContainer().eInverseRemove(this, ArchitecturePackage.ARCHITECTURE_DOMAIN__CONTEXTS, ArchitectureDomain.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 ArchitecturePackage.ARCHITECTURE_CONTEXT__VIEWPOINTS:
+				return getViewpoints();
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__ELEMENT_TYPES:
+				return getElementTypes();
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__DOMAIN:
+				return getDomain();
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__ID:
+				return getId();
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__ICON:
+				return getIcon();
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__EXTENSION_PREFIX:
+				return getExtensionPrefix();
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__CREATION_COMMAND_CLASS:
+				return getCreationCommandClass();
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__CONVERSION_COMMAND_CLASS:
+				return getConversionCommandClass();
+		}
+		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 ArchitecturePackage.ARCHITECTURE_CONTEXT__VIEWPOINTS:
+				getViewpoints().clear();
+				getViewpoints().addAll((Collection<? extends ArchitectureViewpoint>)newValue);
+				return;
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__ELEMENT_TYPES:
+				getElementTypes().clear();
+				getElementTypes().addAll((Collection<? extends ElementTypeSetConfiguration>)newValue);
+				return;
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__DOMAIN:
+				setDomain((ArchitectureDomain)newValue);
+				return;
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__ID:
+				setId((String)newValue);
+				return;
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__ICON:
+				setIcon((String)newValue);
+				return;
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__EXTENSION_PREFIX:
+				setExtensionPrefix((String)newValue);
+				return;
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__CREATION_COMMAND_CLASS:
+				setCreationCommandClass((Class<?>)newValue);
+				return;
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__CONVERSION_COMMAND_CLASS:
+				setConversionCommandClass((Class<?>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__VIEWPOINTS:
+				getViewpoints().clear();
+				return;
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__ELEMENT_TYPES:
+				getElementTypes().clear();
+				return;
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__DOMAIN:
+				setDomain((ArchitectureDomain)null);
+				return;
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__ID:
+				setId(ID_EDEFAULT);
+				return;
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__ICON:
+				setIcon(ICON_EDEFAULT);
+				return;
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__EXTENSION_PREFIX:
+				setExtensionPrefix(EXTENSION_PREFIX_EDEFAULT);
+				return;
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__CREATION_COMMAND_CLASS:
+				setCreationCommandClass((Class<?>)null);
+				return;
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__CONVERSION_COMMAND_CLASS:
+				setConversionCommandClass((Class<?>)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__VIEWPOINTS:
+				return viewpoints != null && !viewpoints.isEmpty();
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__ELEMENT_TYPES:
+				return elementTypes != null && !elementTypes.isEmpty();
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__DOMAIN:
+				return getDomain() != null;
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__ID:
+				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__ICON:
+				return ICON_EDEFAULT == null ? icon != null : !ICON_EDEFAULT.equals(icon);
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__EXTENSION_PREFIX:
+				return EXTENSION_PREFIX_EDEFAULT == null ? extensionPrefix != null : !EXTENSION_PREFIX_EDEFAULT.equals(extensionPrefix);
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__CREATION_COMMAND_CLASS:
+				return creationCommandClass != null;
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT__CONVERSION_COMMAND_CLASS:
+				return conversionCommandClass != 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(" (id: ");
+		result.append(id);
+		result.append(", icon: ");
+		result.append(icon);
+		result.append(", extensionPrefix: ");
+		result.append(extensionPrefix);
+		result.append(", creationCommandClass: ");
+		result.append(creationCommandClass);
+		result.append(", conversionCommandClass: ");
+		result.append(conversionCommandClass);
+		result.append(')');
+		return result.toString();
+	}
+
+} //ArchitectureContextImpl
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/CategoryImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureDescriptionImpl.java
index 2bbedf1aec1..7028b66aae4 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/CategoryImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureDescriptionImpl.java
@@ -1,69 +1,66 @@
 /**
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
+* Copyright (c) 2017 CEA LIST.
+ * 
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
  *  which accompanies this distribution, and is available at
  *  http://www.eclipse.org/legal/epl-v10.html
- *
+ *  
  *  Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
  */
-package org.eclipse.papyrus.infra.viewpoints.configuration.impl;
+package org.eclipse.papyrus.infra.core.architecture.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.MinimalEObjectImpl;
-
-import org.eclipse.papyrus.infra.viewpoints.configuration.Category;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescription;
+import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Category</b></em>'.
+ * An implementation of the model object '<em><b>Description</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.CategoryImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureDescriptionImpl#getContextId <em>Context Id</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class CategoryImpl extends MinimalEObjectImpl.Container implements Category {
+public class ArchitectureDescriptionImpl extends MinimalEObjectImpl.Container implements ArchitectureDescription {
 	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * The default value of the '{@link #getContextId() <em>Context Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getName()
+	 * @see #getContextId()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String NAME_EDEFAULT = null;
+	protected static final String CONTEXT_ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * The cached value of the '{@link #getContextId() <em>Context Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getName()
+	 * @see #getContextId()
 	 * @generated
 	 * @ordered
 	 */
-	protected String name = NAME_EDEFAULT;
+	protected String contextId = CONTEXT_ID_EDEFAULT;
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected CategoryImpl() {
+	protected ArchitectureDescriptionImpl() {
 		super();
 	}
 
@@ -74,7 +71,7 @@ public class CategoryImpl extends MinimalEObjectImpl.Container implements Catego
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return ConfigurationPackage.Literals.CATEGORY;
+		return ArchitecturePackage.Literals.ARCHITECTURE_DESCRIPTION;
 	}
 
 	/**
@@ -82,8 +79,8 @@ public class CategoryImpl extends MinimalEObjectImpl.Container implements Catego
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getName() {
-		return name;
+	public String getContextId() {
+		return contextId;
 	}
 
 	/**
@@ -91,12 +88,11 @@ public class CategoryImpl extends MinimalEObjectImpl.Container implements Catego
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ConfigurationPackage.CATEGORY__NAME, oldName, name));
-		}
+	public void setContextId(String newContextId) {
+		String oldContextId = contextId;
+		contextId = newContextId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ArchitecturePackage.ARCHITECTURE_DESCRIPTION__CONTEXT_ID, oldContextId, contextId));
 	}
 
 	/**
@@ -107,8 +103,8 @@ public class CategoryImpl extends MinimalEObjectImpl.Container implements Catego
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case ConfigurationPackage.CATEGORY__NAME:
-			return getName();
+			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION__CONTEXT_ID:
+				return getContextId();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -121,9 +117,9 @@ public class CategoryImpl extends MinimalEObjectImpl.Container implements Catego
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case ConfigurationPackage.CATEGORY__NAME:
-			setName((String) newValue);
-			return;
+			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION__CONTEXT_ID:
+				setContextId((String)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -136,9 +132,9 @@ public class CategoryImpl extends MinimalEObjectImpl.Container implements Catego
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case ConfigurationPackage.CATEGORY__NAME:
-			setName(NAME_EDEFAULT);
-			return;
+			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION__CONTEXT_ID:
+				setContextId(CONTEXT_ID_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -151,8 +147,8 @@ public class CategoryImpl extends MinimalEObjectImpl.Container implements Catego
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case ConfigurationPackage.CATEGORY__NAME:
-			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION__CONTEXT_ID:
+				return CONTEXT_ID_EDEFAULT == null ? contextId != null : !CONTEXT_ID_EDEFAULT.equals(contextId);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -164,15 +160,13 @@ public class CategoryImpl extends MinimalEObjectImpl.Container implements Catego
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
-			return super.toString();
-		}
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
+		result.append(" (contextId: ");
+		result.append(contextId);
 		result.append(')');
 		return result.toString();
 	}
 
-} //CategoryImpl
+} //ArchitectureDescriptionImpl
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureDescriptionLanguageImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureDescriptionLanguageImpl.java
new file mode 100644
index 00000000000..a744c7c9243
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureDescriptionLanguageImpl.java
@@ -0,0 +1,273 @@
+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture.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.EPackage;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage;
+import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
+import org.eclipse.papyrus.infra.core.architecture.RepresentationKind;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Description Language</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureDescriptionLanguageImpl#getRepresentationKinds <em>Representation Kinds</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureDescriptionLanguageImpl#getMetamodel <em>Metamodel</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureDescriptionLanguageImpl#getProfiles <em>Profiles</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ArchitectureDescriptionLanguageImpl extends ArchitectureContextImpl implements ArchitectureDescriptionLanguage {
+	/**
+	 * The cached value of the '{@link #getRepresentationKinds() <em>Representation Kinds</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getRepresentationKinds()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<RepresentationKind> representationKinds;
+
+	/**
+	 * The cached value of the '{@link #getMetamodel() <em>Metamodel</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMetamodel()
+	 * @generated
+	 * @ordered
+	 */
+	protected EPackage metamodel;
+
+	/**
+	 * The cached value of the '{@link #getProfiles() <em>Profiles</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getProfiles()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<EPackage> profiles;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ArchitectureDescriptionLanguageImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ArchitecturePackage.Literals.ARCHITECTURE_DESCRIPTION_LANGUAGE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<RepresentationKind> getRepresentationKinds() {
+		if (representationKinds == null) {
+			representationKinds = new EObjectContainmentWithInverseEList<RepresentationKind>(RepresentationKind.class, this, ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS, ArchitecturePackage.REPRESENTATION_KIND__LANGUAGE);
+		}
+		return representationKinds;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EPackage getMetamodel() {
+		if (metamodel != null && metamodel.eIsProxy()) {
+			InternalEObject oldMetamodel = (InternalEObject)metamodel;
+			metamodel = (EPackage)eResolveProxy(oldMetamodel);
+			if (metamodel != oldMetamodel) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__METAMODEL, oldMetamodel, metamodel));
+			}
+		}
+		return metamodel;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EPackage basicGetMetamodel() {
+		return metamodel;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setMetamodel(EPackage newMetamodel) {
+		EPackage oldMetamodel = metamodel;
+		metamodel = newMetamodel;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__METAMODEL, oldMetamodel, metamodel));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<EPackage> getProfiles() {
+		if (profiles == null) {
+			profiles = new EObjectResolvingEList<EPackage>(EPackage.class, this, ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__PROFILES);
+		}
+		return profiles;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getRepresentationKinds()).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 ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS:
+				return ((InternalEList<?>)getRepresentationKinds()).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 ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS:
+				return getRepresentationKinds();
+			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__METAMODEL:
+				if (resolve) return getMetamodel();
+				return basicGetMetamodel();
+			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__PROFILES:
+				return getProfiles();
+		}
+		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 ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS:
+				getRepresentationKinds().clear();
+				getRepresentationKinds().addAll((Collection<? extends RepresentationKind>)newValue);
+				return;
+			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__METAMODEL:
+				setMetamodel((EPackage)newValue);
+				return;
+			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__PROFILES:
+				getProfiles().clear();
+				getProfiles().addAll((Collection<? extends EPackage>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS:
+				getRepresentationKinds().clear();
+				return;
+			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__METAMODEL:
+				setMetamodel((EPackage)null);
+				return;
+			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__PROFILES:
+				getProfiles().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS:
+				return representationKinds != null && !representationKinds.isEmpty();
+			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__METAMODEL:
+				return metamodel != null;
+			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__PROFILES:
+				return profiles != null && !profiles.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //ArchitectureDescriptionLanguageImpl
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureDescriptionPreferencesImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureDescriptionPreferencesImpl.java
new file mode 100644
index 00000000000..f2dbeec8adf
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureDescriptionPreferencesImpl.java
@@ -0,0 +1,160 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
+
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionPreferences;
+import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Description Preferences</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureDescriptionPreferencesImpl#getViewpointIds <em>Viewpoint Ids</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ArchitectureDescriptionPreferencesImpl extends MinimalEObjectImpl.Container implements ArchitectureDescriptionPreferences {
+	/**
+	 * The cached value of the '{@link #getViewpointIds() <em>Viewpoint Ids</em>}' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getViewpointIds()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<String> viewpointIds;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ArchitectureDescriptionPreferencesImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ArchitecturePackage.Literals.ARCHITECTURE_DESCRIPTION_PREFERENCES;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<String> getViewpointIds() {
+		if (viewpointIds == null) {
+			viewpointIds = new EDataTypeUniqueEList<String>(String.class, this, ArchitecturePackage.ARCHITECTURE_DESCRIPTION_PREFERENCES__VIEWPOINT_IDS);
+		}
+		return viewpointIds;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_PREFERENCES__VIEWPOINT_IDS:
+				return getViewpointIds();
+		}
+		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 ArchitecturePackage.ARCHITECTURE_DESCRIPTION_PREFERENCES__VIEWPOINT_IDS:
+				getViewpointIds().clear();
+				getViewpointIds().addAll((Collection<? extends String>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_PREFERENCES__VIEWPOINT_IDS:
+				getViewpointIds().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_PREFERENCES__VIEWPOINT_IDS:
+				return viewpointIds != null && !viewpointIds.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(" (viewpointIds: ");
+		result.append(viewpointIds);
+		result.append(')');
+		return result.toString();
+	}
+
+} //ArchitectureDescriptionPreferencesImpl
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureDomainImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureDomainImpl.java
new file mode 100644
index 00000000000..41f7fbb9ec4
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureDomainImpl.java
@@ -0,0 +1,252 @@
+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureContext;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain;
+import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
+import org.eclipse.papyrus.infra.core.architecture.Concern;
+import org.eclipse.papyrus.infra.core.architecture.Stakeholder;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Domain</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureDomainImpl#getStakeholders <em>Stakeholders</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureDomainImpl#getConcerns <em>Concerns</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureDomainImpl#getContexts <em>Contexts</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ArchitectureDomainImpl extends ADElementImpl implements ArchitectureDomain {
+	/**
+	 * The cached value of the '{@link #getStakeholders() <em>Stakeholders</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStakeholders()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Stakeholder> stakeholders;
+
+	/**
+	 * The cached value of the '{@link #getConcerns() <em>Concerns</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getConcerns()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Concern> concerns;
+
+	/**
+	 * The cached value of the '{@link #getContexts() <em>Contexts</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getContexts()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<ArchitectureContext> contexts;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ArchitectureDomainImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ArchitecturePackage.Literals.ARCHITECTURE_DOMAIN;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<Stakeholder> getStakeholders() {
+		if (stakeholders == null) {
+			stakeholders = new EObjectContainmentWithInverseEList<Stakeholder>(Stakeholder.class, this, ArchitecturePackage.ARCHITECTURE_DOMAIN__STAKEHOLDERS, ArchitecturePackage.STAKEHOLDER__DOMAIN);
+		}
+		return stakeholders;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<Concern> getConcerns() {
+		if (concerns == null) {
+			concerns = new EObjectContainmentWithInverseEList<Concern>(Concern.class, this, ArchitecturePackage.ARCHITECTURE_DOMAIN__CONCERNS, ArchitecturePackage.CONCERN__DOMAIN);
+		}
+		return concerns;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<ArchitectureContext> getContexts() {
+		if (contexts == null) {
+			contexts = new EObjectContainmentWithInverseEList<ArchitectureContext>(ArchitectureContext.class, this, ArchitecturePackage.ARCHITECTURE_DOMAIN__CONTEXTS, ArchitecturePackage.ARCHITECTURE_CONTEXT__DOMAIN);
+		}
+		return contexts;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ArchitecturePackage.ARCHITECTURE_DOMAIN__STAKEHOLDERS:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getStakeholders()).basicAdd(otherEnd, msgs);
+			case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONCERNS:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getConcerns()).basicAdd(otherEnd, msgs);
+			case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONTEXTS:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getContexts()).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 ArchitecturePackage.ARCHITECTURE_DOMAIN__STAKEHOLDERS:
+				return ((InternalEList<?>)getStakeholders()).basicRemove(otherEnd, msgs);
+			case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONCERNS:
+				return ((InternalEList<?>)getConcerns()).basicRemove(otherEnd, msgs);
+			case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONTEXTS:
+				return ((InternalEList<?>)getContexts()).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 ArchitecturePackage.ARCHITECTURE_DOMAIN__STAKEHOLDERS:
+				return getStakeholders();
+			case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONCERNS:
+				return getConcerns();
+			case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONTEXTS:
+				return getContexts();
+		}
+		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 ArchitecturePackage.ARCHITECTURE_DOMAIN__STAKEHOLDERS:
+				getStakeholders().clear();
+				getStakeholders().addAll((Collection<? extends Stakeholder>)newValue);
+				return;
+			case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONCERNS:
+				getConcerns().clear();
+				getConcerns().addAll((Collection<? extends Concern>)newValue);
+				return;
+			case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONTEXTS:
+				getContexts().clear();
+				getContexts().addAll((Collection<? extends ArchitectureContext>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ArchitecturePackage.ARCHITECTURE_DOMAIN__STAKEHOLDERS:
+				getStakeholders().clear();
+				return;
+			case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONCERNS:
+				getConcerns().clear();
+				return;
+			case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONTEXTS:
+				getContexts().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ArchitecturePackage.ARCHITECTURE_DOMAIN__STAKEHOLDERS:
+				return stakeholders != null && !stakeholders.isEmpty();
+			case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONCERNS:
+				return concerns != null && !concerns.isEmpty();
+			case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONTEXTS:
+				return contexts != null && !contexts.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //ArchitectureDomainImpl
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureFactoryImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureFactoryImpl.java
new file mode 100644
index 00000000000..7054b305dd6
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureFactoryImpl.java
@@ -0,0 +1,182 @@
+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.infra.core.architecture.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ArchitectureFactoryImpl extends EFactoryImpl implements ArchitectureFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static ArchitectureFactory init() {
+		try {
+			ArchitectureFactory theArchitectureFactory = (ArchitectureFactory)EPackage.Registry.INSTANCE.getEFactory(ArchitecturePackage.eNS_URI);
+			if (theArchitectureFactory != null) {
+				return theArchitectureFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new ArchitectureFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ArchitectureFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case ArchitecturePackage.ARCHITECTURE_DOMAIN: return createArchitectureDomain();
+			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE: return createArchitectureDescriptionLanguage();
+			case ArchitecturePackage.STAKEHOLDER: return createStakeholder();
+			case ArchitecturePackage.CONCERN: return createConcern();
+			case ArchitecturePackage.ARCHITECTURE_VIEWPOINT: return createArchitectureViewpoint();
+			case ArchitecturePackage.ARCHITECTURE_FRAMEWORK: return createArchitectureFramework();
+			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION: return createArchitectureDescription();
+			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_PREFERENCES: return createArchitectureDescriptionPreferences();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ArchitectureDomain createArchitectureDomain() {
+		ArchitectureDomainImpl architectureDomain = new ArchitectureDomainImpl();
+		return architectureDomain;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ArchitectureDescriptionLanguage createArchitectureDescriptionLanguage() {
+		ArchitectureDescriptionLanguageImpl architectureDescriptionLanguage = new ArchitectureDescriptionLanguageImpl();
+		return architectureDescriptionLanguage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Stakeholder createStakeholder() {
+		StakeholderImpl stakeholder = new StakeholderImpl();
+		return stakeholder;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Concern createConcern() {
+		ConcernImpl concern = new ConcernImpl();
+		return concern;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ArchitectureViewpoint createArchitectureViewpoint() {
+		ArchitectureViewpointImpl architectureViewpoint = new ArchitectureViewpointImpl();
+		return architectureViewpoint;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ArchitectureFramework createArchitectureFramework() {
+		ArchitectureFrameworkImpl architectureFramework = new ArchitectureFrameworkImpl();
+		return architectureFramework;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ArchitectureDescription createArchitectureDescription() {
+		ArchitectureDescriptionImpl architectureDescription = new ArchitectureDescriptionImpl();
+		return architectureDescription;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ArchitectureDescriptionPreferences createArchitectureDescriptionPreferences() {
+		ArchitectureDescriptionPreferencesImpl architectureDescriptionPreferences = new ArchitectureDescriptionPreferencesImpl();
+		return architectureDescriptionPreferences;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ArchitecturePackage getArchitecturePackage() {
+		return (ArchitecturePackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static ArchitecturePackage getPackage() {
+		return ArchitecturePackage.eINSTANCE;
+	}
+
+} //ArchitectureFactoryImpl
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureFrameworkImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureFrameworkImpl.java
new file mode 100644
index 00000000000..5ab5fd39c4b
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureFrameworkImpl.java
@@ -0,0 +1,47 @@
+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureFramework;
+import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Framework</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ArchitectureFrameworkImpl extends ArchitectureContextImpl implements ArchitectureFramework {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ArchitectureFrameworkImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ArchitecturePackage.Literals.ARCHITECTURE_FRAMEWORK;
+	}
+
+} //ArchitectureFrameworkImpl
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitecturePackageImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitecturePackageImpl.java
new file mode 100644
index 00000000000..e69d8b91f43
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitecturePackageImpl.java
@@ -0,0 +1,728 @@
+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture.impl;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EGenericType;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+import org.eclipse.papyrus.infra.core.architecture.ADElement;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureContext;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescription;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionPreferences;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureFactory;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureFramework;
+import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint;
+import org.eclipse.papyrus.infra.core.architecture.Concern;
+import org.eclipse.papyrus.infra.core.architecture.RepresentationKind;
+import org.eclipse.papyrus.infra.core.architecture.Stakeholder;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ArchitecturePackageImpl extends EPackageImpl implements ArchitecturePackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass adElementEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass architectureDomainEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass architectureDescriptionLanguageEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass stakeholderEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass concernEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass architectureViewpointEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass representationKindEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass architectureContextEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass architectureFrameworkEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass architectureDescriptionEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass architectureDescriptionPreferencesEClass = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private ArchitecturePackageImpl() {
+		super(eNS_URI, ArchitectureFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>This method is used to initialize {@link ArchitecturePackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static ArchitecturePackage init() {
+		if (isInited) return (ArchitecturePackage)EPackage.Registry.INSTANCE.getEPackage(ArchitecturePackage.eNS_URI);
+
+		// Obtain or create and register package
+		ArchitecturePackageImpl theArchitecturePackage = (ArchitecturePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ArchitecturePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ArchitecturePackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		ElementTypesConfigurationsPackage.eINSTANCE.eClass();
+
+		// Create package meta-data objects
+		theArchitecturePackage.createPackageContents();
+
+		// Initialize created meta-data
+		theArchitecturePackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theArchitecturePackage.freeze();
+
+  
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(ArchitecturePackage.eNS_URI, theArchitecturePackage);
+		return theArchitecturePackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getADElement() {
+		return adElementEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getADElement_Name() {
+		return (EAttribute)adElementEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getADElement_Desciption() {
+		return (EAttribute)adElementEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getADElement_QualifiedName() {
+		return (EAttribute)adElementEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getArchitectureDomain() {
+		return architectureDomainEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getArchitectureDomain_Stakeholders() {
+		return (EReference)architectureDomainEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getArchitectureDomain_Concerns() {
+		return (EReference)architectureDomainEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getArchitectureDomain_Contexts() {
+		return (EReference)architectureDomainEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getArchitectureDescriptionLanguage() {
+		return architectureDescriptionLanguageEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getArchitectureDescriptionLanguage_RepresentationKinds() {
+		return (EReference)architectureDescriptionLanguageEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getArchitectureDescriptionLanguage_Metamodel() {
+		return (EReference)architectureDescriptionLanguageEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getArchitectureDescriptionLanguage_Profiles() {
+		return (EReference)architectureDescriptionLanguageEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getStakeholder() {
+		return stakeholderEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getStakeholder_Concerns() {
+		return (EReference)stakeholderEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getStakeholder_Domain() {
+		return (EReference)stakeholderEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getConcern() {
+		return concernEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getConcern_Domain() {
+		return (EReference)concernEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getArchitectureViewpoint() {
+		return architectureViewpointEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getArchitectureViewpoint_Concerns() {
+		return (EReference)architectureViewpointEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getArchitectureViewpoint_RepresentationKinds() {
+		return (EReference)architectureViewpointEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getArchitectureViewpoint_Context() {
+		return (EReference)architectureViewpointEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getArchitectureViewpoint_Id() {
+		return (EAttribute)architectureViewpointEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getRepresentationKind() {
+		return representationKindEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getRepresentationKind_Concerns() {
+		return (EReference)representationKindEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getRepresentationKind_Icon() {
+		return (EAttribute)representationKindEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getRepresentationKind_Language() {
+		return (EReference)representationKindEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getArchitectureContext() {
+		return architectureContextEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getArchitectureContext_Viewpoints() {
+		return (EReference)architectureContextEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getArchitectureContext_ElementTypes() {
+		return (EReference)architectureContextEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getArchitectureContext_Id() {
+		return (EAttribute)architectureContextEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getArchitectureContext_Icon() {
+		return (EAttribute)architectureContextEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getArchitectureContext_ExtensionPrefix() {
+		return (EAttribute)architectureContextEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getArchitectureContext_CreationCommandClass() {
+		return (EAttribute)architectureContextEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getArchitectureContext_ConversionCommandClass() {
+		return (EAttribute)architectureContextEClass.getEStructuralFeatures().get(7);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getArchitectureContext_Domain() {
+		return (EReference)architectureContextEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getArchitectureFramework() {
+		return architectureFrameworkEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getArchitectureDescription() {
+		return architectureDescriptionEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getArchitectureDescription_ContextId() {
+		return (EAttribute)architectureDescriptionEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getArchitectureDescriptionPreferences() {
+		return architectureDescriptionPreferencesEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getArchitectureDescriptionPreferences_ViewpointIds() {
+		return (EAttribute)architectureDescriptionPreferencesEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ArchitectureFactory getArchitectureFactory() {
+		return (ArchitectureFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		adElementEClass = createEClass(AD_ELEMENT);
+		createEAttribute(adElementEClass, AD_ELEMENT__NAME);
+		createEAttribute(adElementEClass, AD_ELEMENT__DESCIPTION);
+		createEAttribute(adElementEClass, AD_ELEMENT__QUALIFIED_NAME);
+
+		architectureDomainEClass = createEClass(ARCHITECTURE_DOMAIN);
+		createEReference(architectureDomainEClass, ARCHITECTURE_DOMAIN__STAKEHOLDERS);
+		createEReference(architectureDomainEClass, ARCHITECTURE_DOMAIN__CONCERNS);
+		createEReference(architectureDomainEClass, ARCHITECTURE_DOMAIN__CONTEXTS);
+
+		architectureDescriptionLanguageEClass = createEClass(ARCHITECTURE_DESCRIPTION_LANGUAGE);
+		createEReference(architectureDescriptionLanguageEClass, ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS);
+		createEReference(architectureDescriptionLanguageEClass, ARCHITECTURE_DESCRIPTION_LANGUAGE__METAMODEL);
+		createEReference(architectureDescriptionLanguageEClass, ARCHITECTURE_DESCRIPTION_LANGUAGE__PROFILES);
+
+		stakeholderEClass = createEClass(STAKEHOLDER);
+		createEReference(stakeholderEClass, STAKEHOLDER__CONCERNS);
+		createEReference(stakeholderEClass, STAKEHOLDER__DOMAIN);
+
+		concernEClass = createEClass(CONCERN);
+		createEReference(concernEClass, CONCERN__DOMAIN);
+
+		architectureViewpointEClass = createEClass(ARCHITECTURE_VIEWPOINT);
+		createEReference(architectureViewpointEClass, ARCHITECTURE_VIEWPOINT__CONCERNS);
+		createEReference(architectureViewpointEClass, ARCHITECTURE_VIEWPOINT__REPRESENTATION_KINDS);
+		createEReference(architectureViewpointEClass, ARCHITECTURE_VIEWPOINT__CONTEXT);
+		createEAttribute(architectureViewpointEClass, ARCHITECTURE_VIEWPOINT__ID);
+
+		representationKindEClass = createEClass(REPRESENTATION_KIND);
+		createEReference(representationKindEClass, REPRESENTATION_KIND__LANGUAGE);
+		createEReference(representationKindEClass, REPRESENTATION_KIND__CONCERNS);
+		createEAttribute(representationKindEClass, REPRESENTATION_KIND__ICON);
+
+		architectureContextEClass = createEClass(ARCHITECTURE_CONTEXT);
+		createEReference(architectureContextEClass, ARCHITECTURE_CONTEXT__VIEWPOINTS);
+		createEReference(architectureContextEClass, ARCHITECTURE_CONTEXT__ELEMENT_TYPES);
+		createEReference(architectureContextEClass, ARCHITECTURE_CONTEXT__DOMAIN);
+		createEAttribute(architectureContextEClass, ARCHITECTURE_CONTEXT__ID);
+		createEAttribute(architectureContextEClass, ARCHITECTURE_CONTEXT__ICON);
+		createEAttribute(architectureContextEClass, ARCHITECTURE_CONTEXT__EXTENSION_PREFIX);
+		createEAttribute(architectureContextEClass, ARCHITECTURE_CONTEXT__CREATION_COMMAND_CLASS);
+		createEAttribute(architectureContextEClass, ARCHITECTURE_CONTEXT__CONVERSION_COMMAND_CLASS);
+
+		architectureFrameworkEClass = createEClass(ARCHITECTURE_FRAMEWORK);
+
+		architectureDescriptionEClass = createEClass(ARCHITECTURE_DESCRIPTION);
+		createEAttribute(architectureDescriptionEClass, ARCHITECTURE_DESCRIPTION__CONTEXT_ID);
+
+		architectureDescriptionPreferencesEClass = createEClass(ARCHITECTURE_DESCRIPTION_PREFERENCES);
+		createEAttribute(architectureDescriptionPreferencesEClass, ARCHITECTURE_DESCRIPTION_PREFERENCES__VIEWPOINT_IDS);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		ElementTypesConfigurationsPackage theElementTypesConfigurationsPackage = (ElementTypesConfigurationsPackage)EPackage.Registry.INSTANCE.getEPackage(ElementTypesConfigurationsPackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		architectureDomainEClass.getESuperTypes().add(this.getADElement());
+		architectureDescriptionLanguageEClass.getESuperTypes().add(this.getArchitectureContext());
+		stakeholderEClass.getESuperTypes().add(this.getADElement());
+		concernEClass.getESuperTypes().add(this.getADElement());
+		architectureViewpointEClass.getESuperTypes().add(this.getADElement());
+		representationKindEClass.getESuperTypes().add(this.getADElement());
+		architectureContextEClass.getESuperTypes().add(this.getADElement());
+		architectureFrameworkEClass.getESuperTypes().add(this.getArchitectureContext());
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(adElementEClass, ADElement.class, "ADElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getADElement_Name(), ecorePackage.getEString(), "name", null, 1, 1, ADElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getADElement_Desciption(), ecorePackage.getEString(), "desciption", null, 0, 1, ADElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getADElement_QualifiedName(), ecorePackage.getEString(), "qualifiedName", null, 0, 1, ADElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+
+		initEClass(architectureDomainEClass, ArchitectureDomain.class, "ArchitectureDomain", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getArchitectureDomain_Stakeholders(), this.getStakeholder(), this.getStakeholder_Domain(), "stakeholders", null, 0, -1, ArchitectureDomain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getArchitectureDomain_Concerns(), this.getConcern(), this.getConcern_Domain(), "concerns", null, 0, -1, ArchitectureDomain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getArchitectureDomain_Contexts(), this.getArchitectureContext(), this.getArchitectureContext_Domain(), "contexts", null, 0, -1, ArchitectureDomain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(architectureDescriptionLanguageEClass, ArchitectureDescriptionLanguage.class, "ArchitectureDescriptionLanguage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getArchitectureDescriptionLanguage_RepresentationKinds(), this.getRepresentationKind(), this.getRepresentationKind_Language(), "representationKinds", null, 0, -1, ArchitectureDescriptionLanguage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getArchitectureDescriptionLanguage_Metamodel(), ecorePackage.getEPackage(), null, "metamodel", null, 1, 1, ArchitectureDescriptionLanguage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getArchitectureDescriptionLanguage_Profiles(), ecorePackage.getEPackage(), null, "profiles", null, 0, -1, ArchitectureDescriptionLanguage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(stakeholderEClass, Stakeholder.class, "Stakeholder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getStakeholder_Concerns(), this.getConcern(), null, "concerns", null, 0, -1, Stakeholder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getStakeholder_Domain(), this.getArchitectureDomain(), this.getArchitectureDomain_Stakeholders(), "domain", null, 1, 1, Stakeholder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(concernEClass, Concern.class, "Concern", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getConcern_Domain(), this.getArchitectureDomain(), this.getArchitectureDomain_Concerns(), "domain", null, 1, 1, Concern.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(architectureViewpointEClass, ArchitectureViewpoint.class, "ArchitectureViewpoint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getArchitectureViewpoint_Concerns(), this.getConcern(), null, "concerns", null, 0, -1, ArchitectureViewpoint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getArchitectureViewpoint_RepresentationKinds(), this.getRepresentationKind(), null, "representationKinds", null, 0, -1, ArchitectureViewpoint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getArchitectureViewpoint_Context(), this.getArchitectureContext(), this.getArchitectureContext_Viewpoints(), "context", null, 1, 1, ArchitectureViewpoint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getArchitectureViewpoint_Id(), ecorePackage.getEString(), "id", null, 1, 1, ArchitectureViewpoint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(representationKindEClass, RepresentationKind.class, "RepresentationKind", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getRepresentationKind_Language(), this.getArchitectureDescriptionLanguage(), this.getArchitectureDescriptionLanguage_RepresentationKinds(), "language", null, 1, 1, RepresentationKind.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getRepresentationKind_Concerns(), this.getConcern(), null, "concerns", null, 0, -1, RepresentationKind.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getRepresentationKind_Icon(), ecorePackage.getEString(), "icon", null, 0, 1, RepresentationKind.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(architectureContextEClass, ArchitectureContext.class, "ArchitectureContext", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getArchitectureContext_Viewpoints(), this.getArchitectureViewpoint(), this.getArchitectureViewpoint_Context(), "viewpoints", null, 0, -1, ArchitectureContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getArchitectureContext_ElementTypes(), theElementTypesConfigurationsPackage.getElementTypeSetConfiguration(), null, "elementTypes", null, 0, -1, ArchitectureContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getArchitectureContext_Domain(), this.getArchitectureDomain(), this.getArchitectureDomain_Contexts(), "domain", null, 1, 1, ArchitectureContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getArchitectureContext_Id(), ecorePackage.getEString(), "id", null, 1, 1, ArchitectureContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getArchitectureContext_Icon(), ecorePackage.getEString(), "icon", null, 0, 1, ArchitectureContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getArchitectureContext_ExtensionPrefix(), ecorePackage.getEString(), "extensionPrefix", null, 0, 1, ArchitectureContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		EGenericType g1 = createEGenericType(ecorePackage.getEJavaClass());
+		EGenericType g2 = createEGenericType();
+		g1.getETypeArguments().add(g2);
+		initEAttribute(getArchitectureContext_CreationCommandClass(), g1, "creationCommandClass", null, 1, 1, ArchitectureContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		g1 = createEGenericType(ecorePackage.getEJavaClass());
+		g2 = createEGenericType();
+		g1.getETypeArguments().add(g2);
+		initEAttribute(getArchitectureContext_ConversionCommandClass(), g1, "conversionCommandClass", null, 0, 1, ArchitectureContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(architectureFrameworkEClass, ArchitectureFramework.class, "ArchitectureFramework", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(architectureDescriptionEClass, ArchitectureDescription.class, "ArchitectureDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getArchitectureDescription_ContextId(), ecorePackage.getEString(), "contextId", null, 0, 1, ArchitectureDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(architectureDescriptionPreferencesEClass, ArchitectureDescriptionPreferences.class, "ArchitectureDescriptionPreferences", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getArchitectureDescriptionPreferences_ViewpointIds(), ecorePackage.getEString(), "viewpointIds", null, 0, -1, ArchitectureDescriptionPreferences.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		// Create resource
+		createResource(eNS_URI);
+	}
+
+} //ArchitecturePackageImpl
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureViewpointImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureViewpointImpl.java
new file mode 100644
index 00000000000..6d76dfc14c0
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureViewpointImpl.java
@@ -0,0 +1,348 @@
+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture.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.util.EObjectResolvingEList;
+
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureContext;
+import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint;
+import org.eclipse.papyrus.infra.core.architecture.Concern;
+import org.eclipse.papyrus.infra.core.architecture.RepresentationKind;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Viewpoint</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureViewpointImpl#getConcerns <em>Concerns</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureViewpointImpl#getRepresentationKinds <em>Representation Kinds</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureViewpointImpl#getContext <em>Context</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureViewpointImpl#getId <em>Id</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ArchitectureViewpointImpl extends ADElementImpl implements ArchitectureViewpoint {
+	/**
+	 * The cached value of the '{@link #getConcerns() <em>Concerns</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getConcerns()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Concern> concerns;
+
+	/**
+	 * The cached value of the '{@link #getRepresentationKinds() <em>Representation Kinds</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getRepresentationKinds()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<RepresentationKind> representationKinds;
+
+	/**
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String id = ID_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ArchitectureViewpointImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ArchitecturePackage.Literals.ARCHITECTURE_VIEWPOINT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<Concern> getConcerns() {
+		if (concerns == null) {
+			concerns = new EObjectResolvingEList<Concern>(Concern.class, this, ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONCERNS);
+		}
+		return concerns;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<RepresentationKind> getRepresentationKinds() {
+		if (representationKinds == null) {
+			representationKinds = new EObjectResolvingEList<RepresentationKind>(RepresentationKind.class, this, ArchitecturePackage.ARCHITECTURE_VIEWPOINT__REPRESENTATION_KINDS);
+		}
+		return representationKinds;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ArchitectureContext getContext() {
+		if (eContainerFeatureID() != ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONTEXT) return null;
+		return (ArchitectureContext)eInternalContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetContext(ArchitectureContext newContext, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newContext, ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONTEXT, msgs);
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setContext(ArchitectureContext newContext) {
+		if (newContext != eInternalContainer() || (eContainerFeatureID() != ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONTEXT && newContext != null)) {
+			if (EcoreUtil.isAncestor(this, newContext))
+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+			NotificationChain msgs = null;
+			if (eInternalContainer() != null)
+				msgs = eBasicRemoveFromContainer(msgs);
+			if (newContext != null)
+				msgs = ((InternalEObject)newContext).eInverseAdd(this, ArchitecturePackage.ARCHITECTURE_CONTEXT__VIEWPOINTS, ArchitectureContext.class, msgs);
+			msgs = basicSetContext(newContext, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONTEXT, newContext, newContext));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getId() {
+		return id;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setId(String newId) {
+		String oldId = id;
+		id = newId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ArchitecturePackage.ARCHITECTURE_VIEWPOINT__ID, oldId, id));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONTEXT:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetContext((ArchitectureContext)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 ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONTEXT:
+				return basicSetContext(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+		switch (eContainerFeatureID()) {
+			case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONTEXT:
+				return eInternalContainer().eInverseRemove(this, ArchitecturePackage.ARCHITECTURE_CONTEXT__VIEWPOINTS, ArchitectureContext.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 ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONCERNS:
+				return getConcerns();
+			case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__REPRESENTATION_KINDS:
+				return getRepresentationKinds();
+			case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONTEXT:
+				return getContext();
+			case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__ID:
+				return getId();
+		}
+		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 ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONCERNS:
+				getConcerns().clear();
+				getConcerns().addAll((Collection<? extends Concern>)newValue);
+				return;
+			case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__REPRESENTATION_KINDS:
+				getRepresentationKinds().clear();
+				getRepresentationKinds().addAll((Collection<? extends RepresentationKind>)newValue);
+				return;
+			case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONTEXT:
+				setContext((ArchitectureContext)newValue);
+				return;
+			case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__ID:
+				setId((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONCERNS:
+				getConcerns().clear();
+				return;
+			case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__REPRESENTATION_KINDS:
+				getRepresentationKinds().clear();
+				return;
+			case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONTEXT:
+				setContext((ArchitectureContext)null);
+				return;
+			case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__ID:
+				setId(ID_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONCERNS:
+				return concerns != null && !concerns.isEmpty();
+			case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__REPRESENTATION_KINDS:
+				return representationKinds != null && !representationKinds.isEmpty();
+			case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONTEXT:
+				return getContext() != null;
+			case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__ID:
+				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		}
+		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(" (id: ");
+		result.append(id);
+		result.append(')');
+		return result.toString();
+	}
+
+} //ArchitectureViewpointImpl
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ConcernImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ConcernImpl.java
new file mode 100644
index 00000000000..5c877f24095
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ConcernImpl.java
@@ -0,0 +1,203 @@
+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture.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.util.EcoreUtil;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain;
+import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
+import org.eclipse.papyrus.infra.core.architecture.Concern;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Concern</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.impl.ConcernImpl#getDomain <em>Domain</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ConcernImpl extends ADElementImpl implements Concern {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ConcernImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ArchitecturePackage.Literals.CONCERN;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ArchitectureDomain getDomain() {
+		if (eContainerFeatureID() != ArchitecturePackage.CONCERN__DOMAIN) return null;
+		return (ArchitectureDomain)eInternalContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetDomain(ArchitectureDomain newDomain, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newDomain, ArchitecturePackage.CONCERN__DOMAIN, msgs);
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDomain(ArchitectureDomain newDomain) {
+		if (newDomain != eInternalContainer() || (eContainerFeatureID() != ArchitecturePackage.CONCERN__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, ArchitecturePackage.ARCHITECTURE_DOMAIN__CONCERNS, ArchitectureDomain.class, msgs);
+			msgs = basicSetDomain(newDomain, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ArchitecturePackage.CONCERN__DOMAIN, newDomain, newDomain));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ArchitecturePackage.CONCERN__DOMAIN:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetDomain((ArchitectureDomain)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 ArchitecturePackage.CONCERN__DOMAIN:
+				return basicSetDomain(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+		switch (eContainerFeatureID()) {
+			case ArchitecturePackage.CONCERN__DOMAIN:
+				return eInternalContainer().eInverseRemove(this, ArchitecturePackage.ARCHITECTURE_DOMAIN__CONCERNS, ArchitectureDomain.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 ArchitecturePackage.CONCERN__DOMAIN:
+				return getDomain();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case ArchitecturePackage.CONCERN__DOMAIN:
+				setDomain((ArchitectureDomain)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ArchitecturePackage.CONCERN__DOMAIN:
+				setDomain((ArchitectureDomain)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ArchitecturePackage.CONCERN__DOMAIN:
+				return getDomain() != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //ConcernImpl
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/RepresentationKindImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/RepresentationKindImpl.java
new file mode 100644
index 00000000000..ae979413ec4
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/RepresentationKindImpl.java
@@ -0,0 +1,312 @@
+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture.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.util.EObjectResolvingEList;
+
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage;
+import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
+import org.eclipse.papyrus.infra.core.architecture.Concern;
+import org.eclipse.papyrus.infra.core.architecture.RepresentationKind;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Representation Kind</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.impl.RepresentationKindImpl#getLanguage <em>Language</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.impl.RepresentationKindImpl#getConcerns <em>Concerns</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.impl.RepresentationKindImpl#getIcon <em>Icon</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class RepresentationKindImpl extends ADElementImpl implements RepresentationKind {
+	/**
+	 * The cached value of the '{@link #getConcerns() <em>Concerns</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getConcerns()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Concern> concerns;
+
+	/**
+	 * 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 RepresentationKindImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ArchitecturePackage.Literals.REPRESENTATION_KIND;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<Concern> getConcerns() {
+		if (concerns == null) {
+			concerns = new EObjectResolvingEList<Concern>(Concern.class, this, ArchitecturePackage.REPRESENTATION_KIND__CONCERNS);
+		}
+		return concerns;
+	}
+
+	/**
+	 * <!-- 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, ArchitecturePackage.REPRESENTATION_KIND__ICON, oldIcon, icon));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ArchitectureDescriptionLanguage getLanguage() {
+		if (eContainerFeatureID() != ArchitecturePackage.REPRESENTATION_KIND__LANGUAGE) return null;
+		return (ArchitectureDescriptionLanguage)eInternalContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetLanguage(ArchitectureDescriptionLanguage newLanguage, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newLanguage, ArchitecturePackage.REPRESENTATION_KIND__LANGUAGE, msgs);
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setLanguage(ArchitectureDescriptionLanguage newLanguage) {
+		if (newLanguage != eInternalContainer() || (eContainerFeatureID() != ArchitecturePackage.REPRESENTATION_KIND__LANGUAGE && newLanguage != null)) {
+			if (EcoreUtil.isAncestor(this, newLanguage))
+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+			NotificationChain msgs = null;
+			if (eInternalContainer() != null)
+				msgs = eBasicRemoveFromContainer(msgs);
+			if (newLanguage != null)
+				msgs = ((InternalEObject)newLanguage).eInverseAdd(this, ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS, ArchitectureDescriptionLanguage.class, msgs);
+			msgs = basicSetLanguage(newLanguage, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ArchitecturePackage.REPRESENTATION_KIND__LANGUAGE, newLanguage, newLanguage));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ArchitecturePackage.REPRESENTATION_KIND__LANGUAGE:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetLanguage((ArchitectureDescriptionLanguage)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 ArchitecturePackage.REPRESENTATION_KIND__LANGUAGE:
+				return basicSetLanguage(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+		switch (eContainerFeatureID()) {
+			case ArchitecturePackage.REPRESENTATION_KIND__LANGUAGE:
+				return eInternalContainer().eInverseRemove(this, ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS, ArchitectureDescriptionLanguage.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 ArchitecturePackage.REPRESENTATION_KIND__LANGUAGE:
+				return getLanguage();
+			case ArchitecturePackage.REPRESENTATION_KIND__CONCERNS:
+				return getConcerns();
+			case ArchitecturePackage.REPRESENTATION_KIND__ICON:
+				return getIcon();
+		}
+		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 ArchitecturePackage.REPRESENTATION_KIND__LANGUAGE:
+				setLanguage((ArchitectureDescriptionLanguage)newValue);
+				return;
+			case ArchitecturePackage.REPRESENTATION_KIND__CONCERNS:
+				getConcerns().clear();
+				getConcerns().addAll((Collection<? extends Concern>)newValue);
+				return;
+			case ArchitecturePackage.REPRESENTATION_KIND__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 ArchitecturePackage.REPRESENTATION_KIND__LANGUAGE:
+				setLanguage((ArchitectureDescriptionLanguage)null);
+				return;
+			case ArchitecturePackage.REPRESENTATION_KIND__CONCERNS:
+				getConcerns().clear();
+				return;
+			case ArchitecturePackage.REPRESENTATION_KIND__ICON:
+				setIcon(ICON_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ArchitecturePackage.REPRESENTATION_KIND__LANGUAGE:
+				return getLanguage() != null;
+			case ArchitecturePackage.REPRESENTATION_KIND__CONCERNS:
+				return concerns != null && !concerns.isEmpty();
+			case ArchitecturePackage.REPRESENTATION_KIND__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();
+	}
+
+} //RepresentationKindImpl
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/StakeholderImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/StakeholderImpl.java
new file mode 100644
index 00000000000..088ffd87870
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/StakeholderImpl.java
@@ -0,0 +1,245 @@
+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture.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.util.EObjectResolvingEList;
+
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain;
+import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
+import org.eclipse.papyrus.infra.core.architecture.Concern;
+import org.eclipse.papyrus.infra.core.architecture.Stakeholder;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Stakeholder</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.impl.StakeholderImpl#getConcerns <em>Concerns</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.architecture.impl.StakeholderImpl#getDomain <em>Domain</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class StakeholderImpl extends ADElementImpl implements Stakeholder {
+	/**
+	 * The cached value of the '{@link #getConcerns() <em>Concerns</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getConcerns()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Concern> concerns;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected StakeholderImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ArchitecturePackage.Literals.STAKEHOLDER;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<Concern> getConcerns() {
+		if (concerns == null) {
+			concerns = new EObjectResolvingEList<Concern>(Concern.class, this, ArchitecturePackage.STAKEHOLDER__CONCERNS);
+		}
+		return concerns;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ArchitectureDomain getDomain() {
+		if (eContainerFeatureID() != ArchitecturePackage.STAKEHOLDER__DOMAIN) return null;
+		return (ArchitectureDomain)eInternalContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetDomain(ArchitectureDomain newDomain, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newDomain, ArchitecturePackage.STAKEHOLDER__DOMAIN, msgs);
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDomain(ArchitectureDomain newDomain) {
+		if (newDomain != eInternalContainer() || (eContainerFeatureID() != ArchitecturePackage.STAKEHOLDER__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, ArchitecturePackage.ARCHITECTURE_DOMAIN__STAKEHOLDERS, ArchitectureDomain.class, msgs);
+			msgs = basicSetDomain(newDomain, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ArchitecturePackage.STAKEHOLDER__DOMAIN, newDomain, newDomain));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ArchitecturePackage.STAKEHOLDER__DOMAIN:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetDomain((ArchitectureDomain)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 ArchitecturePackage.STAKEHOLDER__DOMAIN:
+				return basicSetDomain(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+		switch (eContainerFeatureID()) {
+			case ArchitecturePackage.STAKEHOLDER__DOMAIN:
+				return eInternalContainer().eInverseRemove(this, ArchitecturePackage.ARCHITECTURE_DOMAIN__STAKEHOLDERS, ArchitectureDomain.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 ArchitecturePackage.STAKEHOLDER__CONCERNS:
+				return getConcerns();
+			case ArchitecturePackage.STAKEHOLDER__DOMAIN:
+				return getDomain();
+		}
+		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 ArchitecturePackage.STAKEHOLDER__CONCERNS:
+				getConcerns().clear();
+				getConcerns().addAll((Collection<? extends Concern>)newValue);
+				return;
+			case ArchitecturePackage.STAKEHOLDER__DOMAIN:
+				setDomain((ArchitectureDomain)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ArchitecturePackage.STAKEHOLDER__CONCERNS:
+				getConcerns().clear();
+				return;
+			case ArchitecturePackage.STAKEHOLDER__DOMAIN:
+				setDomain((ArchitectureDomain)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ArchitecturePackage.STAKEHOLDER__CONCERNS:
+				return concerns != null && !concerns.isEmpty();
+			case ArchitecturePackage.STAKEHOLDER__DOMAIN:
+				return getDomain() != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //StakeholderImpl
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/util/ArchitectureAdapterFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/util/ArchitectureAdapterFactory.java
new file mode 100644
index 00000000000..d6cfd1ce2f7
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/util/ArchitectureAdapterFactory.java
@@ -0,0 +1,310 @@
+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.core.architecture.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage
+ * @generated
+ */
+public class ArchitectureAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static ArchitecturePackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ArchitectureAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = ArchitecturePackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ArchitectureSwitch<Adapter> modelSwitch =
+		new ArchitectureSwitch<Adapter>() {
+			@Override
+			public Adapter caseADElement(ADElement object) {
+				return createADElementAdapter();
+			}
+			@Override
+			public Adapter caseArchitectureDomain(ArchitectureDomain object) {
+				return createArchitectureDomainAdapter();
+			}
+			@Override
+			public Adapter caseArchitectureDescriptionLanguage(ArchitectureDescriptionLanguage object) {
+				return createArchitectureDescriptionLanguageAdapter();
+			}
+			@Override
+			public Adapter caseStakeholder(Stakeholder object) {
+				return createStakeholderAdapter();
+			}
+			@Override
+			public Adapter caseConcern(Concern object) {
+				return createConcernAdapter();
+			}
+			@Override
+			public Adapter caseArchitectureViewpoint(ArchitectureViewpoint object) {
+				return createArchitectureViewpointAdapter();
+			}
+			@Override
+			public Adapter caseRepresentationKind(RepresentationKind object) {
+				return createRepresentationKindAdapter();
+			}
+			@Override
+			public Adapter caseArchitectureContext(ArchitectureContext object) {
+				return createArchitectureContextAdapter();
+			}
+			@Override
+			public Adapter caseArchitectureFramework(ArchitectureFramework object) {
+				return createArchitectureFrameworkAdapter();
+			}
+			@Override
+			public Adapter caseArchitectureDescription(ArchitectureDescription object) {
+				return createArchitectureDescriptionAdapter();
+			}
+			@Override
+			public Adapter caseArchitectureDescriptionPreferences(ArchitectureDescriptionPreferences object) {
+				return createArchitectureDescriptionPreferencesAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.core.architecture.ADElement <em>AD Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ADElement
+	 * @generated
+	 */
+	public Adapter createADElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain <em>Domain</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain
+	 * @generated
+	 */
+	public Adapter createArchitectureDomainAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage <em>Description Language</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage
+	 * @generated
+	 */
+	public Adapter createArchitectureDescriptionLanguageAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.core.architecture.Stakeholder <em>Stakeholder</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.core.architecture.Stakeholder
+	 * @generated
+	 */
+	public Adapter createStakeholderAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.core.architecture.Concern <em>Concern</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.core.architecture.Concern
+	 * @generated
+	 */
+	public Adapter createConcernAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint <em>Viewpoint</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint
+	 * @generated
+	 */
+	public Adapter createArchitectureViewpointAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.core.architecture.RepresentationKind <em>Representation Kind</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.core.architecture.RepresentationKind
+	 * @generated
+	 */
+	public Adapter createRepresentationKindAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext <em>Context</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureContext
+	 * @generated
+	 */
+	public Adapter createArchitectureContextAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureFramework <em>Framework</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureFramework
+	 * @generated
+	 */
+	public Adapter createArchitectureFrameworkAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDescription <em>Description</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureDescription
+	 * @generated
+	 */
+	public Adapter createArchitectureDescriptionAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionPreferences <em>Description Preferences</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionPreferences
+	 * @generated
+	 */
+	public Adapter createArchitectureDescriptionPreferencesAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+
+} //ArchitectureAdapterFactory
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/util/ArchitectureResourceFactoryImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/util/ArchitectureResourceFactoryImpl.java
new file mode 100644
index 00000000000..5ba5bcae3c6
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/util/ArchitectureResourceFactoryImpl.java
@@ -0,0 +1,53 @@
+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture.util;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
+import org.eclipse.emf.ecore.xmi.XMIResource;
+import org.eclipse.emf.ecore.xmi.impl.URIHandlerImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Resource Factory</b> associated with the package.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.core.architecture.util.ArchitectureResourceImpl
+ * @generated
+ */
+public class ArchitectureResourceFactoryImpl extends ResourceFactoryImpl {
+	/**
+	 * Creates an instance of the resource factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ArchitectureResourceFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * Creates an instance of the resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	@Override
+	public Resource createResource(URI uri) {
+		ArchitectureResourceImpl result = new ArchitectureResourceImpl(uri);
+		result.getDefaultSaveOptions().put(XMIResource.OPTION_URI_HANDLER, new URIHandlerImpl.PlatformSchemeAware());
+		return result;
+	}
+
+} //ArchitectureResourceFactoryImpl
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/util/ArchitectureResourceImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/util/ArchitectureResourceImpl.java
new file mode 100644
index 00000000000..d956c4d43e0
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/util/ArchitectureResourceImpl.java
@@ -0,0 +1,47 @@
+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture.util;
+
+import org.eclipse.emf.common.util.URI;
+
+import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Resource </b> associated with the package.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.core.architecture.util.ArchitectureResourceFactoryImpl
+ * @generated
+ */
+public class ArchitectureResourceImpl extends XMIResourceImpl {
+	/**
+	 * Creates an instance of the resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param uri the URI of the new resource.
+	 * @generated
+	 */
+	public ArchitectureResourceImpl(URI uri) {
+		super(uri);
+	}
+
+	/**
+	 * use UUIDs instead of positions
+	 */
+	@Override
+	protected boolean useUUIDs() {
+		return true;
+	}
+
+} //ArchitectureResourceImpl
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/util/ArchitectureSwitch.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/util/ArchitectureSwitch.java
new file mode 100644
index 00000000000..91d77e87e17
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/util/ArchitectureSwitch.java
@@ -0,0 +1,340 @@
+/**
+* Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.core.architecture.util;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.infra.core.architecture.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage
+ * @generated
+ */
+public class ArchitectureSwitch<T> extends Switch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static ArchitecturePackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ArchitectureSwitch() {
+		if (modelPackage == null) {
+			modelPackage = ArchitecturePackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case ArchitecturePackage.AD_ELEMENT: {
+				ADElement adElement = (ADElement)theEObject;
+				T result = caseADElement(adElement);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ArchitecturePackage.ARCHITECTURE_DOMAIN: {
+				ArchitectureDomain architectureDomain = (ArchitectureDomain)theEObject;
+				T result = caseArchitectureDomain(architectureDomain);
+				if (result == null) result = caseADElement(architectureDomain);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE: {
+				ArchitectureDescriptionLanguage architectureDescriptionLanguage = (ArchitectureDescriptionLanguage)theEObject;
+				T result = caseArchitectureDescriptionLanguage(architectureDescriptionLanguage);
+				if (result == null) result = caseArchitectureContext(architectureDescriptionLanguage);
+				if (result == null) result = caseADElement(architectureDescriptionLanguage);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ArchitecturePackage.STAKEHOLDER: {
+				Stakeholder stakeholder = (Stakeholder)theEObject;
+				T result = caseStakeholder(stakeholder);
+				if (result == null) result = caseADElement(stakeholder);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ArchitecturePackage.CONCERN: {
+				Concern concern = (Concern)theEObject;
+				T result = caseConcern(concern);
+				if (result == null) result = caseADElement(concern);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ArchitecturePackage.ARCHITECTURE_VIEWPOINT: {
+				ArchitectureViewpoint architectureViewpoint = (ArchitectureViewpoint)theEObject;
+				T result = caseArchitectureViewpoint(architectureViewpoint);
+				if (result == null) result = caseADElement(architectureViewpoint);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ArchitecturePackage.REPRESENTATION_KIND: {
+				RepresentationKind representationKind = (RepresentationKind)theEObject;
+				T result = caseRepresentationKind(representationKind);
+				if (result == null) result = caseADElement(representationKind);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ArchitecturePackage.ARCHITECTURE_CONTEXT: {
+				ArchitectureContext architectureContext = (ArchitectureContext)theEObject;
+				T result = caseArchitectureContext(architectureContext);
+				if (result == null) result = caseADElement(architectureContext);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ArchitecturePackage.ARCHITECTURE_FRAMEWORK: {
+				ArchitectureFramework architectureFramework = (ArchitectureFramework)theEObject;
+				T result = caseArchitectureFramework(architectureFramework);
+				if (result == null) result = caseArchitectureContext(architectureFramework);
+				if (result == null) result = caseADElement(architectureFramework);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION: {
+				ArchitectureDescription architectureDescription = (ArchitectureDescription)theEObject;
+				T result = caseArchitectureDescription(architectureDescription);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_PREFERENCES: {
+				ArchitectureDescriptionPreferences architectureDescriptionPreferences = (ArchitectureDescriptionPreferences)theEObject;
+				T result = caseArchitectureDescriptionPreferences(architectureDescriptionPreferences);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>AD Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>AD Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseADElement(ADElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Domain</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>Domain</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseArchitectureDomain(ArchitectureDomain object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Description Language</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>Description Language</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseArchitectureDescriptionLanguage(ArchitectureDescriptionLanguage object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Stakeholder</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>Stakeholder</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseStakeholder(Stakeholder object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Concern</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>Concern</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseConcern(Concern object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Viewpoint</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>Viewpoint</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseArchitectureViewpoint(ArchitectureViewpoint object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Representation Kind</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>Representation Kind</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseRepresentationKind(RepresentationKind object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Context</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>Context</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseArchitectureContext(ArchitectureContext object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Framework</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>Framework</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseArchitectureFramework(ArchitectureFramework object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Description</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>Description</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseArchitectureDescription(ArchitectureDescription object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Description Preferences</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>Description Preferences</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseArchitectureDescriptionPreferences(ArchitectureDescriptionPreferences object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+
+} //ArchitectureSwitch
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF
index 8725c017613..e9da0ef4900 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF
@@ -27,7 +27,8 @@ Require-Bundle: org.eclipse.emf.workspace;bundle-version="[1.5.0,2.0.0)",
  org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
  org.eclipse.core.expressions;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.core.commands;bundle-version="[3.8.0,4.0.0)";visibility:=reexport,
- org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)";visibility:=reexport
+ org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 2.3.0.qualifier
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/DiModelUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/DiModelUtils.java
index 7cf89b0af68..1cdf419f83f 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/DiModelUtils.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/DiModelUtils.java
@@ -1,59 +1,90 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.core.resource.sasheditor;

-

-import org.eclipse.core.resources.IFile;

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

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.papyrus.infra.core.resource.IModel;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-

-/**

- * Set of utility methods linked to Di resource.

- *

- * @author cedric dumoulin

- *

- */

-public class DiModelUtils {

-

-	/**

-	 * Returns the related di file. Warning : this method is here for historical

-	 * reasons. It should be removed asap.

-	 *

-	 * @param file

-	 *            A file (di, model or notation).

-	 * @return The associated DI file.

-	 * @deprecated No replacement.

-	 */

-	@Deprecated

-	public static IFile getRelatedDiFile(IFile file) {

-		if (file == null) {

-			return null;

-		}

-		IFile diFile;

-		if (DiModel.MODEL_FILE_EXTENSION.equalsIgnoreCase(file.getFileExtension())) {

-			diFile = file;

-		} else {

-			// Find the correct file

-			IPath diPath = file.getFullPath().removeFileExtension().addFileExtension(DiModel.MODEL_FILE_EXTENSION);

-			diFile = file.getParent().getFile(diPath.makeRelativeTo(file.getParent().getFullPath()));

-		}

-		return diFile;

-	}

-

-	/**

-	 * Returns the DI Resource associated to the model set. May be null.

-	 *

-	 * @param modelSet

-	 * @return

-	 */

-	public static Resource getDiResource(ModelSet modelSet) {

-		IModel diModel = modelSet.getModel(SashModel.MODEL_ID);

-		if (diModel instanceof SashModel) {

-			return ((SashModel) diModel).getResource();

-		}

-		return null;

-	}

-

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.core.resource.sasheditor;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescription;
+import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionPreferences;
+import org.eclipse.papyrus.infra.core.resource.IModel;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+
+/**
+ * Set of utility methods linked to Di resource.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class DiModelUtils {
+
+	/**
+	 * Returns the related di file. Warning : this method is here for historical
+	 * reasons. It should be removed asap.
+	 *
+	 * @param file
+	 *            A file (di, model or notation).
+	 * @return The associated DI file.
+	 * @deprecated No replacement.
+	 */
+	@Deprecated
+	public static IFile getRelatedDiFile(IFile file) {
+		if (file == null) {
+			return null;
+		}
+		IFile diFile;
+		if (DiModel.MODEL_FILE_EXTENSION.equalsIgnoreCase(file.getFileExtension())) {
+			diFile = file;
+		} else {
+			// Find the correct file
+			IPath diPath = file.getFullPath().removeFileExtension().addFileExtension(DiModel.MODEL_FILE_EXTENSION);
+			diFile = file.getParent().getFile(diPath.makeRelativeTo(file.getParent().getFullPath()));
+		}
+		return diFile;
+	}
+
+	/**
+	 * Returns the DI Resource associated to the model set. May be null.
+	 *
+	 * @param modelSet
+	 * @return
+	 */
+	public static Resource getDiResource(ModelSet modelSet) {
+		IModel diModel = modelSet.getModel(SashModel.MODEL_ID);
+		if (diModel instanceof SashModel) {
+			return ((SashModel) diModel).getResource();
+		}
+		return null;
+	}
+
+	/**
+	 * @since 2.3
+	 */
+	public static ArchitectureDescription getArchitectureDescription(ModelSet modelSet) {
+		ArchitectureDescription result = null;
+
+		Resource resource = getDiResource(modelSet);
+		if (resource != null) {
+			result = (ArchitectureDescription) EcoreUtil.getObjectByType(resource.getContents(), ArchitecturePackage.Literals.ARCHITECTURE_DESCRIPTION);
+		}
+
+		return result;
+	}
+
+	/**
+	 * @since 2.3
+	 */
+	public static ArchitectureDescriptionPreferences getArchitectureDescriptionPreferences(ModelSet modelSet) {
+		ArchitectureDescriptionPreferences result = null;
+
+		Resource resource = getDiResource(modelSet);
+		if (resource != null) {
+			result = (ArchitectureDescriptionPreferences) EcoreUtil.getObjectByType(resource.getContents(), ArchitecturePackage.Literals.ARCHITECTURE_DESCRIPTION_PREFERENCES);
+		}
+
+		return result;
+	}
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModel.java
index d513de07d25..27419aa1108 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModel.java
@@ -33,6 +33,9 @@ import org.eclipse.emf.ecore.resource.URIConverter;
 import org.eclipse.emf.ecore.xmi.XMIResource;
 import org.eclipse.emf.ecore.xmi.XMLResource;
 import org.eclipse.papyrus.infra.core.Activator;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescription;
+import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionPreferences;
 import org.eclipse.papyrus.infra.core.resource.EMFLogicalModel;
 import org.eclipse.papyrus.infra.core.resource.IModel;
 import org.eclipse.papyrus.infra.core.resource.ModelSet;
@@ -412,12 +415,16 @@ public class SashModel extends EMFLogicalModel implements IModel {
 
 	@Override
 	protected boolean isRootElement(EObject object) {
-		return super.isRootElement(object) && (object instanceof SashWindowsMngr);
+		return super.isRootElement(object) && 
+				(object instanceof SashWindowsMngr || 
+				 object instanceof ArchitectureDescription ||
+				 object instanceof ArchitectureDescriptionPreferences);
 	}
 
 	@Override
 	protected boolean isSupportedRoot(EObject object) {
-		return DiPackage.Literals.SASH_WINDOWS_MNGR.isInstance(object);
+		return DiPackage.Literals.SASH_WINDOWS_MNGR.isInstance(object) ||
+			  ArchitecturePackage.Literals.ARCHITECTURE_DESCRIPTION.isInstance(object);
 	}
 
 	//
diff --git a/plugins/infra/core/pom.xml b/plugins/infra/core/pom.xml
index 575e5d7aaef..51bfb0a9aaa 100644
--- a/plugins/infra/core/pom.xml
+++ b/plugins/infra/core/pom.xml
@@ -13,6 +13,8 @@
 
 	<modules>
 		<module>org.eclipse.papyrus.infra.core</module>
+		<module>org.eclipse.papyrus.infra.core.architecture</module>
+		<module>org.eclipse.papyrus.infra.core.architecture.edit</module>
 		<module>org.eclipse.papyrus.infra.core.log</module>
 		<module>org.eclipse.papyrus.infra.core.pluginexplorer</module>
 		<module>org.eclipse.papyrus.infra.core.sasheditor</module>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/META-INF/MANIFEST.MF
index 2a3be97f39a..6593ebc0f8c 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/META-INF/MANIFEST.MF
@@ -1,6 +1,5 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.papyrus.infra.types.rulebased;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.types.rulebased;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.properties.edit;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
  org.eclipse.uml2.uml.edit;bundle-version="[5.1.0,6.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.services.edit;bundle-version="[2.0.0,3.0.0)",
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/rules/container/InvariantContainerRule.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/rules/container/InvariantContainerRule.java
index 337222bbc6a..5ca01a23422 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/rules/container/InvariantContainerRule.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/rules/container/InvariantContainerRule.java
@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.emf.types.Activator;
-import org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
 import org.eclipse.papyrus.infra.types.core.impl.ConfiguredHintedSpecializationElementType;
 import org.eclipse.papyrus.infra.types.rulebased.core.AbstractRule;
 
@@ -53,7 +53,7 @@ public class InvariantContainerRule extends AbstractRule<InvariantContainerRuleC
 		}
 		boolean isValid = false;
 		try {
-			IElementType newContainerElementType = ElementTypeRegistry.getInstance().getElementType(container, TypeContext.getContext());
+			IElementType newContainerElementType = ElementTypeRegistry.getInstance().getElementType(container, TypeContext.getContext(container));
 
 			for (HierarchyPermission permission : invariantRuleConfiguration.getPermissions()) { // for each permission, get the matcher and matches directly
 				boolean isPermitted = permission.isPermitted();
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF
index 63e6c7970ef..d1ad30a3c35 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Export-Package: org.eclipse.papyrus.infra.emf,
  org.eclipse.papyrus.infra.emf.resource.index,
  org.eclipse.papyrus.infra.emf.spi.resolver,
  org.eclipse.papyrus.infra.emf.utils
-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[2.1.0,3.0.0)";visibility:=reexport,
+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[2.3.0,3.0.0)";visibility:=reexport,
  org.eclipse.core.expressions;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
  org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/plugin.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/plugin.xml
index 3fa4aef1e73..101095536f3 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/plugin.xml
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/plugin.xml
@@ -1,38 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<!--

- Copyright (c) 2012, 2016 CEA, Christian W. Damus, and others.

- 

- All rights reserved. This program and the accompanying materials

- are made available under the terms of the Eclipse Public License v1.0

- which accompanies this distribution, and is available at

- http://www.eclipse.org/legal/epl-v10.html

- 

- Contributors:

-   CEA - Initial API and implementation

-   Christian W. Damus (CEA) - bug 323802

-   Christian W. Damus (CEA) - bug 408491

-   Christian W. Damus (CEA) - bug 431953 (pre-requisite refactoring of ModelSet service start-up)

-   Christian W. Damus - bug 485220

-   

--->

-<plugin>

-   <extension-point id="dependencyUpdateParticipant" name="Dependency Update Participants" schema="schema/dependencyUpdateParticipant.exsd"/>

-   <extension-point id="index" name="Workspace Model Index" schema="schema/index.exsd"/>

-   

-   <extension

-         point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">

-      <elementTypeSet

-            clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"

-            path="model/infra-emf.elementtypesconfigurations">

-      </elementTypeSet>

-   </extension>

-

-   <extension

-         point="org.eclipse.papyrus.infra.emf.index">

-      <indexProvider

-            class="org.eclipse.papyrus.infra.emf.internal.resource.CrossReferenceIndex$IndexProvider">

-      </indexProvider>

-   </extension>

-   

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<!--
+ Copyright (c) 2012, 2016 CEA, Christian W. Damus, and others.
+ 
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+ 
+ Contributors:
+   CEA - Initial API and implementation
+   Christian W. Damus (CEA) - bug 323802
+   Christian W. Damus (CEA) - bug 408491
+   Christian W. Damus (CEA) - bug 431953 (pre-requisite refactoring of ModelSet service start-up)
+   Christian W. Damus - bug 485220
+   
+-->
+<plugin>
+   <extension-point id="dependencyUpdateParticipant" name="Dependency Update Participants" schema="schema/dependencyUpdateParticipant.exsd"/>
+   <extension-point id="index" name="Workspace Model Index" schema="schema/index.exsd"/>
+   
+   <extension
+         point="org.eclipse.papyrus.infra.emf.index">
+      <indexProvider
+            class="org.eclipse.papyrus.infra.emf.internal.resource.CrossReferenceIndex$IndexProvider">
+      </indexProvider>
+   </extension>
+   
+</plugin>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/ui/ECoreModelContentProvider.java b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/utils/EcoreModelContentProvider.java
index 3f3a2dec121..ef248a45bee 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/ui/ECoreModelContentProvider.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/utils/EcoreModelContentProvider.java
@@ -11,7 +11,7 @@
  *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.infra.viewpoints.configuration.ui;
+package org.eclipse.papyrus.infra.ui.emf.utils;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.viewers.ITreeContentProvider;
@@ -22,7 +22,7 @@ import org.eclipse.jface.viewers.Viewer;
  *
  * @author Laurent Wouters
  */
-public class ECoreModelContentProvider implements ITreeContentProvider {
+public class EcoreModelContentProvider implements ITreeContentProvider {
 	/**
 	 * Represents the top object to be passed as input for to the viewer using this provider
 	 */
@@ -36,7 +36,7 @@ public class ECoreModelContentProvider implements ITreeContentProvider {
 	 * @param root
 	 *            The root object
 	 */
-	public ECoreModelContentProvider(EObject root) {
+	public EcoreModelContentProvider(EObject root) {
 		this.root = root;
 	}
 
diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/internal/operations/ModelingAssistantProviderOperations.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/internal/operations/ModelingAssistantProviderOperations.java
index a265af5ed9b..e07439a0053 100644
--- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/internal/operations/ModelingAssistantProviderOperations.java
+++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/internal/operations/ModelingAssistantProviderOperations.java
@@ -478,7 +478,7 @@ public class ModelingAssistantProviderOperations
 		}
 
 		if (result == null) {
-			result = ElementTypeUtils.getEditContext();
+			result = ElementTypeUtils.getDefaultClientContext();
 
 			if (result == null) {
 				result = ClientContextManager.getDefaultClientContext();
diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src/org/eclipse/papyrus/infra/gmfdiag/assistant/core/util/ModelingAssistantUtil.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src/org/eclipse/papyrus/infra/gmfdiag/assistant/core/util/ModelingAssistantUtil.java
index 29d48409436..461fd743eb1 100644
--- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src/org/eclipse/papyrus/infra/gmfdiag/assistant/core/util/ModelingAssistantUtil.java
+++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src/org/eclipse/papyrus/infra/gmfdiag/assistant/core/util/ModelingAssistantUtil.java
@@ -84,8 +84,8 @@ public class ModelingAssistantUtil {
 				result = new IElementType[] { type };
 			} else if (context.getClientContext() == null) {
 				result = ElementTypeRegistry.getInstance().getAllTypesMatching(context.getEObject(), provider.getClientContext());
-				if (provider.getClientContext() != ElementTypeUtils.getEditContext()) {
-					IElementType[] more = ElementTypeRegistry.getInstance().getAllTypesMatching(context.getEObject(), ElementTypeUtils.getEditContext());
+				if (provider.getClientContext() != ElementTypeUtils.getDefaultClientContext()) {
+					IElementType[] more = ElementTypeRegistry.getInstance().getAllTypesMatching(context.getEObject(), ElementTypeUtils.getDefaultClientContext());
 					result = (more.length == 0) ? result : (result.length == 0) ? more : ObjectArrays.concat(more, result, IElementType.class);
 				}
 			} else {
@@ -97,9 +97,9 @@ public class ModelingAssistantUtil {
 				List<IElementType> core = Arrays.asList(ElementTypeRegistry.getInstance().getAllTypesMatching(object, provider.getClientContext()));
 				List<IElementType> resultList = Lists.newArrayListWithExpectedSize(core.size());
 
-				if (provider.getClientContext() != ElementTypeUtils.getEditContext()) {
+				if (provider.getClientContext() != ElementTypeUtils.getDefaultClientContext()) {
 					// First add the client-context-specific types
-					List<IElementType> more = Arrays.asList(ElementTypeRegistry.getInstance().getAllTypesMatching(object, ElementTypeUtils.getEditContext()));
+					List<IElementType> more = Arrays.asList(ElementTypeRegistry.getInstance().getAllTypesMatching(object, ElementTypeUtils.getDefaultClientContext()));
 					resultList.addAll(more);
 				}
 
diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src/org/eclipse/papyrus/infra/gmfdiag/assistant/internal/core/DelegatingModelingAssistantProvider.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src/org/eclipse/papyrus/infra/gmfdiag/assistant/internal/core/DelegatingModelingAssistantProvider.java
index 77b2e4e6a52..b4140c3914d 100644
--- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src/org/eclipse/papyrus/infra/gmfdiag/assistant/internal/core/DelegatingModelingAssistantProvider.java
+++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src/org/eclipse/papyrus/infra/gmfdiag/assistant/internal/core/DelegatingModelingAssistantProvider.java
@@ -241,7 +241,7 @@ public class DelegatingModelingAssistantProvider implements IModelingAssistantPr
 
 		if (diagram != null) {
 			for (Iterator<? extends IElementType> iter = elementTypes.iterator(); iter.hasNext();) {
-				if (!PolicyChecker.getCurrent().isInModelingAssistants(diagram, iter.next())) {
+				if (!PolicyChecker.getFor(diagram).isInModelingAssistants(diagram, iter.next())) {
 					iter.remove();
 				}
 			}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF
index b107146f95f..e2f060a5ad0 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF
@@ -22,7 +22,8 @@ Require-Bundle: org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
  org.eclipse.gmf.runtime.notation.edit;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.papyrus.infra.properties;bundle-version="[1.2.0,2.0.0)"
+ org.eclipse.papyrus.infra.properties;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[1.0.0,2.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 2.1.0.qualifier
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/CSSDiagramImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/CSSDiagramImpl.java
index e27cd26cdfc..060d78c96ad 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/CSSDiagramImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/CSSDiagramImpl.java
@@ -24,6 +24,7 @@ import org.eclipse.gmf.runtime.notation.NamedStyle;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.Style;
 import org.eclipse.gmf.runtime.notation.impl.DiagramImpl;
+import org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind;
 import org.eclipse.papyrus.infra.gmfdiag.css.engine.DiagramCSSEngine;
 import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
 import org.eclipse.papyrus.infra.gmfdiag.css.resource.CSSNotationResource;
@@ -32,8 +33,7 @@ import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSViewDelegate;
 import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheet;
 import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheetReference;
 import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StylesheetsFactory;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView;
+import org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram;
 import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
 
 /**
@@ -129,7 +129,7 @@ public class CSSDiagramImpl extends DiagramImpl implements CSSDiagram, CSSView.I
 		if (proto == null) {
 			return null;
 		}
-		PapyrusView conf = proto.getConfiguration();
+		PapyrusRepresentationKind conf = proto.getRepresentationKind();
 		if (conf == null || !(conf instanceof PapyrusDiagram)) {
 			return null;
 		}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF
index 247d2fbd75d..867dcff6c28 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF
@@ -6,7 +6,8 @@ Require-Bundle: org.eclipse.emf.transaction.ui;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="0.1.0"
 Export-Package: org.eclipse.papyrus.commands,
  org.eclipse.papyrus.commands.util,
  org.eclipse.papyrus.commands.wrappers
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/ICreationCommand.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/ICreationCommand.java
index 0edc4984d37..bb43bde6688 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/ICreationCommand.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/ICreationCommand.java
@@ -14,7 +14,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.papyrus.infra.core.resource.ModelSet;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram;
+import org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram;
 import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
 
 /**
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
index e93c8d792fa..48319b0f8cd 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
@@ -1,79 +1,81 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.gmfdiag.common,

- org.eclipse.papyrus.infra.gmfdiag.common.adapter,

- org.eclipse.papyrus.infra.gmfdiag.common.advice,

- org.eclipse.papyrus.infra.gmfdiag.common.commands,

- org.eclipse.papyrus.infra.gmfdiag.common.commands.requests,

- org.eclipse.papyrus.infra.gmfdiag.common.databinding,

- org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom,

- org.eclipse.papyrus.infra.gmfdiag.common.decoration,

- org.eclipse.papyrus.infra.gmfdiag.common.editpart,

- org.eclipse.papyrus.infra.gmfdiag.common.editpolicies,

- org.eclipse.papyrus.infra.gmfdiag.common.figure,

- org.eclipse.papyrus.infra.gmfdiag.common.figure.edge,

- org.eclipse.papyrus.infra.gmfdiag.common.figure.node,

- org.eclipse.papyrus.infra.gmfdiag.common.geometry,

- org.eclipse.papyrus.infra.gmfdiag.common.handler,

- org.eclipse.papyrus.infra.gmfdiag.common.helper,

- org.eclipse.papyrus.infra.gmfdiag.common.internal.sync;x-internal:=true,

- org.eclipse.papyrus.infra.gmfdiag.common.listener,

- org.eclipse.papyrus.infra.gmfdiag.common.locator,

- org.eclipse.papyrus.infra.gmfdiag.common.messages,

- org.eclipse.papyrus.infra.gmfdiag.common.model,

- org.eclipse.papyrus.infra.gmfdiag.common.parsers,

- org.eclipse.papyrus.infra.gmfdiag.common.preferences,

- org.eclipse.papyrus.infra.gmfdiag.common.providers,

- org.eclipse.papyrus.infra.gmfdiag.common.reconciler,

- org.eclipse.papyrus.infra.gmfdiag.common.selection,

- org.eclipse.papyrus.infra.gmfdiag.common.service,

- org.eclipse.papyrus.infra.gmfdiag.common.service.shape,

- org.eclipse.papyrus.infra.gmfdiag.common.service.visualtype,

- org.eclipse.papyrus.infra.gmfdiag.common.snap,

- org.eclipse.papyrus.infra.gmfdiag.common.snap.copy,

- org.eclipse.papyrus.infra.gmfdiag.common.spi,

- org.eclipse.papyrus.infra.gmfdiag.common.strategy,

- org.eclipse.papyrus.infra.gmfdiag.common.strategy.copy,

- org.eclipse.papyrus.infra.gmfdiag.common.strategy.paste,

- org.eclipse.papyrus.infra.gmfdiag.common.structure,

- org.eclipse.papyrus.infra.gmfdiag.common.sync,

- org.eclipse.papyrus.infra.gmfdiag.common.types,

- org.eclipse.papyrus.infra.gmfdiag.common.undocontext,

- org.eclipse.papyrus.infra.gmfdiag.common.updater,

- org.eclipse.papyrus.infra.gmfdiag.common.utils,

- org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions;x-internal:=true,

- org.eclipse.papyrus.infra.gmfdiag.internal.common.model;x-internal:=true

-Require-Bundle: org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)",

- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="[1.7.0,2.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.emf.appearance;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="[1.7.0,2.0.0)";visibility:=reexport,

- org.eclipse.gmf.runtime.draw2d.ui.render.awt;bundle-version="[1.8.0,2.0.0)",

- org.apache.batik.util;bundle-version="[1.6.0,1.7.0)",

- org.apache.batik.svggen;bundle-version="[1.6.0,1.7.0)",

- org.w3c.dom.svg;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,

- org.apache.batik.dom.svg;bundle-version="[1.6.0,1.7.0)",

- org.apache.batik.dom;bundle-version="[1.6.0,1.7.0)",

- org.apache.batik.xml;bundle-version="[1.6.0,1.7.0)",

- org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- com.ibm.icu,

- org.eclipse.papyrus.infra.services.decoration;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,

- org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.7.0,2.0.0)",

- org.eclipse.papyrus.infra.emf.readonly;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.sync;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.services.edit.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.emf.gmf,

- org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.core;bundle-version="[2.2.0,3.0.0)",

- org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;bundle-version="[3.0.0,4.0.0)"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 3.0.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.common.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.common;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.common,
+ org.eclipse.papyrus.infra.gmfdiag.common.adapter,
+ org.eclipse.papyrus.infra.gmfdiag.common.advice,
+ org.eclipse.papyrus.infra.gmfdiag.common.commands,
+ org.eclipse.papyrus.infra.gmfdiag.common.commands.requests,
+ org.eclipse.papyrus.infra.gmfdiag.common.databinding,
+ org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom,
+ org.eclipse.papyrus.infra.gmfdiag.common.decoration,
+ org.eclipse.papyrus.infra.gmfdiag.common.editpart,
+ org.eclipse.papyrus.infra.gmfdiag.common.editpolicies,
+ org.eclipse.papyrus.infra.gmfdiag.common.figure,
+ org.eclipse.papyrus.infra.gmfdiag.common.figure.edge,
+ org.eclipse.papyrus.infra.gmfdiag.common.figure.node,
+ org.eclipse.papyrus.infra.gmfdiag.common.geometry,
+ org.eclipse.papyrus.infra.gmfdiag.common.handler,
+ org.eclipse.papyrus.infra.gmfdiag.common.helper,
+ org.eclipse.papyrus.infra.gmfdiag.common.internal.sync;x-internal:=true,
+ org.eclipse.papyrus.infra.gmfdiag.common.listener,
+ org.eclipse.papyrus.infra.gmfdiag.common.locator,
+ org.eclipse.papyrus.infra.gmfdiag.common.messages,
+ org.eclipse.papyrus.infra.gmfdiag.common.model,
+ org.eclipse.papyrus.infra.gmfdiag.common.parsers,
+ org.eclipse.papyrus.infra.gmfdiag.common.preferences,
+ org.eclipse.papyrus.infra.gmfdiag.common.providers,
+ org.eclipse.papyrus.infra.gmfdiag.common.reconciler,
+ org.eclipse.papyrus.infra.gmfdiag.common.selection,
+ org.eclipse.papyrus.infra.gmfdiag.common.service,
+ org.eclipse.papyrus.infra.gmfdiag.common.service.shape,
+ org.eclipse.papyrus.infra.gmfdiag.common.service.visualtype,
+ org.eclipse.papyrus.infra.gmfdiag.common.snap,
+ org.eclipse.papyrus.infra.gmfdiag.common.snap.copy,
+ org.eclipse.papyrus.infra.gmfdiag.common.spi,
+ org.eclipse.papyrus.infra.gmfdiag.common.strategy,
+ org.eclipse.papyrus.infra.gmfdiag.common.strategy.copy,
+ org.eclipse.papyrus.infra.gmfdiag.common.strategy.paste,
+ org.eclipse.papyrus.infra.gmfdiag.common.structure,
+ org.eclipse.papyrus.infra.gmfdiag.common.sync,
+ org.eclipse.papyrus.infra.gmfdiag.common.types,
+ org.eclipse.papyrus.infra.gmfdiag.common.undocontext,
+ org.eclipse.papyrus.infra.gmfdiag.common.updater,
+ org.eclipse.papyrus.infra.gmfdiag.common.utils,
+ org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions;x-internal:=true,
+ org.eclipse.papyrus.infra.gmfdiag.internal.common.model;x-internal:=true
+Require-Bundle: org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="[1.7.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="[1.7.0,2.0.0)";visibility:=reexport,
+ org.eclipse.gmf.runtime.draw2d.ui.render.awt;bundle-version="[1.8.0,2.0.0)",
+ org.apache.batik.util;bundle-version="[1.6.0,1.7.0)",
+ org.apache.batik.svggen;bundle-version="[1.6.0,1.7.0)",
+ org.w3c.dom.svg;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
+ org.apache.batik.dom.svg;bundle-version="[1.6.0,1.7.0)",
+ org.apache.batik.dom;bundle-version="[1.6.0,1.7.0)",
+ org.apache.batik.xml;bundle-version="[1.6.0,1.7.0)",
+ org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ com.ibm.icu,
+ org.eclipse.papyrus.infra.services.decoration;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.sync;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.services.edit.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf.gmf,
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.gmfdiag.style;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 3.0.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.common.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.common;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml
index dfd80d6b7ca..ba84328e6b5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml
@@ -440,13 +440,6 @@
    </paletteProvider>
 </extension>
 <extension
-      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
-   <elementTypeSet
-         clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
-         path="model/notation.elementtypesconfigurations">
-   </elementTypeSet>
-</extension>
-<extension
       point="org.eclipse.gmf.runtime.common.ui.services.iconProviders">
    <IconProvider
          class="org.eclipse.papyrus.infra.gmfdiag.common.providers.ElementTypeIconProvider">
@@ -480,12 +473,5 @@
          </dependsOn>
       </service>
    </extension>
-   <extension
-         point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
-      <elementTypeSet
-            clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
-            path="model/gmfdiag-common.elementtypesconfigurations">
-      </elementTypeSet>
-   </extension>
 
 </plugin>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/AbstractPapyrusGmfCreateDiagramCommandHandler.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/AbstractPapyrusGmfCreateDiagramCommandHandler.java
index 101c4953423..6655c7df26a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/AbstractPapyrusGmfCreateDiagramCommandHandler.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/AbstractPapyrusGmfCreateDiagramCommandHandler.java
@@ -50,6 +50,9 @@ import org.eclipse.jface.dialogs.InputDialog;
 import org.eclipse.jface.window.Window;
 import org.eclipse.papyrus.commands.ICreationCommand;
 import org.eclipse.papyrus.commands.OpenDiagramCommand;
+import org.eclipse.papyrus.infra.architecture.representation.ModelAutoCreate;
+import org.eclipse.papyrus.infra.architecture.representation.OwningRule;
+import org.eclipse.papyrus.infra.architecture.representation.RootAutoSelect;
 import org.eclipse.papyrus.infra.core.language.ILanguageService;
 import org.eclipse.papyrus.infra.core.resource.IEMFModel;
 import org.eclipse.papyrus.infra.core.resource.IReadOnlyHandler2;
@@ -60,16 +63,14 @@ import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.emf.gmf.command.CheckedOperationHistory;
 import org.eclipse.papyrus.infra.emf.readonly.ReadOnlyManager;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramPrototype;
 import org.eclipse.papyrus.infra.gmfdiag.common.messages.Messages;
 import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;
 import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
 import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ModelAutoCreate;
-import org.eclipse.papyrus.infra.viewpoints.configuration.OwningRule;
-import org.eclipse.papyrus.infra.viewpoints.configuration.RootAutoSelect;
 import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
 import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
 import org.eclipse.swt.widgets.Display;
@@ -104,7 +105,7 @@ public abstract class AbstractPapyrusGmfCreateDiagramCommandHandler extends Abst
 
 		private EObject element;
 
-		private ViewPrototype prototype;
+		private DiagramPrototype prototype;
 
 		private OwningRule rule;
 
@@ -114,7 +115,7 @@ public abstract class AbstractPapyrusGmfCreateDiagramCommandHandler extends Abst
 
 		private IClientContext clientContext;
 
-		public Creator(ModelSet modelSet, EObject owner, EObject element, ViewPrototype prototype, String name) {
+		public Creator(ModelSet modelSet, EObject owner, EObject element, DiagramPrototype prototype, String name) {
 			this.modelSet = modelSet;
 			this.owner = owner;
 			this.element = element;
@@ -139,14 +140,8 @@ public abstract class AbstractPapyrusGmfCreateDiagramCommandHandler extends Abst
 				attachModelToResource(owner, modelResource);
 			}
 
-			service = ElementEditServiceUtils.getCommandProvider(owner);
-			if (service == null) {
-				// Something isn't right ...
-				return null;
-			}
-
 			try {
-				clientContext = TypeContext.getContext();
+				clientContext = TypeContext.getContext(modelSet);
 			} catch (ServiceException e) {
 				Activator.log.error(e);
 			}
@@ -155,7 +150,13 @@ public abstract class AbstractPapyrusGmfCreateDiagramCommandHandler extends Abst
 				return null;
 			}
 
-			rule = PolicyChecker.getCurrent().getOwningRuleFor(prototype, owner);
+			service = ElementEditServiceUtils.getCommandProvider(owner, clientContext);
+			if (service == null) {
+				// Something isn't right ...
+				return null;
+			}
+
+			rule = PolicyChecker.getFor(modelSet).getOwningRuleFor(prototype, owner);
 			if (rule == null) {
 				// Something isn't right ...
 				return null;
@@ -267,7 +268,7 @@ public abstract class AbstractPapyrusGmfCreateDiagramCommandHandler extends Abst
 	protected CommandResult doEditDiagramName(ViewPrototype prototype, String name) {
 
 		if (name == null) {
-			name = openDiagramNameDialog(prototype.isNatural() ? getDefaultDiagramName() : "New" + prototype.getLabel().replace(" ", ""));
+			name = openDiagramNameDialog("New" + prototype.getLabel().replace(" ", ""));
 		}
 		// canceled
 		if (name == null) {
@@ -334,7 +335,7 @@ public abstract class AbstractPapyrusGmfCreateDiagramCommandHandler extends Abst
 	@Override
 	public final Diagram createDiagram(ModelSet modelSet, EObject owner, String name) {
 		Diagram diagram = null;
-		ViewPrototype proto = ViewPrototype.get(getCreatedDiagramType(), owner, owner);
+		ViewPrototype proto = ViewPrototype.get(PolicyChecker.getFor(modelSet), getCreatedDiagramType(), owner, owner);
 		if (proto != null) {
 			diagram = createDiagram(modelSet, owner, owner, proto, name);
 		}
@@ -396,7 +397,7 @@ public abstract class AbstractPapyrusGmfCreateDiagramCommandHandler extends Abst
 	 */
 	@Override
 	public final ICommand getCreateDiagramCommand(ModelSet modelSet, EObject owner, String name) {
-		ViewPrototype proto = ViewPrototype.get(getCreatedDiagramType(), owner, owner);
+		ViewPrototype proto = ViewPrototype.get(PolicyChecker.getFor(modelSet), getCreatedDiagramType(), owner, owner);
 		if (proto == null) {
 			return null;
 		}
@@ -434,18 +435,18 @@ public abstract class AbstractPapyrusGmfCreateDiagramCommandHandler extends Abst
 
 			@Override
 			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-				Creator creator = new Creator(modelSet, owner, element, prototype, name);
+				Creator creator = new Creator(modelSet, owner, element, (DiagramPrototype) prototype, name);
 				try {
 					CommandResult commandResult = creator.createDiagram();
 					if (commandResult != null) {
-					if (!commandResult.getStatus().isOK()) {
-						return commandResult;
-					}
+						if (!commandResult.getStatus().isOK()) {
+							return commandResult;
+						}
 
-					diagram = (Diagram) commandResult.getReturnValue();
-					diagramElement = diagram.getElement();
-					diagramOwner = DiagramUtils.getOwner(diagram);
-					return commandResult;
+						diagram = (Diagram) commandResult.getReturnValue();
+						diagramElement = diagram.getElement();
+						diagramOwner = DiagramUtils.getOwner(diagram);
+						return commandResult;
 					}
 				} catch (ServiceException e) {
 					Activator.log.error(e);
@@ -525,16 +526,14 @@ public abstract class AbstractPapyrusGmfCreateDiagramCommandHandler extends Abst
 	 *            the diagram's name
 	 * @return the created diagram, or <code>null</code> if the creation failed
 	 */
-	protected Diagram doCreateDiagram(Resource diagramResource, EObject owner, EObject element, ViewPrototype prototype, String name) {
+	protected Diagram doCreateDiagram(Resource diagramResource, EObject owner, EObject element, DiagramPrototype prototype, String name) {
 		// create diagram
 		Diagram diagram = ViewService.createDiagram(element, getDiagramNotationID(), getPreferenceHint());
 		if (diagram != null) {
 			diagram.setName(name);
 			diagram.setElement(element);
 			DiagramUtils.setOwner(diagram, owner);
-			if (!prototype.isNatural()) {
-				DiagramUtils.setPrototype(diagram, prototype);
-			}
+			DiagramUtils.setPrototype(diagram, prototype);
 			diagramResource.getContents().add(diagram);
 			initializeDiagram(diagram);
 
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/SynchronizableGmfDiagramEditor.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/SynchronizableGmfDiagramEditor.java
index 329250158c6..ba86f58926f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/SynchronizableGmfDiagramEditor.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/SynchronizableGmfDiagramEditor.java
@@ -1,540 +1,550 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2015 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 437217

- *  Christian W. Damus - bug 451683

- *  Christian W. Damus - bug 465416

- *  Simon Delisle - Move ReconcilerHelper to a separate class

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.Iterator;

-import java.util.List;

-

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

-import org.eclipse.gef.DefaultEditDomain;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.GraphicalViewer;

-import org.eclipse.gef.commands.CommandStack;

-import org.eclipse.gef.ui.palette.PaletteViewer;

-import org.eclipse.gef.ui.parts.ContentOutlinePage;

-import org.eclipse.gef.ui.views.palette.PalettePage;

-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.WorkspaceViewerProperties;

-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditDomain;

-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramGraphicalViewer;

-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.DiagramDocumentEditor;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.papyrus.commands.CheckedDiagramCommandStack;

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

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.CommandIds;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart;

-import org.eclipse.papyrus.infra.sync.service.ISyncService;

-import org.eclipse.papyrus.infra.ui.editor.reload.IReloadContextProvider;

-import org.eclipse.papyrus.infra.ui.util.EclipseCommandUtils;

-import org.eclipse.papyrus.infra.widgets.util.IRevealSemanticElement;

-import org.eclipse.papyrus.infra.widgets.util.NavigationTarget;

-import org.eclipse.swt.events.DisposeEvent;

-import org.eclipse.swt.events.DisposeListener;

-import org.eclipse.swt.graphics.RGB;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.ui.IActionBars;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.ui.commands.ICommandService;

-import org.eclipse.ui.part.IPageBookViewPage;

-import org.eclipse.ui.part.IPageSite;

-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

-

-import com.google.common.collect.Iterables;

-import com.google.common.collect.Lists;

-

-/**

- *

- * This GMF editor contains a methods in order to reveal visual element from a list of semantic element.

- * <p/>

- * It also provides subclasses with common capability to automatically migrate (reconcile) input diagrams between papurus versions.

- */

-

-@SuppressWarnings("restriction")

-// suppress the warning for WorkspaceViewerProperties

-public class SynchronizableGmfDiagramEditor extends DiagramDocumentEditor implements IRevealSemanticElement, NavigationTarget {

-

-	private Collection<PalettePageWrapper> palettePages;

-

-	private Object palettePageState;

-

-	public SynchronizableGmfDiagramEditor(boolean hasFlyoutPalette) {

-		super(hasFlyoutPalette);

-	}

-

-	/**

-	 * reveal all editpart that represent an element in the given list.

-	 *

-	 * @see org.eclipse.papyrus.infra.core.ui.IRevealSemanticElement#revealSemanticElement(java.util.List)

-	 *

-	 */

-	@Override

-	public void revealSemanticElement(List<?> elementList) {

-		revealElement(elementList);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean revealElement(Object element) {

-		return revealElement(Collections.singleton(element));

-	}

-

-

-	/**

-	 * {@inheritDoc}

-	 *

-	 * reveal all editpart that represent an element in the given list.

-	 *

-	 * @see org.eclipse.papyrus.infra.core.ui.IRevealSemanticElement#revealSemanticElement(java.util.List)

-	 *

-	 */

-	@Override

-	public boolean revealElement(Collection<?> elementList) {

-		// create an instance that can get semantic element from gmf

-		SemanticFromGMFElement semanticFromGMFElement = new SemanticFromGMFElement();

-

-		// get the graphical viewer

-		GraphicalViewer graphicalViewer = getGraphicalViewer();

-		if (graphicalViewer != null) {

-

-			// look amidst all edit part if the semantic is contained in the list

-			Iterator<?> iter = graphicalViewer.getEditPartRegistry().values().iterator();

-			IGraphicalEditPart researchedEditPart = null;

-			List<?> clonedList = new ArrayList<>(elementList);

-			List<IGraphicalEditPart> partSelection = new ArrayList<>();

-

-			while (iter.hasNext() && !clonedList.isEmpty()) {

-				Object currentEditPart = iter.next();

-				// look only amidst IPrimary editpart to avoid compartment and labels of links

-				if (currentEditPart instanceof IPrimaryEditPart) {

-					Object currentElement = semanticFromGMFElement.getSemanticElement(currentEditPart);

-					if (clonedList.contains(currentElement)) {

-						clonedList.remove(currentElement);

-						researchedEditPart = ((IGraphicalEditPart) currentEditPart);

-						partSelection.add(researchedEditPart);

-

-					}

-				}

-			}

-

-			// We may also search for a GMF View (Instead of a semantic model Element)

-			if (!clonedList.isEmpty()) {

-				for (Iterator<?> iterator = clonedList.iterator(); iterator.hasNext();) {

-					Object element = iterator.next();

-					if (graphicalViewer.getEditPartRegistry().containsKey(element) && !clonedList.isEmpty()) {

-						iterator.remove();

-						researchedEditPart = (IGraphicalEditPart) graphicalViewer.getEditPartRegistry().get(element);

-						partSelection.add(researchedEditPart);

-					}

-				}

-			}

-

-			// the second test, as the model element is not a PrimaryEditPart, is to allow the selection even if the user selected it with other elements

-			// and reset the selection if only the model is selected

-			if (clonedList.isEmpty() || (clonedList.size() == 1 && clonedList.get(0) == getDiagram().getElement())) {

-				// all parts have been found

-				IStructuredSelection sSelection = new StructuredSelection(partSelection);

-				// this is used instead of graphicalViewer.select(IGraphicalEditPart) as the later only allows the selection of a single element

-				graphicalViewer.setSelection(sSelection);

-				if (!partSelection.isEmpty()) {

-					graphicalViewer.reveal(partSelection.get(0));

-				}

-				return true;

-			}

-		}

-

-		return false;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Object getAdapter(@SuppressWarnings("rawtypes") Class type) {

-		if (type == DiagramEditPart.class) {

-			return getDiagramEditPart();

-		}

-		if (type == Diagram.class) {

-			return getDiagram();

-		}

-		if (type == IReloadContextProvider.class) {

-			return new DiagramReloadContextProvider(this);

-		}

-		if (type == PalettePage.class) {

-			if (palettePages == null) {

-				palettePages = Lists.newArrayListWithExpectedSize(1);

-			} else {

-				cleanUpPalettePages();

-				if (!palettePages.isEmpty()) {

-					// Make the new page look just like the last one (for continuity of the UI when the

-					// PapyrusPaletteSynchronizer causes a new page to be created)

-					Iterables.getLast(palettePages, null).saveState();

-				}

-			}

-			PalettePageWrapper result = new PalettePageWrapper((CustomPalettePage) super.getAdapter(type));

-			palettePages.add(result);

-			return result;

-		}

-		if (type == IContentOutlinePage.class) {

-			Object result = super.getAdapter(type);

-			if (result instanceof ContentOutlinePage) {

-				result = new OutlinePageWrapper((ContentOutlinePage) result);

-			}

-			return result;

-		}

-		return super.getAdapter(type);

-	}

-

-	Collection<? extends PalettePage> getPalettePages() {

-		if (palettePages == null) {

-			return Collections.emptyList();

-		} else {

-			cleanUpPalettePages();

-			return Collections.unmodifiableCollection(palettePages);

-		}

-	}

-

-	void setDeferredPalettePageReloadContext(Object reloadContext) {

-		palettePageState = reloadContext;

-	}

-

-	private void cleanUpPalettePages() {

-		for (Iterator<PalettePageWrapper> iter = palettePages.iterator(); iter.hasNext();) {

-			if (iter.next().isDisposed()) {

-				iter.remove();

-			}

-		}

-	}

-

-	/**

-	 * Configures my diagram edit domain with its command stack.

-	 * This method has been completely overridden in order to use a proxy stack.

-	 */

-	@Override

-	protected void configureDiagramEditDomain() {

-

-		DefaultEditDomain editDomain = getEditDomain();

-

-		if (editDomain != null) {

-			CommandStack stack = editDomain.getCommandStack();

-			if (stack != null) {

-				// dispose the old stack

-				stack.dispose();

-			}

-

-			// create and assign the new stack

-			CheckedDiagramCommandStack diagramStack = new CheckedDiagramCommandStack(getDiagramEditDomain());

-

-			editDomain.setCommandStack(diagramStack);

-		}

-

-		DiagramEditDomain diagEditDomain = (DiagramEditDomain) getDiagramEditDomain();

-		diagEditDomain.setActionManager(createActionManager());

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void setFocus() {

-		super.setFocus();

-		updateToggleActionState();

-	}

-

-

-	/**

-	 * this command update the status of the toggle actions

-	 */

-	protected void updateToggleActionState() {

-		final ICommandService commandService = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getService(ICommandService.class);

-		if (commandService != null) {

-			final IPreferenceStore wsPreferenceStore = ((DiagramGraphicalViewer) getDiagramGraphicalViewer()).getWorkspaceViewerPreferenceStore();

-			org.eclipse.core.commands.Command command = commandService.getCommand(CommandIds.VIEW_GRID_COMMAND);

-			EclipseCommandUtils.updateToggleCommandState(command, wsPreferenceStore.getBoolean(WorkspaceViewerProperties.VIEWGRID));

-

-			command = commandService.getCommand(CommandIds.VIEW_RULER_COMMAND);

-			EclipseCommandUtils.updateToggleCommandState(command, wsPreferenceStore.getBoolean(WorkspaceViewerProperties.VIEWRULERS));

-

-			command = commandService.getCommand(CommandIds.VIEW_PAGE_BREAK_COMMAND);

-			EclipseCommandUtils.updateToggleCommandState(command, wsPreferenceStore.getBoolean(WorkspaceViewerProperties.VIEWPAGEBREAKS));

-

-			command = commandService.getCommand(CommandIds.SNAP_TO_GRID_COMMAND);

-			EclipseCommandUtils.updateToggleCommandState(command, wsPreferenceStore.getBoolean(WorkspaceViewerProperties.SNAPTOGRID));

-

-		} else {

-			throw new RuntimeException(String.format("The Eclipse service %s has not been found", ICommandService.class)); //$NON-NLS-1$

-		}

-	}

-

-

-	@Override

-	protected void addDefaultPreferences() {

-		super.addDefaultPreferences();

-		final PreferencesHint preferencesHint = getPreferencesHint();

-		final IPreferenceStore globalPreferenceStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-		final String diagramType = getDiagram().getType();

-		// get the preferences

-		final boolean viewGrid = globalPreferenceStore.getBoolean(PreferencesConstantsHelper.getDiagramConstant(diagramType, PreferencesConstantsHelper.VIEW_GRID));

-		final boolean viewRuler = globalPreferenceStore.getBoolean(PreferencesConstantsHelper.getDiagramConstant(diagramType, PreferencesConstantsHelper.VIEW_RULER));

-		final int rulerUnit = globalPreferenceStore.getInt(PreferencesConstantsHelper.getDiagramConstant(diagramType, PreferencesConstantsHelper.RULER_UNITS));

-		final boolean snapToGrid = globalPreferenceStore.getBoolean(PreferencesConstantsHelper.getDiagramConstant(diagramType, PreferencesConstantsHelper.SNAP_TO_GRID));

-		final boolean snapToGeometry = globalPreferenceStore.getBoolean(PreferencesConstantsHelper.getDiagramConstant(diagramType, PreferencesConstantsHelper.SNAP_TO_GEOMETRY));

-		final RGB rgb = PreferenceConverter.getColor(globalPreferenceStore, PreferencesConstantsHelper.getDiagramConstant(diagramType, PreferencesConstantsHelper.GRID_LINE_COLOR));

-		final int gridLineColor = FigureUtilities.RGBToInteger(rgb);

-		final double gridSpacing = globalPreferenceStore.getDouble(PreferencesConstantsHelper.getDiagramConstant(diagramType, PreferencesConstantsHelper.GRID_SPACING));

-		final boolean gridOrder = globalPreferenceStore.getBoolean(PreferencesConstantsHelper.getDiagramConstant(diagramType, PreferencesConstantsHelper.GRID_ORDER));

-		final int gridLineStyle = globalPreferenceStore.getInt(PreferencesConstantsHelper.getDiagramConstant(diagramType, PreferencesConstantsHelper.GRID_LINE_STYLE));

-

-		// set the preferences

-		final IPreferenceStore localStore = getWorkspaceViewerPreferenceStore();

-		localStore.setValue(PreferencesConstantsHelper.VIEW_GRID_CONSTANT, viewGrid);

-		localStore.setValue(PreferencesConstantsHelper.VIEW_RULERS_CONSTANT, viewRuler);

-		localStore.setValue(PreferencesConstantsHelper.RULER_UNITS_CONSTANT, rulerUnit);

-		localStore.setValue(PreferencesConstantsHelper.SNAP_TO_GRID_CONSTANT, snapToGrid);

-		localStore.setValue(PreferencesConstantsHelper.SNAP_TO_GEOMETRY_CONSTANT, snapToGeometry);

-		localStore.setValue(PreferencesConstantsHelper.GRID_LINE_COLOR_CONSTANT, gridLineColor);

-		localStore.setValue(PreferencesConstantsHelper.GRID_SPACING_CONSTANT, gridSpacing);

-

-		// to force refresh

-		localStore.setValue(PreferencesConstantsHelper.GRID_ORDER_CONSTANT, !gridOrder);

-		localStore.setValue(PreferencesConstantsHelper.GRID_ORDER_CONSTANT, gridOrder);

-

-		localStore.setValue(PreferencesConstantsHelper.GRID_LINE_STYLE_CONSTANT, gridLineStyle);

-

-	}

-

-	@Override

-	protected void initializeGraphicalViewer() {

-		super.initializeGraphicalViewer();

-

-		// Engage synchronization (if required)

-		EditPart diagram = getDiagramEditPart();

-		if (diagram != null) {

-			try {

-				ISyncService syncService = ServiceUtilsForEditPart.getInstance().getService(ISyncService.class, diagram);

-				syncService.evaluateTriggers(diagram.getViewer());

-			} catch (ServiceException e) {

-				Activator.log.error(e);

-			}

-		}

-	}

-

-	

-

-	protected class PalettePageWrapper implements PalettePage, IAdaptable {

-

-		private final CustomPalettePage delegate;

-

-		private boolean disposed;

-

-		protected PalettePageWrapper(CustomPalettePage delegate) {

-			this.delegate = delegate;

-		}

-

-		@Override

-		public void createControl(Composite parent) {

-			Control existing = getControl();

-			if ((existing != null) && !existing.isDisposed()) {

-				// Attempting to creating the page controls again? Bail

-				return;

-			}

-

-			delegate.createControl(parent);

-

-			delegate.getControl().addDisposeListener(new DisposeListener() {

-

-				@Override

-				public void widgetDisposed(DisposeEvent e) {

-					disposed = true;

-

-					SynchronizableGmfDiagramEditor.this.palettePages.remove(PalettePageWrapper.this);

-				}

-			});

-

-			if (palettePageState != null) {

-				// We're re-creating the palette page after having closed it, either for editor re-load

-				// or the PapyrusPaletteSynchronizer forcing a palette refresh. Reinitialize from the

-				// last saved state

-				PaletteViewerReloadContextProvider.getInstance(getPaletteViewer()).restore(palettePageState);

-				palettePageState = null;

-			}

-		}

-

-		@Override

-		public void dispose() {

-			// Save current state for potential re-opening later

-			saveState();

-			delegate.dispose();

-		}

-

-		public boolean isDisposed() {

-			return disposed;

-		}

-

-		void saveState() {

-			PaletteViewer palette = getPaletteViewer();

-			if (palette != null) {

-				palettePageState = PaletteViewerReloadContextProvider.getInstance(palette).createReloadContext();

-			}

-		}

-

-		@Override

-		public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {

-			if (adapter == IReloadContextProvider.class) {

-				return new IReloadContextProvider() {

-

-					@Override

-					public Object createReloadContext() {

-						return (getPaletteViewer() != null) ? PaletteViewerReloadContextProvider.getInstance(getPaletteViewer()).createReloadContext() : null;

-					}

-

-					@Override

-					public void restore(Object reloadContext) {

-						if (getPaletteViewer() != null) {

-							PaletteViewerReloadContextProvider.getInstance(getPaletteViewer()).restore(reloadContext);

-						} else {

-							// We'll defer this until the page control is created

-							palettePageState = reloadContext;

-						}

-					}

-				};

-			}

-			return delegate.getAdapter(adapter);

-		}

-

-		@Override

-		public Control getControl() {

-			// CustomPalettePage will NPE if asked for the control before the PaletteViewer is created

-			return (delegate.getPaletteViewer() == null) ? null : delegate.getControl();

-		}

-

-		@Override

-		public void setFocus() {

-			delegate.setFocus();

-		}

-

-		@Override

-		public void setActionBars(IActionBars actionBars) {

-			delegate.setActionBars(actionBars);

-		}

-

-		@Override

-		public void init(IPageSite pageSite) {

-			delegate.init(pageSite);

-		}

-

-		@Override

-		public IPageSite getSite() {

-			return delegate.getSite();

-		}

-

-		public PaletteViewer getPaletteViewer() {

-			return delegate.getPaletteViewer();

-		}

-

-	}

-

-	/**

-	 * A wrapper for the GMF-provided outline page that lets us clean up references to the model content leaked via the Outline View tool bar.

-	 */

-	private class OutlinePageWrapper implements IPageBookViewPage, IContentOutlinePage {

-		private final ContentOutlinePage delegate;

-

-		OutlinePageWrapper(ContentOutlinePage delegate) {

-			this.delegate = delegate;

-		}

-

-		@Override

-		public void createControl(Composite parent) {

-			delegate.createControl(parent);

-		}

-

-		@Override

-		public void dispose() {

-			try {

-				// Remove the toolbar items that reference me and, through me, the diagram and its associated semantic model

-				IActionBars bars = getSite().getActionBars();

-				bars.getToolBarManager().removeAll();

-				bars.updateActionBars();

-			} finally {

-				delegate.dispose();

-			}

-		}

-

-		@Override

-		public Control getControl() {

-			return delegate.getControl();

-		}

-

-		@Override

-		public void setActionBars(IActionBars actionBars) {

-			delegate.setActionBars(actionBars);

-		}

-

-		@Override

-		public void setFocus() {

-			delegate.setFocus();

-		}

-

-		@Override

-		public void init(IPageSite site) throws PartInitException {

-			delegate.init(site);

-		}

-

-		@Override

-		public IPageSite getSite() {

-			return delegate.getSite();

-		}

-

-		@Override

-		public void addSelectionChangedListener(ISelectionChangedListener listener) {

-			delegate.addSelectionChangedListener(listener);

-		}

-

-		@Override

-		public ISelection getSelection() {

-			return delegate.getSelection();

-		}

-

-		@Override

-		public void removeSelectionChangedListener(ISelectionChangedListener listener) {

-			delegate.removeSelectionChangedListener(listener);

-		}

-

-		@Override

-		public void setSelection(ISelection selection) {

-			delegate.setSelection(selection);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 437217
+ *  Christian W. Damus - bug 451683
+ *  Christian W. Damus - bug 465416
+ *  Simon Delisle - Move ReconcilerHelper to a separate class
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.gef.DefaultEditDomain;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.GraphicalViewer;
+import org.eclipse.gef.commands.CommandStack;
+import org.eclipse.gef.ui.palette.PaletteViewer;
+import org.eclipse.gef.ui.parts.ContentOutlinePage;
+import org.eclipse.gef.ui.views.palette.PalettePage;
+import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.internal.properties.WorkspaceViewerProperties;
+import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditDomain;
+import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramGraphicalViewer;
+import org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.DiagramDocumentEditor;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.papyrus.commands.CheckedDiagramCommandStack;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.ReconcileHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramVersioningUtils;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.CommandIds;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart;
+import org.eclipse.papyrus.infra.sync.service.ISyncService;
+import org.eclipse.papyrus.infra.ui.editor.reload.IReloadContextProvider;
+import org.eclipse.papyrus.infra.ui.util.EclipseCommandUtils;
+import org.eclipse.papyrus.infra.widgets.util.IRevealSemanticElement;
+import org.eclipse.papyrus.infra.widgets.util.NavigationTarget;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.commands.ICommandService;
+import org.eclipse.ui.part.IPageBookViewPage;
+import org.eclipse.ui.part.IPageSite;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+
+/**
+ *
+ * This GMF editor contains a methods in order to reveal visual element from a list of semantic element.
+ * <p/>
+ * It also provides subclasses with common capability to automatically migrate (reconcile) input diagrams between papurus versions.
+ */
+
+@SuppressWarnings("restriction")
+// suppress the warning for WorkspaceViewerProperties
+public class SynchronizableGmfDiagramEditor extends DiagramDocumentEditor implements IRevealSemanticElement, NavigationTarget {
+
+	private Collection<PalettePageWrapper> palettePages;
+
+	private Object palettePageState;
+
+	public SynchronizableGmfDiagramEditor(boolean hasFlyoutPalette) {
+		super(hasFlyoutPalette);
+	}
+
+	/**
+	 * reveal all editpart that represent an element in the given list.
+	 *
+	 * @see org.eclipse.papyrus.infra.core.ui.IRevealSemanticElement#revealSemanticElement(java.util.List)
+	 *
+	 */
+	@Override
+	public void revealSemanticElement(List<?> elementList) {
+		revealElement(elementList);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean revealElement(Object element) {
+		return revealElement(Collections.singleton(element));
+	}
+
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * reveal all editpart that represent an element in the given list.
+	 *
+	 * @see org.eclipse.papyrus.infra.core.ui.IRevealSemanticElement#revealSemanticElement(java.util.List)
+	 *
+	 */
+	@Override
+	public boolean revealElement(Collection<?> elementList) {
+		// create an instance that can get semantic element from gmf
+		SemanticFromGMFElement semanticFromGMFElement = new SemanticFromGMFElement();
+
+		// get the graphical viewer
+		GraphicalViewer graphicalViewer = getGraphicalViewer();
+		if (graphicalViewer != null) {
+
+			// look amidst all edit part if the semantic is contained in the list
+			Iterator<?> iter = graphicalViewer.getEditPartRegistry().values().iterator();
+			IGraphicalEditPart researchedEditPart = null;
+			List<?> clonedList = new ArrayList<>(elementList);
+			List<IGraphicalEditPart> partSelection = new ArrayList<>();
+
+			while (iter.hasNext() && !clonedList.isEmpty()) {
+				Object currentEditPart = iter.next();
+				// look only amidst IPrimary editpart to avoid compartment and labels of links
+				if (currentEditPart instanceof IPrimaryEditPart) {
+					Object currentElement = semanticFromGMFElement.getSemanticElement(currentEditPart);
+					if (clonedList.contains(currentElement)) {
+						clonedList.remove(currentElement);
+						researchedEditPart = ((IGraphicalEditPart) currentEditPart);
+						partSelection.add(researchedEditPart);
+
+					}
+				}
+			}
+
+			// We may also search for a GMF View (Instead of a semantic model Element)
+			if (!clonedList.isEmpty()) {
+				for (Iterator<?> iterator = clonedList.iterator(); iterator.hasNext();) {
+					Object element = iterator.next();
+					if (graphicalViewer.getEditPartRegistry().containsKey(element) && !clonedList.isEmpty()) {
+						iterator.remove();
+						researchedEditPart = (IGraphicalEditPart) graphicalViewer.getEditPartRegistry().get(element);
+						partSelection.add(researchedEditPart);
+					}
+				}
+			}
+
+			// the second test, as the model element is not a PrimaryEditPart, is to allow the selection even if the user selected it with other elements
+			// and reset the selection if only the model is selected
+			if (clonedList.isEmpty() || (clonedList.size() == 1 && clonedList.get(0) == getDiagram().getElement())) {
+				// all parts have been found
+				IStructuredSelection sSelection = new StructuredSelection(partSelection);
+				// this is used instead of graphicalViewer.select(IGraphicalEditPart) as the later only allows the selection of a single element
+				graphicalViewer.setSelection(sSelection);
+				if (!partSelection.isEmpty()) {
+					graphicalViewer.reveal(partSelection.get(0));
+				}
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Object getAdapter(@SuppressWarnings("rawtypes") Class type) {
+		if (type == DiagramEditPart.class) {
+			return getDiagramEditPart();
+		}
+		if (type == Diagram.class) {
+			return getDiagram();
+		}
+		if (type == IReloadContextProvider.class) {
+			return new DiagramReloadContextProvider(this);
+		}
+		if (type == PalettePage.class) {
+			if (palettePages == null) {
+				palettePages = Lists.newArrayListWithExpectedSize(1);
+			} else {
+				cleanUpPalettePages();
+				if (!palettePages.isEmpty()) {
+					// Make the new page look just like the last one (for continuity of the UI when the
+					// PapyrusPaletteSynchronizer causes a new page to be created)
+					Iterables.getLast(palettePages, null).saveState();
+				}
+			}
+			PalettePageWrapper result = new PalettePageWrapper((CustomPalettePage) super.getAdapter(type));
+			palettePages.add(result);
+			return result;
+		}
+		if (type == IContentOutlinePage.class) {
+			Object result = super.getAdapter(type);
+			if (result instanceof ContentOutlinePage) {
+				result = new OutlinePageWrapper((ContentOutlinePage) result);
+			}
+			return result;
+		}
+		return super.getAdapter(type);
+	}
+
+	Collection<? extends PalettePage> getPalettePages() {
+		if (palettePages == null) {
+			return Collections.emptyList();
+		} else {
+			cleanUpPalettePages();
+			return Collections.unmodifiableCollection(palettePages);
+		}
+	}
+
+	void setDeferredPalettePageReloadContext(Object reloadContext) {
+		palettePageState = reloadContext;
+	}
+
+	private void cleanUpPalettePages() {
+		for (Iterator<PalettePageWrapper> iter = palettePages.iterator(); iter.hasNext();) {
+			if (iter.next().isDisposed()) {
+				iter.remove();
+			}
+		}
+	}
+
+	/**
+	 * Configures my diagram edit domain with its command stack.
+	 * This method has been completely overridden in order to use a proxy stack.
+	 */
+	@Override
+	protected void configureDiagramEditDomain() {
+
+		DefaultEditDomain editDomain = getEditDomain();
+
+		if (editDomain != null) {
+			CommandStack stack = editDomain.getCommandStack();
+			if (stack != null) {
+				// dispose the old stack
+				stack.dispose();
+			}
+
+			// create and assign the new stack
+			CheckedDiagramCommandStack diagramStack = new CheckedDiagramCommandStack(getDiagramEditDomain());
+
+			editDomain.setCommandStack(diagramStack);
+		}
+
+		DiagramEditDomain diagEditDomain = (DiagramEditDomain) getDiagramEditDomain();
+		diagEditDomain.setActionManager(createActionManager());
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void setFocus() {
+		super.setFocus();
+		updateToggleActionState();
+	}
+
+
+	/**
+	 * this command update the status of the toggle actions
+	 */
+	protected void updateToggleActionState() {
+		final ICommandService commandService = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getService(ICommandService.class);
+		if (commandService != null) {
+			final IPreferenceStore wsPreferenceStore = ((DiagramGraphicalViewer) getDiagramGraphicalViewer()).getWorkspaceViewerPreferenceStore();
+			org.eclipse.core.commands.Command command = commandService.getCommand(CommandIds.VIEW_GRID_COMMAND);
+			EclipseCommandUtils.updateToggleCommandState(command, wsPreferenceStore.getBoolean(WorkspaceViewerProperties.VIEWGRID));
+
+			command = commandService.getCommand(CommandIds.VIEW_RULER_COMMAND);
+			EclipseCommandUtils.updateToggleCommandState(command, wsPreferenceStore.getBoolean(WorkspaceViewerProperties.VIEWRULERS));
+
+			command = commandService.getCommand(CommandIds.VIEW_PAGE_BREAK_COMMAND);
+			EclipseCommandUtils.updateToggleCommandState(command, wsPreferenceStore.getBoolean(WorkspaceViewerProperties.VIEWPAGEBREAKS));
+
+			command = commandService.getCommand(CommandIds.SNAP_TO_GRID_COMMAND);
+			EclipseCommandUtils.updateToggleCommandState(command, wsPreferenceStore.getBoolean(WorkspaceViewerProperties.SNAPTOGRID));
+
+		} else {
+			throw new RuntimeException(String.format("The Eclipse service %s has not been found", ICommandService.class)); //$NON-NLS-1$
+		}
+	}
+
+
+	@Override
+	protected void addDefaultPreferences() {
+		super.addDefaultPreferences();
+		final PreferencesHint preferencesHint = getPreferencesHint();
+		final IPreferenceStore globalPreferenceStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
+		final String diagramType = getDiagram().getType();
+		// get the preferences
+		final boolean viewGrid = globalPreferenceStore.getBoolean(PreferencesConstantsHelper.getDiagramConstant(diagramType, PreferencesConstantsHelper.VIEW_GRID));
+		final boolean viewRuler = globalPreferenceStore.getBoolean(PreferencesConstantsHelper.getDiagramConstant(diagramType, PreferencesConstantsHelper.VIEW_RULER));
+		final int rulerUnit = globalPreferenceStore.getInt(PreferencesConstantsHelper.getDiagramConstant(diagramType, PreferencesConstantsHelper.RULER_UNITS));
+		final boolean snapToGrid = globalPreferenceStore.getBoolean(PreferencesConstantsHelper.getDiagramConstant(diagramType, PreferencesConstantsHelper.SNAP_TO_GRID));
+		final boolean snapToGeometry = globalPreferenceStore.getBoolean(PreferencesConstantsHelper.getDiagramConstant(diagramType, PreferencesConstantsHelper.SNAP_TO_GEOMETRY));
+		final RGB rgb = PreferenceConverter.getColor(globalPreferenceStore, PreferencesConstantsHelper.getDiagramConstant(diagramType, PreferencesConstantsHelper.GRID_LINE_COLOR));
+		final int gridLineColor = FigureUtilities.RGBToInteger(rgb);
+		final double gridSpacing = globalPreferenceStore.getDouble(PreferencesConstantsHelper.getDiagramConstant(diagramType, PreferencesConstantsHelper.GRID_SPACING));
+		final boolean gridOrder = globalPreferenceStore.getBoolean(PreferencesConstantsHelper.getDiagramConstant(diagramType, PreferencesConstantsHelper.GRID_ORDER));
+		final int gridLineStyle = globalPreferenceStore.getInt(PreferencesConstantsHelper.getDiagramConstant(diagramType, PreferencesConstantsHelper.GRID_LINE_STYLE));
+
+		// set the preferences
+		final IPreferenceStore localStore = getWorkspaceViewerPreferenceStore();
+		localStore.setValue(PreferencesConstantsHelper.VIEW_GRID_CONSTANT, viewGrid);
+		localStore.setValue(PreferencesConstantsHelper.VIEW_RULERS_CONSTANT, viewRuler);
+		localStore.setValue(PreferencesConstantsHelper.RULER_UNITS_CONSTANT, rulerUnit);
+		localStore.setValue(PreferencesConstantsHelper.SNAP_TO_GRID_CONSTANT, snapToGrid);
+		localStore.setValue(PreferencesConstantsHelper.SNAP_TO_GEOMETRY_CONSTANT, snapToGeometry);
+		localStore.setValue(PreferencesConstantsHelper.GRID_LINE_COLOR_CONSTANT, gridLineColor);
+		localStore.setValue(PreferencesConstantsHelper.GRID_SPACING_CONSTANT, gridSpacing);
+
+		// to force refresh
+		localStore.setValue(PreferencesConstantsHelper.GRID_ORDER_CONSTANT, !gridOrder);
+		localStore.setValue(PreferencesConstantsHelper.GRID_ORDER_CONSTANT, gridOrder);
+
+		localStore.setValue(PreferencesConstantsHelper.GRID_LINE_STYLE_CONSTANT, gridLineStyle);
+
+	}
+
+	@Override
+	protected void initializeGraphicalViewer() {
+		super.initializeGraphicalViewer();
+
+		// Engage synchronization (if required)
+		EditPart diagram = getDiagramEditPart();
+		if (diagram != null) {
+			try {
+				ISyncService syncService = ServiceUtilsForEditPart.getInstance().getService(ISyncService.class, diagram);
+				syncService.evaluateTriggers(diagram.getViewer());
+			} catch (ServiceException e) {
+				Activator.log.error(e);
+			}
+		}
+	}
+
+	@Override
+	public void doSetInput(IEditorInput input, boolean releaseEditorContents) throws CoreException {
+		super.doSetInput(input, releaseEditorContents);
+		if (getDiagram() != null && !DiagramVersioningUtils.isOfCurrentPapyrusVersion(getDiagram())) {
+			new ReconcileHelper(getEditingDomain()).reconcileDiagram(getDiagram());
+		}
+	}
+	
+	protected class PalettePageWrapper implements PalettePage, IAdaptable {
+
+		private final CustomPalettePage delegate;
+
+		private boolean disposed;
+
+		protected PalettePageWrapper(CustomPalettePage delegate) {
+			this.delegate = delegate;
+		}
+
+		@Override
+		public void createControl(Composite parent) {
+			Control existing = getControl();
+			if ((existing != null) && !existing.isDisposed()) {
+				// Attempting to creating the page controls again? Bail
+				return;
+			}
+
+			delegate.createControl(parent);
+
+			delegate.getControl().addDisposeListener(new DisposeListener() {
+
+				@Override
+				public void widgetDisposed(DisposeEvent e) {
+					disposed = true;
+
+					SynchronizableGmfDiagramEditor.this.palettePages.remove(PalettePageWrapper.this);
+				}
+			});
+
+			if (palettePageState != null) {
+				// We're re-creating the palette page after having closed it, either for editor re-load
+				// or the PapyrusPaletteSynchronizer forcing a palette refresh. Reinitialize from the
+				// last saved state
+				PaletteViewerReloadContextProvider.getInstance(getPaletteViewer()).restore(palettePageState);
+				palettePageState = null;
+			}
+		}
+
+		@Override
+		public void dispose() {
+			// Save current state for potential re-opening later
+			saveState();
+			delegate.dispose();
+		}
+
+		public boolean isDisposed() {
+			return disposed;
+		}
+
+		void saveState() {
+			PaletteViewer palette = getPaletteViewer();
+			if (palette != null) {
+				palettePageState = PaletteViewerReloadContextProvider.getInstance(palette).createReloadContext();
+			}
+		}
+
+		@Override
+		public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
+			if (adapter == IReloadContextProvider.class) {
+				return new IReloadContextProvider() {
+
+					@Override
+					public Object createReloadContext() {
+						return (getPaletteViewer() != null) ? PaletteViewerReloadContextProvider.getInstance(getPaletteViewer()).createReloadContext() : null;
+					}
+
+					@Override
+					public void restore(Object reloadContext) {
+						if (getPaletteViewer() != null) {
+							PaletteViewerReloadContextProvider.getInstance(getPaletteViewer()).restore(reloadContext);
+						} else {
+							// We'll defer this until the page control is created
+							palettePageState = reloadContext;
+						}
+					}
+				};
+			}
+			return delegate.getAdapter(adapter);
+		}
+
+		@Override
+		public Control getControl() {
+			// CustomPalettePage will NPE if asked for the control before the PaletteViewer is created
+			return (delegate.getPaletteViewer() == null) ? null : delegate.getControl();
+		}
+
+		@Override
+		public void setFocus() {
+			delegate.setFocus();
+		}
+
+		@Override
+		public void setActionBars(IActionBars actionBars) {
+			delegate.setActionBars(actionBars);
+		}
+
+		@Override
+		public void init(IPageSite pageSite) {
+			delegate.init(pageSite);
+		}
+
+		@Override
+		public IPageSite getSite() {
+			return delegate.getSite();
+		}
+
+		public PaletteViewer getPaletteViewer() {
+			return delegate.getPaletteViewer();
+		}
+
+	}
+
+	/**
+	 * A wrapper for the GMF-provided outline page that lets us clean up references to the model content leaked via the Outline View tool bar.
+	 */
+	private class OutlinePageWrapper implements IPageBookViewPage, IContentOutlinePage {
+		private final ContentOutlinePage delegate;
+
+		OutlinePageWrapper(ContentOutlinePage delegate) {
+			this.delegate = delegate;
+		}
+
+		@Override
+		public void createControl(Composite parent) {
+			delegate.createControl(parent);
+		}
+
+		@Override
+		public void dispose() {
+			try {
+				// Remove the toolbar items that reference me and, through me, the diagram and its associated semantic model
+				IActionBars bars = getSite().getActionBars();
+				bars.getToolBarManager().removeAll();
+				bars.updateActionBars();
+			} finally {
+				delegate.dispose();
+			}
+		}
+
+		@Override
+		public Control getControl() {
+			return delegate.getControl();
+		}
+
+		@Override
+		public void setActionBars(IActionBars actionBars) {
+			delegate.setActionBars(actionBars);
+		}
+
+		@Override
+		public void setFocus() {
+			delegate.setFocus();
+		}
+
+		@Override
+		public void init(IPageSite site) throws PartInitException {
+			delegate.init(site);
+		}
+
+		@Override
+		public IPageSite getSite() {
+			return delegate.getSite();
+		}
+
+		@Override
+		public void addSelectionChangedListener(ISelectionChangedListener listener) {
+			delegate.addSelectionChangedListener(listener);
+		}
+
+		@Override
+		public ISelection getSelection() {
+			return delegate.getSelection();
+		}
+
+		@Override
+		public void removeSelectionChangedListener(ISelectionChangedListener listener) {
+			delegate.removeSelectionChangedListener(listener);
+		}
+
+		@Override
+		public void setSelection(ISelection selection) {
+			delegate.setSelection(selection);
+		}
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/DefaultSemanticEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/DefaultSemanticEditPolicy.java
index 8140da0a824..c57f50e87ca 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/DefaultSemanticEditPolicy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/DefaultSemanticEditPolicy.java
@@ -1,253 +1,262 @@
-/*****************************************************************************

- * Copyright (c) 2011 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

- *      Vincent Lorenzo - bug 492522

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gef.requests.ReconnectRequest;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.SemanticEditPolicy;

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

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

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

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

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

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

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

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

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

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

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

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

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

-import org.eclipse.gmf.runtime.notation.Connector;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.infra.services.edit.utils.RequestParameterConstants;

-

-/**

- * Non diagram-specific class replacing UMLBaseItemSemanticEditPolicy generated

- * by GMF Tooling.

- */

-public class DefaultSemanticEditPolicy extends SemanticEditPolicy {

-

-	public static final String GRAPHICAL_RECONNECTED_EDGE = "graphical_edge"; //$NON-NLS-1$

-

-	/**

-	 * Extended request data key to hold editpart visual id.

-	 * Add visual id of edited editpart to extended data of the request

-	 * so command switch can decide what kind of diagram element is being edited.

-	 * It is done in those cases when it's not possible to deduce diagram

-	 * element kind from domain element.

-	 *

-	 */

-	@Override

-	@SuppressWarnings("unchecked")

-	public Command getCommand(Request request) {

-		if (request instanceof ReconnectRequest) {

-			Object view = ((ReconnectRequest) request).getConnectionEditPart().getModel();

-			if (view instanceof View) {

-				request.getExtendedData().put(GRAPHICAL_RECONNECTED_EDGE, view);

-			}

-		}

-		return super.getCommand(request);

-	}

-

-	@Override

-	protected Command getSemanticCommand(IEditCommandRequest request) {

-		IEditCommandRequest completedRequest = completeRequest(request);

-		Command semanticCommand = getSemanticCommandSwitch(completedRequest);

-		if (completedRequest instanceof DestroyRequest) {

-			DestroyRequest destroyRequest = (DestroyRequest) completedRequest;

-			return shouldProceed(destroyRequest) ? semanticCommand : null;

-		}

-		return semanticCommand;

-	}

-

-	/**

-	 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.SemanticEditPolicy#completeRequest(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)

-	 *

-	 * @param request

-	 * @return

-	 */

-	@Override

-	protected IEditCommandRequest completeRequest(IEditCommandRequest request) {

-		IEditCommandRequest result = super.completeRequest(request);

-		if (result instanceof DestroyReferenceRequest) {

-			if (null == ((IGraphicalEditPart) getHost()).resolveSemanticElement()) {

-				if (getHost() instanceof ConnectionEditPart) {

-					ConnectionEditPart ep = (ConnectionEditPart) getHost();

-					if (ep.isSemanticConnection()) {

-						Object model = ep.getModel();

-						if (model instanceof Connector) {

-							String type = ((Connector) model).getType();

-							if (type != null) {

-								result.setParameter(RequestParameterConstants.VIEW_VISUAL_ID, type);

-							}

-						}

-					}

-				}

-			}

-		}

-		return result;

-	}

-

-	protected Command getSemanticCommandSwitch(IEditCommandRequest req) {

-		if (req instanceof CreateRelationshipRequest) {

-			return getCreateRelationshipCommand((CreateRelationshipRequest) req);

-		} else if (req instanceof CreateElementRequest) {

-			return getCreateCommand((CreateElementRequest) req);

-		} else if (req instanceof ConfigureRequest) {

-			return getConfigureCommand((ConfigureRequest) req);

-		} else if (req instanceof DestroyElementRequest) {

-			return getDestroyElementCommand((DestroyElementRequest) req);

-		} else if (req instanceof DestroyReferenceRequest) {

-			return getDestroyReferenceCommand((DestroyReferenceRequest) req);

-		} else if (req instanceof DuplicateElementsRequest) {

-			return getDuplicateCommand((DuplicateElementsRequest) req);

-		} else if (req instanceof GetEditContextRequest) {

-			return getEditContextCommand((GetEditContextRequest) req);

-		} else if (req instanceof MoveRequest) {

-			return getMoveCommand((MoveRequest) req);

-		} else if (req instanceof ReorientReferenceRelationshipRequest) {

-			return getReorientReferenceRelationshipCommand((ReorientReferenceRelationshipRequest) req);

-		} else if (req instanceof ReorientRelationshipRequest) {

-			return getReorientRelationshipCommand((ReorientRelationshipRequest) req);

-		} else if (req instanceof SetRequest) {

-			return getSetCommand((SetRequest) req);

-		}

-		return null;

-	}

-

-

-	protected Command getConfigureCommand(ConfigureRequest req) {

-		return null;

-	}

-

-

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		return getDefaultSemanticCommand(req, req.getElementType());

-	}

-

-

-	protected Command getCreateCommand(CreateElementRequest req) {

-		if (req.getElementType().getEClass() == null) {

-			return getDefaultSemanticCommand(req, req.getElementType());

-		} else {

-			return getDefaultSemanticCommand(req);

-		}

-	}

-

-

-	protected Command getSetCommand(SetRequest req) {

-		return null;

-	}

-

-

-	protected Command getEditContextCommand(GetEditContextRequest req) {

-		return null;

-	}

-

-

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		return getDefaultSemanticCommand(req);

-	}

-

-

-	protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) {

-		return getDestroyReferenceCommand(req, req.getContainer());

-	}

-

-	protected Command getDestroyReferenceCommand(DestroyReferenceRequest req, Object context) {

-		return getDefaultSemanticCommand(req, context);

-	}

-

-	protected Command getDuplicateCommand(DuplicateElementsRequest req) {

-		return null;

-	}

-

-

-	protected Command getMoveCommand(MoveRequest req) {

-		return UnexecutableCommand.INSTANCE;

-	}

-

-

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		EObject context = req.getReferenceOwner();

-		return getDefaultSemanticCommand(req, context);

-	}

-

-

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		IElementEditService commandService = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-		if (commandService == null) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		// Add new graphical end in request parameters

-		View newView = (View) getHost().getModel();

-		req.setParameter(RequestParameterConstants.EDGE_REORIENT_REQUEST_END_VIEW, newView);

-

-		ICommand semanticCommand = commandService.getEditCommand(req);

-

-		if ((semanticCommand != null) && (semanticCommand.canExecute())) {

-			return getGEFWrapper(semanticCommand);

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-

-	protected final Command getGEFWrapper(ICommand cmd) {

-		return new ICommandProxy(cmd);

-	}

-

-	/**

-	 * Returns editing domain from the host edit part.

-	 *

-	 */

-	protected TransactionalEditingDomain getEditingDomain() {

-		return ((IGraphicalEditPart) getHost()).getEditingDomain();

-	}

-

-	private Command getDefaultSemanticCommand(IEditCommandRequest req) {

-		return getDefaultSemanticCommand(req, null);

-	}

-

-	private Command getDefaultSemanticCommand(IEditCommandRequest req, Object context) {

-		IElementEditService commandService;

-		if (context != null) {

-			commandService = ElementEditServiceUtils.getCommandProvider(context);

-		} else {

-			commandService = ElementEditServiceUtils.getCommandProvider(((IGraphicalEditPart) getHost()).resolveSemanticElement());

-		}

-

-		if (commandService == null) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		ICommand semanticCommand = commandService.getEditCommand(req);

-

-		if ((semanticCommand != null) && (semanticCommand.canExecute())) {

-			return getGEFWrapper(semanticCommand);

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011 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
+ *      Vincent Lorenzo - bug 492522
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gef.requests.ReconnectRequest;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.SemanticEditPolicy;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.gmf.runtime.notation.Connector;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.gmfdiag.common.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.infra.services.edit.utils.RequestParameterConstants;
+
+/**
+ * Non diagram-specific class replacing UMLBaseItemSemanticEditPolicy generated
+ * by GMF Tooling.
+ */
+public class DefaultSemanticEditPolicy extends SemanticEditPolicy {
+
+	public static final String GRAPHICAL_RECONNECTED_EDGE = "graphical_edge"; //$NON-NLS-1$
+
+	/**
+	 * Extended request data key to hold editpart visual id.
+	 * Add visual id of edited editpart to extended data of the request
+	 * so command switch can decide what kind of diagram element is being edited.
+	 * It is done in those cases when it's not possible to deduce diagram
+	 * element kind from domain element.
+	 *
+	 * @generated
+	 */
+	@Override
+	@SuppressWarnings("unchecked")
+	public Command getCommand(Request request) {
+		if (request instanceof ReconnectRequest) {
+			Object view = ((ReconnectRequest) request).getConnectionEditPart().getModel();
+			if (view instanceof View) {
+				request.getExtendedData().put(GRAPHICAL_RECONNECTED_EDGE, view);
+			}
+		}
+		return super.getCommand(request);
+	}
+
+	@Override
+	protected Command getSemanticCommand(IEditCommandRequest request) {
+		IEditCommandRequest completedRequest = completeRequest(request);
+		Command semanticCommand = getSemanticCommandSwitch(completedRequest);
+		if (completedRequest instanceof DestroyRequest) {
+			DestroyRequest destroyRequest = (DestroyRequest) completedRequest;
+			return shouldProceed(destroyRequest) ? semanticCommand : null;
+		}
+		return semanticCommand;
+	}
+
+	/**
+	 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.SemanticEditPolicy#completeRequest(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)
+	 *
+	 * @param request
+	 * @return
+	 */
+	@Override
+	protected IEditCommandRequest completeRequest(IEditCommandRequest request) {
+		IEditCommandRequest result = super.completeRequest(request);
+		if (result instanceof DestroyReferenceRequest) {
+			if (null == ((IGraphicalEditPart) getHost()).resolveSemanticElement()) {
+				if (getHost() instanceof ConnectionEditPart) {
+					ConnectionEditPart ep = (ConnectionEditPart) getHost();
+					if (ep.isSemanticConnection()) {
+						Object model = ep.getModel();
+						if (model instanceof Connector) {
+							String type = ((Connector) model).getType();
+							if (type != null) {
+								result.setParameter(RequestParameterConstants.VIEW_VISUAL_ID, type);
+							}
+						}
+					}
+				}
+			}
+		}
+		return result;
+	}
+
+	protected Command getSemanticCommandSwitch(IEditCommandRequest req) {
+		if (req instanceof CreateRelationshipRequest) {
+			return getCreateRelationshipCommand((CreateRelationshipRequest) req);
+		} else if (req instanceof CreateElementRequest) {
+			return getCreateCommand((CreateElementRequest) req);
+		} else if (req instanceof ConfigureRequest) {
+			return getConfigureCommand((ConfigureRequest) req);
+		} else if (req instanceof DestroyElementRequest) {
+			return getDestroyElementCommand((DestroyElementRequest) req);
+		} else if (req instanceof DestroyReferenceRequest) {
+			return getDestroyReferenceCommand((DestroyReferenceRequest) req);
+		} else if (req instanceof DuplicateElementsRequest) {
+			return getDuplicateCommand((DuplicateElementsRequest) req);
+		} else if (req instanceof GetEditContextRequest) {
+			return getEditContextCommand((GetEditContextRequest) req);
+		} else if (req instanceof MoveRequest) {
+			return getMoveCommand((MoveRequest) req);
+		} else if (req instanceof ReorientReferenceRelationshipRequest) {
+			return getReorientReferenceRelationshipCommand((ReorientReferenceRelationshipRequest) req);
+		} else if (req instanceof ReorientRelationshipRequest) {
+			return getReorientRelationshipCommand((ReorientRelationshipRequest) req);
+		} else if (req instanceof SetRequest) {
+			return getSetCommand((SetRequest) req);
+		}
+		return null;
+	}
+
+
+	protected Command getConfigureCommand(ConfigureRequest req) {
+		return null;
+	}
+
+
+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {
+		return getDefaultSemanticCommand(req, req.getElementType());
+	}
+
+
+	protected Command getCreateCommand(CreateElementRequest req) {
+		if (req.getElementType().getEClass() == null) {
+			return getDefaultSemanticCommand(req, req.getElementType());
+		} else {
+			return getDefaultSemanticCommand(req);
+		}
+	}
+
+
+	protected Command getSetCommand(SetRequest req) {
+		return null;
+	}
+
+
+	protected Command getEditContextCommand(GetEditContextRequest req) {
+		return null;
+	}
+
+
+	protected Command getDestroyElementCommand(DestroyElementRequest req) {
+		return getDefaultSemanticCommand(req);
+	}
+
+
+	protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) {
+		return getDestroyReferenceCommand(req, req.getContainer());
+	}
+
+	protected Command getDestroyReferenceCommand(DestroyReferenceRequest req, Object context) {
+		return getDefaultSemanticCommand(req, context);
+	}
+
+	protected Command getDuplicateCommand(DuplicateElementsRequest req) {
+		return null;
+	}
+
+
+	protected Command getMoveCommand(MoveRequest req) {
+		return UnexecutableCommand.INSTANCE;
+	}
+
+
+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {
+		EObject context = req.getReferenceOwner();
+		return getDefaultSemanticCommand(req, context);
+	}
+
+
+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {
+		IElementEditService commandService = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
+		if (commandService == null) {
+			return UnexecutableCommand.INSTANCE;
+		}
+
+		// Add new graphical end in request parameters
+		View newView = (View) getHost().getModel();
+		req.setParameter(RequestParameterConstants.EDGE_REORIENT_REQUEST_END_VIEW, newView);
+
+		ICommand semanticCommand = commandService.getEditCommand(req);
+
+		if ((semanticCommand != null) && (semanticCommand.canExecute())) {
+			return getGEFWrapper(semanticCommand);
+		}
+		return UnexecutableCommand.INSTANCE;
+	}
+
+
+	protected final Command getGEFWrapper(ICommand cmd) {
+		return new ICommandProxy(cmd);
+	}
+
+	/**
+	 * Returns editing domain from the host edit part.
+	 *
+	 * @generated
+	 */
+	protected TransactionalEditingDomain getEditingDomain() {
+		return ((IGraphicalEditPart) getHost()).getEditingDomain();
+	}
+
+	private Command getDefaultSemanticCommand(IEditCommandRequest req) {
+		return getDefaultSemanticCommand(req, null);
+	}
+
+	private Command getDefaultSemanticCommand(IEditCommandRequest req, Object context) {
+		try {
+			IClientContext clientContext = TypeContext.getContext(getEditingDomain());
+			
+			IElementEditService commandService;
+			if (context != null) {
+				commandService = ElementEditServiceUtils.getCommandProvider(context, clientContext);
+			} else {
+				commandService = ElementEditServiceUtils.getCommandProvider(((IGraphicalEditPart) getHost()).resolveSemanticElement(), clientContext);
+			}
+	
+			if (commandService != null) {
+				ICommand semanticCommand = commandService.getEditCommand(req);
+				if ((semanticCommand != null) && (semanticCommand.canExecute())) {
+					return getGEFWrapper(semanticCommand);
+				}
+			}
+		} catch (ServiceException e) {
+			Activator.log.error(e);
+		}
+		return UnexecutableCommand.INSTANCE;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/handler/DynamicDiagramsMenuContribution.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/handler/DynamicDiagramsMenuContribution.java
index 3b1ea95de7d..133e63a9eaf 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/handler/DynamicDiagramsMenuContribution.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/handler/DynamicDiagramsMenuContribution.java
@@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.ActionContributionItem;
 import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram;
+import org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram;
 import org.eclipse.papyrus.infra.viewpoints.policy.DynamicContribution;
 import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
 import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
@@ -59,8 +59,8 @@ public class DynamicDiagramsMenuContribution extends DynamicContribution {
 
 		// build a list of all the available prototypes
 		List<ViewPrototype> data = new ArrayList<ViewPrototype>();
-		for (final ViewPrototype proto : PolicyChecker.getCurrent().getPrototypesFor(selection)) {
-			if (!(proto.getConfiguration() instanceof PapyrusDiagram)) {
+		for (final ViewPrototype proto : PolicyChecker.getFor(selection).getPrototypesFor(selection)) {
+			if (!(proto.getRepresentationKind() instanceof PapyrusDiagram)) {
 				continue;
 			}
 			data.add(proto);
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/DiagramPrototype.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/DiagramPrototype.java
index 02a8eb82dde..c72496a6e3c 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/DiagramPrototype.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/DiagramPrototype.java
@@ -1,139 +1,145 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.helper;

-

-import org.eclipse.emf.common.command.AbstractCommand;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.papyrus.commands.Activator;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

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

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;

-import org.eclipse.papyrus.infra.gmfdiag.common.AbstractPapyrusGmfCreateDiagramCommandHandler;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView;

-import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;

-

-/**

- * Represents a prototype of GMF diagram for the viewpoints infrastructure

- *

- * @author Laurent Wouters

- */

-public class DiagramPrototype extends ViewPrototype {

-	protected final String category;

-	protected final AbstractPapyrusGmfCreateDiagramCommandHandler command;

-

-	public DiagramPrototype(PapyrusView configuration, String category, AbstractPapyrusGmfCreateDiagramCommandHandler command) {

-		super(configuration);

-		this.category = category;

-		this.command = command;

-	}

-

-	@Override

-	public boolean instantiateOn(EObject owner) {

-		return instantiateOn(owner, null);

-	}

-

-	@Override

-	public boolean instantiateOn(EObject owner, String name) {

-		ServicesRegistry registry;

-		try {

-			registry = ServiceUtilsForEObject.getInstance().getServiceRegistry(owner);

-		} catch (ServiceException ex) {

-			Activator.log.error(ex);

-			return false;

-		}

-		ModelSet modelSet;

-		try {

-			modelSet = registry.getService(ModelSet.class);

-		} catch (ServiceException ex) {

-			Activator.log.error(ex);

-			return false;

-		}

-		Object result = command.createDiagram(modelSet, owner, owner, this, name);

-		return (result != null);

-	}

-

-	@Override

-	public boolean isOwnerReassignable() {

-		// Users can always move diagrams that are part of their viewpoint

-		return true;

-	}

-

-	@Override

-	public Command getCommandChangeOwner(EObject view, final EObject target) {

-		final Diagram diagram = (Diagram) view;

-		final EObject previous = DiagramUtils.getOwner(diagram);

-		return new AbstractCommand("Change diagram owner") {

-			@Override

-			public void execute() {

-				DiagramUtils.setOwner(diagram, target);

-			}

-

-			@Override

-			public void undo() {

-				DiagramUtils.setOwner(diagram, previous);

-			}

-

-			@Override

-			public void redo() {

-				DiagramUtils.setOwner(diagram, target);

-			}

-

-			@Override

-			protected boolean prepare() {

-				return true;

-			}

-		};

-	}

-

-	@Override

-	public Command getCommandChangeRoot(EObject view, final EObject target) {

-		final Diagram diagram = (Diagram) view;

-		final EObject previous = diagram.getElement();

-		return new AbstractCommand("Change diagram root element") {

-			@Override

-			public void execute() {

-				diagram.setElement(target);

-			}

-

-			@Override

-			public void undo() {

-				diagram.setElement(previous);

-			}

-

-			@Override

-			public void redo() {

-				diagram.setElement(target);

-			}

-

-			@Override

-			protected boolean prepare() {

-				return true;

-			}

-		};

-	}

-

-	@Override

-	public EObject getOwnerOf(EObject view) {

-		return DiagramUtils.getOwner((Diagram) view);

-	}

-

-	@Override

-	public EObject getRootOf(EObject view) {

-		return ((Diagram) view).getElement();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.helper;
+
+import org.eclipse.emf.common.command.AbstractCommand;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.commands.Activator;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.infra.gmfdiag.common.AbstractPapyrusGmfCreateDiagramCommandHandler;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
+import org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram;
+import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
+
+/**
+ * Represents a prototype of GMF diagram for the viewpoints infrastructure
+ *
+ * @author Laurent Wouters
+ */
+public class DiagramPrototype extends ViewPrototype {
+	protected final String category;
+	protected final AbstractPapyrusGmfCreateDiagramCommandHandler command;
+
+	public DiagramPrototype(PapyrusDiagram configuration, String category, AbstractPapyrusGmfCreateDiagramCommandHandler command) {
+		super(configuration);
+		this.category = category;
+		this.command = command;
+	}
+
+	@Override
+	public boolean instantiateOn(EObject owner) {
+		return instantiateOn(owner, null);
+	}
+
+	@Override
+	public boolean instantiateOn(EObject owner, String name) {
+		ServicesRegistry registry;
+		try {
+			registry = ServiceUtilsForEObject.getInstance().getServiceRegistry(owner);
+		} catch (ServiceException ex) {
+			Activator.log.error(ex);
+			return false;
+		}
+		ModelSet modelSet;
+		try {
+			modelSet = registry.getService(ModelSet.class);
+		} catch (ServiceException ex) {
+			Activator.log.error(ex);
+			return false;
+		}
+		Object result = command.createDiagram(modelSet, owner, owner, this, name);
+		return (result != null);
+	}
+
+	@Override
+	public boolean isOwnerReassignable() {
+		// Users can always move diagrams that are part of their viewpoint
+		return true;
+	}
+
+	@Override
+	public Command getCommandChangeOwner(EObject view, final EObject target) {
+		final Diagram diagram = (Diagram) view;
+		final EObject previous = DiagramUtils.getOwner(diagram);
+		return new AbstractCommand("Change diagram owner") {
+			@Override
+			public void execute() {
+				DiagramUtils.setOwner(diagram, target);
+			}
+
+			@Override
+			public void undo() {
+				DiagramUtils.setOwner(diagram, previous);
+			}
+
+			@Override
+			public void redo() {
+				DiagramUtils.setOwner(diagram, target);
+			}
+
+			@Override
+			protected boolean prepare() {
+				return true;
+			}
+		};
+	}
+
+	@Override
+	public Command getCommandChangeRoot(EObject view, final EObject target) {
+		final Diagram diagram = (Diagram) view;
+		final EObject previous = diagram.getElement();
+		return new AbstractCommand("Change diagram root element") {
+			@Override
+			public void execute() {
+				diagram.setElement(target);
+			}
+
+			@Override
+			public void undo() {
+				diagram.setElement(previous);
+			}
+
+			@Override
+			public void redo() {
+				diagram.setElement(target);
+			}
+
+			@Override
+			protected boolean prepare() {
+				return true;
+			}
+		};
+	}
+
+	@Override
+	public EObject getOwnerOf(EObject view) {
+		return DiagramUtils.getOwner((Diagram) view);
+	}
+
+	@Override
+	public EObject getRootOf(EObject view) {
+		return ((Diagram) view).getElement();
+	}
+	
+	@Override
+	public PapyrusDiagram getRepresentationKind() {
+		return (PapyrusDiagram) representationKind;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/GMFDiagramViewTypeHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/GMFDiagramViewTypeHelper.java
index 09901c33f95..da27db3b9b6 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/GMFDiagramViewTypeHelper.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/GMFDiagramViewTypeHelper.java
@@ -1,186 +1,100 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.helper;

-

-import java.util.HashMap;

-import java.util.Map;

-

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

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

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

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

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

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

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.papyrus.infra.gmfdiag.common.AbstractPapyrusGmfCreateDiagramCommandHandler;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;

-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram;

-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView;

-import org.eclipse.papyrus.infra.viewpoints.policy.IViewTypeHelper;

-import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;

-

-/**

- * Represents the dynamic contribution of a policy to menus

- *

- * @author Laurent Wouters

- */

-public class GMFDiagramViewTypeHelper implements IViewTypeHelper {

-	/**

-	 * ID of the extension point for Papyrus diagrams

-	 */

-	private static final String EXTENSION_PAPYRUS_DIAGRAM = "org.eclipse.papyrus.infra.ui.papyrusDiagram";

-

-	private static class NakedViewPrototype extends DiagramPrototype {

-		private final String label;

-		private final String icon;

-

-		public NakedViewPrototype(PapyrusView configuration, String category, AbstractPapyrusGmfCreateDiagramCommandHandler command, String label, String icon) {

-			super(configuration, category, command);

-			this.label = label;

-			this.icon = icon;

-		}

-

-		@Override

-		public String getLabel() {

-			return label;

-		}

-

-		@Override

-		public String getIconURI() {

-			return icon;

-		}

-	}

-

-	private static class Implementation {

-		public final String name;

-		public final String icon;

-		public final String language;

-		public final AbstractPapyrusGmfCreateDiagramCommandHandler command;

-

-		public Implementation(String name, String icon, String language, AbstractPapyrusGmfCreateDiagramCommandHandler command) {

-			this.name = name;

-			this.icon = icon;

-			this.language = language;

-			this.command = command;

-		}

-	}

-

-

-	/**

-	 * The cache of prototypes

-	 */

-	private Map<PapyrusView, DiagramPrototype> cache;

-

-	/**

-	 * The cache of implementations

-	 */

-	private Map<String, Implementation> implementations;

-

-	/**

-	 * @see org.eclipse.papyrus.infra.viewpoints.policy.IViewTypeHelper#isSupported(org.eclipse.emf.ecore.EClass)

-	 */

-	@Override

-	public boolean isSupported(EClass type) {

-		return EcoreUtil.equals(type, ConfigurationPackage.eINSTANCE.getPapyrusDiagram());

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.viewpoints.policy.IViewTypeHelper#isSupported(org.eclipse.emf.ecore.EObject)

-	 */

-	@Override

-	public boolean isSupported(EObject view) {

-		return (view instanceof Diagram);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.viewpoints.policy.IViewTypeHelper#getPrototypeFor(org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView)

-	 */

-	@Override

-	public ViewPrototype getPrototypeFor(PapyrusView configuration) {

-		if (!(configuration instanceof PapyrusDiagram)) {

-			return null;

-		}

-		if (implementations == null) {

-			buildImplementationCache();

-		}

-		if (cache == null) {

-			cache = new HashMap<PapyrusView, DiagramPrototype>();

-		}

-		if (cache.containsKey(configuration)) {

-			return cache.get(configuration);

-		}

-		if (!implementations.containsKey(configuration.getImplementationID())) {

-			return null;

-		}

-		Implementation impl = implementations.get(configuration.getImplementationID());

-		if (ViewPrototype.isNatural(configuration)) {

-			NakedViewPrototype proto = new NakedViewPrototype(configuration, impl.language, impl.command, impl.name, impl.icon);

-			cache.put(configuration, proto);

-			return proto;

-		} else {

-			DiagramPrototype proto = new DiagramPrototype(configuration, impl.language, impl.command);

-			cache.put(configuration, proto);

-			return proto;

-		}

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.viewpoints.policy.IViewTypeHelper#getPrototypeOf(org.eclipse.emf.ecore.EObject)

-	 */

-	@Override

-	public ViewPrototype getPrototypeOf(EObject view) {

-		if (!(view instanceof Diagram)) {

-			return null;

-		}

-		return DiagramUtils.getPrototype((Diagram) view);

-	}

-

-	/**

-	 * Builds the cache of metadata

-	 */

-	private void buildImplementationCache() {

-		implementations = new HashMap<String, Implementation>();

-		IExtensionRegistry registry = Platform.getExtensionRegistry();

-		IExtensionPoint point = registry.getExtensionPoint(EXTENSION_PAPYRUS_DIAGRAM);

-		IExtension[] extensions = point.getExtensions();

-		for (int i = 0; i != extensions.length; i++) {

-			IConfigurationElement[] elements = extensions[i].getConfigurationElements();

-			for (int j = 0; j != elements.length; j++) {

-				if (elements[j].getName().equals("creationCommand")) {

-					try {

-						Object obj = elements[j].createExecutableExtension("creationCommandClass");

-						if (obj instanceof AbstractPapyrusGmfCreateDiagramCommandHandler) {

-							AbstractPapyrusGmfCreateDiagramCommandHandler command = (AbstractPapyrusGmfCreateDiagramCommandHandler) obj;

-							String label = elements[j].getAttribute("label");

-							String icon = elements[j].getAttribute("icon");

-							String language = elements[j].getAttribute("language");

-							String implID = command.getCreatedDiagramType();

-							if (!icon.startsWith("platform:/")) {

-								icon = "platform:/plugin/" + extensions[i].getContributor().getName() + "/" + icon;

-							}

-							if (!implementations.containsKey(implID)) {

-								implementations.put(implID, new Implementation(label, icon, language, command));

-							}

-						}

-					} catch (CoreException e) {

-					}

-				}

-			}

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.helper;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind;
+import org.eclipse.papyrus.infra.gmfdiag.common.AbstractPapyrusGmfCreateDiagramCommandHandler;
+import org.eclipse.papyrus.infra.gmfdiag.common.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
+import org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram;
+import org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage;
+import org.eclipse.papyrus.infra.viewpoints.policy.IViewTypeHelper;
+import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
+
+/**
+ * Represents the dynamic contribution of a policy to menus
+ *
+ * @author Laurent Wouters
+ */
+public class GMFDiagramViewTypeHelper implements IViewTypeHelper {
+
+	/**
+	 * The cache of prototypes
+	 */
+	private Map<PapyrusDiagram, DiagramPrototype> cache;
+
+	/**
+	 * @see org.eclipse.papyrus.infra.viewpoints.policy.IViewTypeHelper#isSupported(org.eclipse.emf.ecore.EClass)
+	 */
+	@Override
+	public boolean isSupported(EClass type) {
+		return EcoreUtil.equals(type, RepresentationPackage.eINSTANCE.getPapyrusDiagram());
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.viewpoints.policy.IViewTypeHelper#isSupported(org.eclipse.emf.ecore.EObject)
+	 */
+	@Override
+	public boolean isSupported(EObject view) {
+		return (view instanceof Diagram);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.viewpoints.policy.IViewTypeHelper#getPrototypeFor(org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusRepresentationKind)
+	 */
+	@Override
+	public ViewPrototype getPrototypeFor(PapyrusRepresentationKind kind) {
+		if (!(kind instanceof PapyrusDiagram)) {
+			return null;
+		}
+		PapyrusDiagram diagramKind = (PapyrusDiagram) kind;
+		if (cache == null) {
+			cache = new HashMap<PapyrusDiagram, DiagramPrototype>();
+		}
+		if (cache.containsKey(diagramKind)) {
+			return cache.get(diagramKind);
+		}
+		String language = diagramKind.getLanguage().getId();
+		AbstractPapyrusGmfCreateDiagramCommandHandler command;
+		try {
+			Class<?> creationCommandClass = diagramKind.getCreationCommandClass();
+			command = (AbstractPapyrusGmfCreateDiagramCommandHandler) creationCommandClass.newInstance();
+		} catch (Exception e) {
+			Activator.log.error(e);
+			return null;
+		}
+		DiagramPrototype proto = new DiagramPrototype(diagramKind, language, command);
+		cache.put(diagramKind, proto);
+		return proto;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.viewpoints.policy.IViewTypeHelper#getPrototypeOf(org.eclipse.emf.ecore.EObject)
+	 */
+	@Override
+	public ViewPrototype getPrototypeOf(EObject view) {
+		if (!isSupported(view)) {
+			return null;
+		}
+		return DiagramUtils.getPrototype((Diagram) view);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/MaskLabelHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/MaskLabelHelper.java
index a4b53b02d0a..00fcbffe959 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/MaskLabelHelper.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/MaskLabelHelper.java
@@ -1,76 +1,76 @@
-/*****************************************************************************

- * Copyright (c) 2014 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.helper;

-

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.Set;

-

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

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.notation.NamedStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomStringStyleObservableList;

-import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;

-

-

-public class MaskLabelHelper {

-

-

-	/**

-	 * Return the current mask values, or null if undefined

-	 *

-	 * @param view

-	 * @return

-	 */

-	public static Collection<String> getMaskValues(View view) {

-		EList<String> maskLabel = NotationUtils.getStringListValue(view, VisualInformationPapyrusConstants.CUSTOM_MASK_LABEL, null);

-		if (maskLabel != null) {

-			CustomStringStyleObservableList values = new CustomStringStyleObservableList(view, EMFHelper.resolveEditingDomain(view), VisualInformationPapyrusConstants.CUSTOM_MASK_LABEL);

-			Set<String> result = new HashSet<String>(values);

-			values.dispose();

-			return result;

-		}

-		return null;

-	}

-

-	public static void setMaskValues(View view, Collection<String> masks) {

-		CustomStringStyleObservableList values = new CustomStringStyleObservableList(view, EMFHelper.resolveEditingDomain(view), VisualInformationPapyrusConstants.CUSTOM_MASK_LABEL);

-		if (!values.isEmpty()) {

-			values.clear();

-		}

-		values.addAll(masks);

-		values.commit(null);

-		values.dispose();

-	}

-

-	public static void unsetMaskValues(final View view) {

-		final NamedStyle style = view.getNamedStyle(NotationPackage.eINSTANCE.getStringListValueStyle(), VisualInformationPapyrusConstants.CUSTOM_MASK_LABEL);

-		if (style == null) {

-			return;

-		}

-

-		TransactionalEditingDomain editingDomain = (TransactionalEditingDomain) EMFHelper.resolveEditingDomain(view);

-		editingDomain.getCommandStack().execute(new RecordingCommand(editingDomain, "Restore default label configuration") {

-

-			@Override

-			protected void doExecute() {

-				view.getStyles().remove(style);

-			}

-		});

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.helper;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.notation.NamedStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomStringStyleObservableList;
+import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
+
+
+public class MaskLabelHelper {
+
+
+	/**
+	 * Return the current mask values, or null if undefined
+	 *
+	 * @param view
+	 * @return
+	 */
+	public static Collection<String> getMaskValues(View view) {
+		EList<String> maskLabel = NotationUtils.getStringListValue(view, VisualInformationPapyrusConstants.CUSTOM_MASK_LABEL, null);
+		if (maskLabel != null) {
+			CustomStringStyleObservableList values = new CustomStringStyleObservableList(view, EMFHelper.resolveEditingDomain(view), VisualInformationPapyrusConstants.CUSTOM_MASK_LABEL);
+			Set<String> result = new HashSet<String>(values);
+			values.dispose();
+			return result;
+		}
+		return null;
+	}
+
+	public static void setMaskValues(View view, Collection<String> masks) {
+		CustomStringStyleObservableList values = new CustomStringStyleObservableList(view, EMFHelper.resolveEditingDomain(view), VisualInformationPapyrusConstants.CUSTOM_MASK_LABEL);
+		if (!values.isEmpty()) {
+			values.clear();
+		}
+		values.addAll(masks);
+		values.commit(null);
+		values.dispose();
+	}
+
+	public static void unsetMaskValues(final View view) {
+		final NamedStyle style = view.getNamedStyle(NotationPackage.eINSTANCE.getStringListValueStyle(), VisualInformationPapyrusConstants.CUSTOM_MASK_LABEL);
+		if (style == null) {
+			return;
+		}
+
+		TransactionalEditingDomain editingDomain = (TransactionalEditingDomain) EMFHelper.resolveEditingDomain(view);
+		editingDomain.getCommandStack().execute(new RecordingCommand(editingDomain, "Restore default label ") {
+
+			@Override
+			protected void doExecute() {
+				view.getStyles().remove(style);
+			}
+		});
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/model/NotationUtils.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/model/NotationUtils.java
index 6d66607296a..4c22e2b8f97 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/model/NotationUtils.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/model/NotationUtils.java
@@ -42,8 +42,8 @@ import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
 import org.eclipse.papyrus.infra.emf.utils.BusinessModelResolver;
 import org.eclipse.papyrus.infra.gmfdiag.common.Activator;
 import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
+import org.eclipse.papyrus.infra.gmfdiag.style.PapyrusDiagramStyle;
 import org.eclipse.papyrus.infra.ui.util.ServiceUtilsForActionHandlers;
-import org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle;
 
 /**
  * Utilities method to manage notation models. Should be moved in a more
@@ -191,8 +191,8 @@ public class NotationUtils {
 			if (DiagramUtils.getOwner(diagram) == owner) {
 				return diagram;
 			}
-		} else if (diagOrViewStyle instanceof PapyrusViewStyle) {
-			PapyrusViewStyle viewStyle = (PapyrusViewStyle) diagOrViewStyle;
+		} else if (diagOrViewStyle instanceof PapyrusDiagramStyle) {
+			PapyrusDiagramStyle viewStyle = (PapyrusDiagramStyle) diagOrViewStyle;
 			if (viewStyle.getOwner() == owner) {
 				if (viewStyle.eContainer() instanceof Diagram) {
 					return (Diagram) viewStyle.eContainer();
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/reconciler/DiagramReconciler_1_3_0.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/reconciler/DiagramReconciler_1_3_0.java
new file mode 100644
index 00000000000..aa264d747a9
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/reconciler/DiagramReconciler_1_3_0.java
@@ -0,0 +1,123 @@
+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	 Maged Elaasar  - Initial API and Implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.reconciler;
+
+import java.util.ArrayList;
+
+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.AbstractCommand;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.Style;
+import org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram;
+import org.eclipse.papyrus.infra.gmfdiag.style.PapyrusDiagramStyle;
+import org.eclipse.papyrus.infra.gmfdiag.style.StyleFactory;
+import org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle;
+
+/**
+ * Diagram reconciler form 1.2.0 to 1.3.0 that replaces the old PapyrusViewStyle
+ * by the new PapyrusDiagramStyle
+ */
+public abstract class DiagramReconciler_1_3_0 extends DiagramReconciler {
+
+	@Override
+	public ICommand getReconcileCommand(Diagram diagram) {
+		PapyrusViewStyle oldStyle = null;
+		for(Object obj : new ArrayList<Style>(diagram.getStyles())) {
+			if (obj instanceof PapyrusViewStyle) {
+				oldStyle = (PapyrusViewStyle) obj;
+			}
+		}
+
+		PapyrusDiagram diagramKind = getDiagramKind(diagram, oldStyle);
+
+		PapyrusDiagramStyle newStyle = null;
+		for(Object obj : new ArrayList<Style>(diagram.getStyles())) {
+			if (obj instanceof PapyrusDiagramStyle) {
+				newStyle = (PapyrusDiagramStyle) obj;
+			}
+		}
+
+		if (newStyle == null && diagramKind != null) {
+			newStyle = StyleFactory.eINSTANCE.createPapyrusDiagramStyle();
+			if (oldStyle != null)
+				newStyle.setOwner(oldStyle.getOwner());
+			else
+				newStyle.setOwner(diagram.getElement());
+			newStyle.setDiagramKind(diagramKind);
+			return new ReplacePapyrusViewStyleCommand(diagram, oldStyle, newStyle);
+		}
+		
+		return null;
+	}
+	
+	/**
+	 *  Gets the new diagram kind that based on the given diagram and its old PapyrusViewStyle
+	 *  
+	 * @param diagram
+	 * @param oldStyle
+	 * @return
+	 */
+	protected abstract PapyrusDiagram getDiagramKind(Diagram diagram, PapyrusViewStyle oldStyle);
+	
+	/**
+	 * A command to replace the old PapyrusViewStyle with the new PapyrusDiagramStyle
+	 */
+	protected class ReplacePapyrusViewStyleCommand extends AbstractCommand {
+
+		private Diagram diagram;
+		private PapyrusViewStyle oldStyle;
+		private PapyrusDiagramStyle newStyle;
+
+		public ReplacePapyrusViewStyleCommand(Diagram diagram, PapyrusViewStyle oldStyle, PapyrusDiagramStyle newStyle) {
+			super("Replace the papyrus view style from 1.2.0 to 1.3.0");
+			this.diagram = diagram;
+			this.oldStyle = oldStyle;
+			this.newStyle = newStyle;
+		}
+
+		@Override
+		protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+			int index = diagram.getStyles().indexOf(oldStyle);
+			if (index > -1) {
+				diagram.getStyles().remove(index);
+				diagram.getStyles().add(index, newStyle);
+			} else
+				diagram.getStyles().add(newStyle);
+			return CommandResult.newOKCommandResult();
+		}
+
+		@Override
+		public boolean canUndo() {
+			return false;
+		}
+
+		@Override
+		public boolean canRedo() {
+			return false;
+		}
+
+		@Override
+		protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+			throw new ExecutionException("Should not be called, canRedo false"); //$NON-NLS-1$
+		}
+
+		@Override
+		protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+			throw new ExecutionException("Should not be called, canUndo false"); //$NON-NLS-1$
+		}
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/reconciler/DiagramVersioningUtils.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/reconciler/DiagramVersioningUtils.java
index 4b29ab0c9bd..86b52d919ad 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/reconciler/DiagramVersioningUtils.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/reconciler/DiagramVersioningUtils.java
@@ -1,200 +1,200 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.reconciler;

-

-import java.util.StringTokenizer;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;

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

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.NotationFactory;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.StringValueStyle;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.Activator;

-

-/**

- * This class provide several convenience methods to tag a diagram with a version number

- * in a notation style, or retrieve this version number.

- */

-public class DiagramVersioningUtils {

-

-	/**

-	 * Returns the "current" diagram version. Diagrams with this version don't require the reconciliation until the Papyrus version updates in such a

-	 * way that some diagram needs reconciliation.

-	 * <p/>

-	 * The current value returned by this method is "1.2.0".

-	 * <p/>

-	 * The value itself, howewer, should NOT be used outside of this package to avoid weird dependency issues. Instead, external code should use {@link DiagramVersioningUtils#stampCurrentVersion(Diagram)} and

-	 * {@link DiagramVersioningUtils#createStampCurrentVersionCommand(Diagram)}.

-	 * <p/>

-	 * This method is intentinally NOT a constant but indeed the method. This method is intentionally private and should NOT be made public.

-	 */

-	private static String CURRENT_DIAGRAM_VERSION() {

-		return "1.2.0"; //$NON-NLS-1$

-	}

-

-	/**

-	 * Directly marks the given diagram as either created with "current" Papyrus version or already reconciled to the "current" Papyrus version.

-	 * <p/>

-	 * It is guaranteed that {@link DiagramVersioningUtils#isOfCurrentPapyrusVersion(Diagram)} returns true immediately after the call to this method.

-	 *

-	 * @param diagram

-	 *            diagram to stamp as "current"

-	 */

-	public static void stampCurrentVersion(Diagram diagram) {

-		setCompatibilityVersion(diagram, CURRENT_DIAGRAM_VERSION());

-	}

-

-	/**

-	 * Returns the command that will mark the given diagram as either created with "current" Papyrus version or already reconciled to the "current"

-	 * Papyrus version.

-	 * <p/>

-	 * It is guaranteed that {@link DiagramVersioningUtils#isOfCurrentPapyrusVersion(Diagram)} will returns true immediately after the execution of the command.

-	 *

-	 * @param diagram

-	 * @return the command that is guaranteed to be not null and executable

-	 */

-	public static ICommand createStampCurrentVersionCommand(Diagram diagram) {

-		StringValueStyle style = findOrCreateCompatibilityStyle(diagram);

-		if (style.eContainer() == null) {

-			style.setStringValue(CURRENT_DIAGRAM_VERSION());

-			return new SetValueCommand(new SetRequest(diagram, NotationPackage.eINSTANCE.getView_Styles(), style));

-		} else {

-			return new SetValueCommand(new SetRequest(style, NotationPackage.eINSTANCE.getStringValueStyle_StringValue(), CURRENT_DIAGRAM_VERSION()));

-		}

-	}

-

-	/**

-	 * The name of the {@link StringValueStyle} that defines actual diagram version.

-	 * <p/>

-	 * The value for this constant is "diagram_compatibility_version", it is intentionally the same as been used for SysML diagrams versioning.

-	 */

-	public static final String COMPATIBILITY_VERSION = "diagram_compatibility_version";//$NON-NLS-1$

-

-	/**

-	 * The version constant for the diagrams that does not have a {@link DiagramVersioningUtils#COMPATIBILITY_VERSION} style.

-	 * It may be assumed that these diagrams had been created before Papyrus 1.0.

-	 */

-	public static final String UNDEFINED_VERSION = "undefined";//$NON-NLS-1$

-

-	private static final String DELIM_VERSION = ".";//$NON-NLS-1$

-

-	/**

-	 * Get the diagram compatibility version.

-	 *

-	 * @param view

-	 *            the diagram

-	 * @return the compatibility version or {@link DiagramVersioningUtils#UNDEFINED_VERSION} if none stored. Never returns <code>null</code>.

-	 */

-	public static String getCompatibilityVersion(View view) {

-		StringValueStyle semanticStyle = (StringValueStyle) view.getNamedStyle(NotationPackage.eINSTANCE.getStringValueStyle(), COMPATIBILITY_VERSION);

-		return semanticStyle == null ? UNDEFINED_VERSION : semanticStyle.getStringValue();

-	}

-

-	/**

-	 * Set the diagram compatibility version.

-	 *

-	 * @param diagram

-	 *            the diagram

-	 * @param version

-	 *            the compatibility version

-	 */

-	@SuppressWarnings("unchecked")

-	public static void setCompatibilityVersion(View view, String version) {

-		StringValueStyle style = findOrCreateCompatibilityStyle(view);

-		style.setStringValue(version);

-		if (style.eContainer() == null) {

-			view.getStyles().add(style);

-		}

-	}

-

-	/**

-	 * Finds the existing style with {@link DiagramVersioningUtils#COMPATIBILITY_VERSION} name or creates a new one if none existing found.

-	 * Does NOT attach the new style to the instance, it is left as a caller responsibility.

-	 *

-	 * @param view

-	 * @return the existing or a new not-attached style with {@link DiagramVersioningUtils#COMPATIBILITY_VERSION} name. Called can determine the case

-	 *         by checking {@link EObject#eContainer()} which is guaranteed to be null in case if new object had been created

-	 */

-	private static StringValueStyle findOrCreateCompatibilityStyle(View view) {

-		StringValueStyle style = (StringValueStyle) view.getNamedStyle(NotationPackage.eINSTANCE.getStringValueStyle(), COMPATIBILITY_VERSION);

-		if (style == null) {

-			style = NotationFactory.eINSTANCE.createStringValueStyle();

-			style.setName(COMPATIBILITY_VERSION);

-		}

-		return style;

-	}

-

-	/**

-	 * Checks whether the diagram is of "current", last released type.

-	 */

-	public static boolean isOfCurrentPapyrusVersion(Diagram diagram) {

-		return isCurrentPapyrusVersion(getCompatibilityVersion(diagram));

-	}

-

-	/**

-	 * Checks whether the given string represent the current papyrus version without telling explicitly what the current version is.

-	 *

-	 * @param version

-	 *            version to check

-	 * @return

-	 */

-	public static boolean isCurrentPapyrusVersion(String version) {

-		return CURRENT_DIAGRAM_VERSION().equals(version);

-	}

-

-	/**

-	 * Compare to version number.

-	 * The test is done only on the first 2 segments of a version.

-	 * The two String should have the same number of segments (i.e: 0.9.2 and 1.1.0).

-	 * 

-	 * @param referenceVersion

-	 *            Version that is the reference for the test

-	 * @param testedVersion

-	 *            the version that is compare to the reference.

-	 * @return true if the tested Version is before the reference Version .

-	 *         false by default.

-	 */

-	public static boolean isBeforeVersion(String referenceVersion, String testedVersion) {

-		boolean before = false;

-

-		StringTokenizer targetVersionTokenizer = new StringTokenizer(referenceVersion, DELIM_VERSION);

-		StringTokenizer sourceVersionTokenizer = new StringTokenizer(testedVersion, DELIM_VERSION);

-		try {

-			if (targetVersionTokenizer.countTokens() == sourceVersionTokenizer.countTokens()) {// Check if the format is the same for the 2 Strings

-				int targetMainVersion = Integer.parseInt(targetVersionTokenizer.nextToken());// get the first number

-				int sourceMainVersion = Integer.parseInt(sourceVersionTokenizer.nextToken());

-				if (targetMainVersion == sourceMainVersion) {// if main versions are the same check the intermediate version

-					int targetIntermediateVersion = Integer.parseInt(targetVersionTokenizer.nextToken());// get the second number

-					int sourceIntermediateVersion = Integer.parseInt(sourceVersionTokenizer.nextToken());

-					before = (targetIntermediateVersion > sourceIntermediateVersion);

-

-

-				} else {

-					before = (targetMainVersion > sourceMainVersion);

-				}

-			}

-

-		} catch (NumberFormatException e) {

-			Activator.log.error(e);

-		}

-

-		return before;

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.reconciler;
+
+import java.util.StringTokenizer;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.NotationFactory;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.StringValueStyle;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.Activator;
+
+/**
+ * This class provide several convenience methods to tag a diagram with a version number
+ * in a notation style, or retrieve this version number.
+ */
+public class DiagramVersioningUtils {
+
+	/**
+	 * Returns the "current" diagram version. Diagrams with this version don't require the reconciliation until the Papyrus version updates in such a
+	 * way that some diagram needs reconciliation.
+	 * <p/>
+	 * The current value returned by this method is "1.3.0".
+	 * <p/>
+	 * The value itself, howewer, should NOT be used outside of this package to avoid weird dependency issues. Instead, external code should use {@link DiagramVersioningUtils#stampCurrentVersion(Diagram)} and
+	 * {@link DiagramVersioningUtils#createStampCurrentVersionCommand(Diagram)}.
+	 * <p/>
+	 * This method is intentinally NOT a constant but indeed the method. This method is intentionally private and should NOT be made public.
+	 */
+	private static String CURRENT_DIAGRAM_VERSION() {
+		return "1.3.0"; //$NON-NLS-1$
+	}
+
+	/**
+	 * Directly marks the given diagram as either created with "current" Papyrus version or already reconciled to the "current" Papyrus version.
+	 * <p/>
+	 * It is guaranteed that {@link DiagramVersioningUtils#isOfCurrentPapyrusVersion(Diagram)} returns true immediately after the call to this method.
+	 *
+	 * @param diagram
+	 *            diagram to stamp as "current"
+	 */
+	public static void stampCurrentVersion(Diagram diagram) {
+		setCompatibilityVersion(diagram, CURRENT_DIAGRAM_VERSION());
+	}
+
+	/**
+	 * Returns the command that will mark the given diagram as either created with "current" Papyrus version or already reconciled to the "current"
+	 * Papyrus version.
+	 * <p/>
+	 * It is guaranteed that {@link DiagramVersioningUtils#isOfCurrentPapyrusVersion(Diagram)} will returns true immediately after the execution of the command.
+	 *
+	 * @param diagram
+	 * @return the command that is guaranteed to be not null and executable
+	 */
+	public static ICommand createStampCurrentVersionCommand(Diagram diagram) {
+		StringValueStyle style = findOrCreateCompatibilityStyle(diagram);
+		if (style.eContainer() == null) {
+			style.setStringValue(CURRENT_DIAGRAM_VERSION());
+			return new SetValueCommand(new SetRequest(diagram, NotationPackage.eINSTANCE.getView_Styles(), style));
+		} else {
+			return new SetValueCommand(new SetRequest(style, NotationPackage.eINSTANCE.getStringValueStyle_StringValue(), CURRENT_DIAGRAM_VERSION()));
+		}
+	}
+
+	/**
+	 * The name of the {@link StringValueStyle} that defines actual diagram version.
+	 * <p/>
+	 * The value for this constant is "diagram_compatibility_version", it is intentionally the same as been used for SysML diagrams versioning.
+	 */
+	public static final String COMPATIBILITY_VERSION = "diagram_compatibility_version";//$NON-NLS-1$
+
+	/**
+	 * The version constant for the diagrams that does not have a {@link DiagramVersioningUtils#COMPATIBILITY_VERSION} style.
+	 * It may be assumed that these diagrams had been created before Papyrus 1.0.
+	 */
+	public static final String UNDEFINED_VERSION = "undefined";//$NON-NLS-1$
+
+	private static final String DELIM_VERSION = ".";//$NON-NLS-1$
+
+	/**
+	 * Get the diagram compatibility version.
+	 *
+	 * @param view
+	 *            the diagram
+	 * @return the compatibility version or {@link DiagramVersioningUtils#UNDEFINED_VERSION} if none stored. Never returns <code>null</code>.
+	 */
+	public static String getCompatibilityVersion(View view) {
+		StringValueStyle semanticStyle = (StringValueStyle) view.getNamedStyle(NotationPackage.eINSTANCE.getStringValueStyle(), COMPATIBILITY_VERSION);
+		return semanticStyle == null ? UNDEFINED_VERSION : semanticStyle.getStringValue();
+	}
+
+	/**
+	 * Set the diagram compatibility version.
+	 *
+	 * @param diagram
+	 *            the diagram
+	 * @param version
+	 *            the compatibility version
+	 */
+	@SuppressWarnings("unchecked")
+	public static void setCompatibilityVersion(View view, String version) {
+		StringValueStyle style = findOrCreateCompatibilityStyle(view);
+		style.setStringValue(version);
+		if (style.eContainer() == null) {
+			view.getStyles().add(style);
+		}
+	}
+
+	/**
+	 * Finds the existing style with {@link DiagramVersioningUtils#COMPATIBILITY_VERSION} name or creates a new one if none existing found.
+	 * Does NOT attach the new style to the instance, it is left as a caller responsibility.
+	 *
+	 * @param view
+	 * @return the existing or a new not-attached style with {@link DiagramVersioningUtils#COMPATIBILITY_VERSION} name. Called can determine the case
+	 *         by checking {@link EObject#eContainer()} which is guaranteed to be null in case if new object had been created
+	 */
+	private static StringValueStyle findOrCreateCompatibilityStyle(View view) {
+		StringValueStyle style = (StringValueStyle) view.getNamedStyle(NotationPackage.eINSTANCE.getStringValueStyle(), COMPATIBILITY_VERSION);
+		if (style == null) {
+			style = NotationFactory.eINSTANCE.createStringValueStyle();
+			style.setName(COMPATIBILITY_VERSION);
+		}
+		return style;
+	}
+
+	/**
+	 * Checks whether the diagram is of "current", last released type.
+	 */
+	public static boolean isOfCurrentPapyrusVersion(Diagram diagram) {
+		return isCurrentPapyrusVersion(getCompatibilityVersion(diagram));
+	}
+
+	/**
+	 * Checks whether the given string represent the current papyrus version without telling explicitly what the current version is.
+	 *
+	 * @param version
+	 *            version to check
+	 * @return
+	 */
+	public static boolean isCurrentPapyrusVersion(String version) {
+		return CURRENT_DIAGRAM_VERSION().equals(version);
+	}
+
+	/**
+	 * Compare to version number.
+	 * The test is done only on the first 2 segments of a version.
+	 * The two String should have the same number of segments (i.e: 0.9.2 and 1.1.0).
+	 * 
+	 * @param referenceVersion
+	 *            Version that is the reference for the test
+	 * @param testedVersion
+	 *            the version that is compare to the reference.
+	 * @return true if the tested Version is before the reference Version .
+	 *         false by default.
+	 */
+	public static boolean isBeforeVersion(String referenceVersion, String testedVersion) {
+		boolean before = false;
+
+		StringTokenizer targetVersionTokenizer = new StringTokenizer(referenceVersion, DELIM_VERSION);
+		StringTokenizer sourceVersionTokenizer = new StringTokenizer(testedVersion, DELIM_VERSION);
+		try {
+			if (targetVersionTokenizer.countTokens() == sourceVersionTokenizer.countTokens()) {// Check if the format is the same for the 2 Strings
+				int targetMainVersion = Integer.parseInt(targetVersionTokenizer.nextToken());// get the first number
+				int sourceMainVersion = Integer.parseInt(sourceVersionTokenizer.nextToken());
+				if (targetMainVersion == sourceMainVersion) {// if main versions are the same check the intermediate version
+					int targetIntermediateVersion = Integer.parseInt(targetVersionTokenizer.nextToken());// get the second number
+					int sourceIntermediateVersion = Integer.parseInt(sourceVersionTokenizer.nextToken());
+					before = (targetIntermediateVersion > sourceIntermediateVersion);
+
+
+				} else {
+					before = (targetMainVersion > sourceMainVersion);
+				}
+			}
+
+		} catch (NumberFormatException e) {
+			Activator.log.error(e);
+		}
+
+		return before;
+	}
+
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/DiagramUtils.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/DiagramUtils.java
index addfeb98d2b..1a4797f0b71 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/DiagramUtils.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/DiagramUtils.java
@@ -18,7 +18,6 @@ import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
@@ -26,14 +25,16 @@ import org.eclipse.gef.EditPart;
 import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.Style;
 import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.core.architecture.RepresentationKind;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureViewpoint;
+import org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind;
 import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramPrototype;
 import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView;
-import org.eclipse.papyrus.infra.viewpoints.iso42010.ModelKind;
+import org.eclipse.papyrus.infra.gmfdiag.style.PapyrusDiagramStyle;
+import org.eclipse.papyrus.infra.gmfdiag.style.StylePackage;
 import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
 import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
-import org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle;
-import org.eclipse.papyrus.infra.viewpoints.style.StylePackage;
 
 /**
  * Utilities for the management of configuration-related data on views and diagrams
@@ -80,7 +81,7 @@ public class DiagramUtils {
 	 * @return The diagram's owner
 	 */
 	public static EObject getOwner(Diagram diagram) {
-		PapyrusViewStyle pvs = getPapyrusViewStyle(diagram);
+		PapyrusDiagramStyle pvs = getPapyrusDiagramStyle(diagram);
 		if (pvs != null) {
 			EObject value = pvs.getOwner();
 			if (value != null) {
@@ -100,25 +101,25 @@ public class DiagramUtils {
 	 *            The new diagram's owner
 	 */
 	public static void setOwner(Diagram diagram, EObject owner) {
-		PapyrusViewStyle pvs = getPapyrusViewStyle(diagram);
+		PapyrusDiagramStyle pvs = getPapyrusDiagramStyle(diagram);
 		if (pvs != null) {
 			pvs.setOwner(owner);
 		} else {
-			pvs = (PapyrusViewStyle) diagram.createStyle(StylePackage.Literals.PAPYRUS_VIEW_STYLE);
+			pvs = (PapyrusDiagramStyle) diagram.createStyle(StylePackage.Literals.PAPYRUS_DIAGRAM_STYLE);
 			pvs.setOwner(owner);
 		}
 	}
 
 	/**
-	 * Returns the PapyrusViewStyle owned by this diagram (if any)
+	 * Returns the PapyrusRepresentationStyle owned by this diagram (if any)
 	 *
 	 * @param diagram
 	 * @return
 	 */
-	public static final PapyrusViewStyle getPapyrusViewStyle(Diagram diagram) {
+	public static final PapyrusDiagramStyle getPapyrusDiagramStyle(Diagram diagram) {
 		for (Style ownedStyle : (List<Style>) diagram.getStyles()) { // Access all styles directly to avoid CSS computation, and use instanceof (Rather than reflexive EMF)
-			if (ownedStyle instanceof PapyrusViewStyle) {
-				return (PapyrusViewStyle) ownedStyle;
+			if (ownedStyle instanceof PapyrusDiagramStyle) {
+				return (PapyrusDiagramStyle) ownedStyle;
 			}
 		}
 		return null;
@@ -136,19 +137,21 @@ public class DiagramUtils {
 	 * @return The diagram's prototype
 	 */
 	public static ViewPrototype getPrototype(Diagram diagram) {
-		PapyrusViewStyle pvs = getPapyrusViewStyle(diagram);
-		if (pvs != null) {
-			PapyrusView diagramConfig = pvs.getConfiguration();
+		PolicyChecker checker = PolicyChecker.getFor(diagram);
+		PapyrusDiagramStyle pvs = getPapyrusDiagramStyle(diagram);
+		if (pvs != null) {			
+			PapyrusRepresentationKind repKind = pvs.getDiagramKind();
 
 			// Check if the selected viewpoint contains the diagram model kind
-			if (diagramConfig != null) {
-				if (PolicyChecker.getCurrent().isInViewpoint(diagramConfig)) {
-					return ViewPrototype.get(diagramConfig);
+			if (repKind != null) {
+				
+				if (checker.isInViewpoint(repKind)) {
+					return ViewPrototype.get(repKind);
 				}
 
 				// Check if the selected viewpoint contains an ancestor of the diagram model kind
-				PapyrusView diagramParentView = diagramConfig.getParent();
-				while (diagramParentView != null && !PolicyChecker.getCurrent().isInViewpoint(diagramParentView)) {
+				PapyrusRepresentationKind diagramParentView = repKind.getParent();
+				while (diagramParentView != null && !checker.isInViewpoint(diagramParentView)) {
 					diagramParentView = diagramParentView.getParent();
 				}
 				if (diagramParentView != null) {
@@ -156,58 +159,51 @@ public class DiagramUtils {
 				}
 
 				// Check if the selected viewpoint contains a descendant of the diagram model kind
-				String diagramConfigName = diagramConfig.getName();
+				String diagramConfigName = repKind.getName();
 				if (diagramConfigName != null) { // the model kind name is used as a "semantic" key to test equality
-					EList<ModelKind> modelKinds = PolicyChecker.getCurrent().getViewpoint().getModelKinds();
-					for (ModelKind modelKind : modelKinds) {
-						if (modelKind instanceof PapyrusView) {
-							PapyrusView papyrusView = (PapyrusView) modelKind;
-
-							if (diagramConfigName.equals(papyrusView.getName())) {
-								ViewPrototype.get(papyrusView);
-							}
-
-							PapyrusView parentPapyrusView = papyrusView.getParent();
-							while (parentPapyrusView != null && !diagramConfigName.equals(parentPapyrusView.getName())) {
-								parentPapyrusView = parentPapyrusView.getParent();
-							}
-							if (parentPapyrusView != null) {
-								return ViewPrototype.get(papyrusView);
+					for (MergedArchitectureViewpoint viewpoint : checker.getViewpoints()) {
+						for (RepresentationKind representationKind : viewpoint.getRepresentationKinds()) {
+							if (representationKind instanceof PapyrusRepresentationKind) {
+								PapyrusRepresentationKind papyrusRepresentationKind = (PapyrusRepresentationKind) representationKind;
+	
+								if (diagramConfigName.equals(papyrusRepresentationKind.getName())) {
+									ViewPrototype.get(papyrusRepresentationKind);
+								}
+	
+								PapyrusRepresentationKind parentPapyrusRepresentationKind = papyrusRepresentationKind.getParent();
+								while (parentPapyrusRepresentationKind != null && !diagramConfigName.equals(parentPapyrusRepresentationKind.getName())) {
+									parentPapyrusRepresentationKind = parentPapyrusRepresentationKind.getParent();
+								}
+								if (parentPapyrusRepresentationKind != null) {
+									return ViewPrototype.get(papyrusRepresentationKind);
+								}
 							}
 						}
 					}
 				}
 
 			}
-
-			return ViewPrototype.get(diagram.getType(), pvs.getOwner(), diagram.getElement());
-		}
-		// This is the legacy fallback for old diagrams
-		if ("Package".equals(diagram.getType())) {
-			for (ViewPrototype prototype : PolicyChecker.getCurrent().getAllPrototypes()) {
-				if ("UML Package Diagram".equals(prototype.getLabel())) {
-					return prototype;
-				}
-			}
+			return ViewPrototype.get(checker, diagram.getType(), pvs.getOwner(), diagram.getElement());
+		} else {
+			return ViewPrototype.get(checker, diagram.getType(), diagram.getElement(), diagram.getElement());
 		}
-		return ViewPrototype.get(diagram.getType(), diagram.getElement(), diagram.getElement());
 	}
-
+	
 	/**
 	 * Sets the prototype of a diagram
 	 *
 	 * @param diagram
 	 *            A diagram
-	 * @param configuration
+	 * @param prototype
 	 *            The new diagram's prototype
 	 */
-	public static void setPrototype(Diagram diagram, ViewPrototype prototype) {
-		PapyrusViewStyle pvs = getPapyrusViewStyle(diagram);
+	public static void setPrototype(Diagram diagram, DiagramPrototype prototype) {
+		PapyrusDiagramStyle pvs = getPapyrusDiagramStyle(diagram);
 		if (pvs != null) {
-			pvs.setConfiguration(prototype.getConfiguration());
+			pvs.setDiagramKind(prototype.getRepresentationKind());
 		} else {
-			pvs = (PapyrusViewStyle) diagram.createStyle(StylePackage.Literals.PAPYRUS_VIEW_STYLE);
-			pvs.setConfiguration(prototype.getConfiguration());
+			pvs = (PapyrusDiagramStyle) diagram.createStyle(StylePackage.Literals.PAPYRUS_DIAGRAM_STYLE);
+			pvs.setDiagramKind(prototype.getRepresentationKind());
 		}
 	}
 
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/META-INF/MANIFEST.MF
index 35c570d064d..1aea47c3fbc 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/META-INF/MANIFEST.MF
@@ -4,7 +4,9 @@ Require-Bundle: org.eclipse.papyrus.infra.hyperlink;bundle-version="[3.0.0,4.0.0
  org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.style;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.nattable.representation;bundle-version="[1.0.0,2.0.0)"
 Export-Package: org.eclipse.papyrus.infra.gmfdiag.hyperlink,
  org.eclipse.papyrus.infra.gmfdiag.hyperlink.editpolicies,
  org.eclipse.papyrus.infra.gmfdiag.hyperlink.helper,
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/editpolicies/HyperlinkNavigationMenuEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/editpolicies/HyperlinkNavigationMenuEditPolicy.java
index 5d2401622c4..e3b7764f7a6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/editpolicies/HyperlinkNavigationMenuEditPolicy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/editpolicies/HyperlinkNavigationMenuEditPolicy.java
@@ -47,6 +47,8 @@ import org.eclipse.papyrus.infra.gmfdiag.hyperlink.Activator;
 import org.eclipse.papyrus.infra.gmfdiag.hyperlink.messages.Messages;
 import org.eclipse.papyrus.infra.gmfdiag.navigation.editpolicy.NavigationEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.navigation.menu.button.HyperlinkButton;
+import org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram;
+import org.eclipse.papyrus.infra.gmfdiag.style.PapyrusDiagramStyle;
 import org.eclipse.papyrus.infra.hyperlink.helper.AbstractHyperLinkHelper;
 import org.eclipse.papyrus.infra.hyperlink.helper.HyperLinkHelperFactory;
 import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkDocument;
@@ -56,16 +58,14 @@ import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkWeb;
 import org.eclipse.papyrus.infra.hyperlink.ui.HyperLinkManagerShell;
 import org.eclipse.papyrus.infra.hyperlink.util.HyperLinkException;
 import org.eclipse.papyrus.infra.hyperlink.util.HyperLinkHelpersRegistrationUtil;
+import org.eclipse.papyrus.infra.nattable.representation.PapyrusSyncTable;
+import org.eclipse.papyrus.infra.nattable.representation.PapyrusTable;
 import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
 import org.eclipse.papyrus.infra.ui.editorsfactory.IPageIconsRegistry;
 import org.eclipse.papyrus.infra.ui.editorsfactory.PageIconsRegistry;
 import org.eclipse.papyrus.infra.ui.util.EditorHelper;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusSyncTable;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusTable;
 import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
 import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
-import org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle;
 import org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
@@ -251,10 +251,10 @@ public class HyperlinkNavigationMenuEditPolicy extends NavigationEditPolicy {
 			List<ViewPrototype> diagramPrototypes = new ArrayList<ViewPrototype>();
 			List<ViewPrototype> tablePrototypes = new ArrayList<ViewPrototype>();
 
-			for (final ViewPrototype proto : PolicyChecker.getCurrent().getPrototypesFor(selection)) {
-				if (proto.getConfiguration() instanceof PapyrusDiagram) {
+			for (final ViewPrototype proto : PolicyChecker.getFor(selection).getPrototypesFor(selection)) {
+				if (proto.getRepresentationKind() instanceof PapyrusDiagram) {
 					diagramPrototypes.add(proto);
-				} else if (proto.getConfiguration() instanceof PapyrusTable || proto.getConfiguration() instanceof PapyrusSyncTable) {
+				} else if (proto.getRepresentationKind() instanceof PapyrusTable || proto.getRepresentationKind() instanceof PapyrusSyncTable) {
 					tablePrototypes.add(proto);
 				}
 			}
@@ -337,9 +337,9 @@ public class HyperlinkNavigationMenuEditPolicy extends NavigationEditPolicy {
 						// Gets the container
 						EObject container = null;
 						for (EObject createdObject : usagesAfter) {
-							if (createdObject instanceof PapyrusViewStyle) {
+							if (createdObject instanceof PapyrusDiagramStyle) {
 								// Add it to hyperLink
-								PapyrusViewStyle viewStyle = (PapyrusViewStyle) createdObject;
+								PapyrusDiagramStyle viewStyle = (PapyrusDiagramStyle) createdObject;
 								container = viewStyle.eContainer();
 							} else if (null == container) {
 								container = createdObject;
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/plugin.xml
index afdc08c6f1d..cefdde03711 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/plugin.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/plugin.xml
@@ -52,6 +52,10 @@
       <menuContribution
             allPopups="false"
             locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup?before=newelements">
+	    <separator
+	          name="navigat"
+	          visible="true">
+	    </separator>
          <menu
                id="org.eclipse.papyrus.infra.services.navigation.ui.popup.navigate"
                label="Navigate"
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF
index 76b8f339ba2..575dc5bd3d9 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF
@@ -6,7 +6,8 @@ Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[2.0.0,3
  org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.infra.internationalization;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.papyrus.infra.internationalization;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.style;bundle-version="1.0.0"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.papyrus.infra.gmfdiag.properties.constraint"
 Bundle-Version: 3.0.0.qualifier
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleDiagram.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleDiagram.xwt
index db294948335..107e12ea6aa 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleDiagram.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleDiagram.xwt
@@ -12,7 +12,7 @@
 		</Composite.layout>
 		<ppe:StringEditor input="{Binding}" property="notation:Diagram:name"></ppe:StringEditor>
 		<ppe:StringEditor input="{Binding}" property="notation:Diagram:label"></ppe:StringEditor>
-		<ppe:ReferenceLabel input="{Binding}" property="notation:View:prototype" readOnly="true" customLabel="View Type"></ppe:ReferenceLabel>
+		<ppe:ReferenceLabel input="{Binding}" property="notation:View:prototype" readOnly="true" customLabel="Diagram Kind"></ppe:ReferenceLabel>
 		<ppe:ReferenceDialog input="{Binding}" property="notation:View:owner" customLabel="Owner"></ppe:ReferenceDialog>
 		<ppe:ReferenceDialog input="{Binding}" property="notation:View:element" customLabel="Root element"></ppe:ReferenceDialog>
 	</Composite>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/GMFModelElement.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/GMFModelElement.java
index 4d4cefbddf0..e330f098c10 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/GMFModelElement.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/GMFModelElement.java
@@ -39,12 +39,12 @@ import org.eclipse.papyrus.infra.gmfdiag.properties.databinding.DiagramLabelObse
 import org.eclipse.papyrus.infra.gmfdiag.properties.databinding.GradientObservableValue;
 import org.eclipse.papyrus.infra.gmfdiag.properties.provider.ModelContentProvider;
 import org.eclipse.papyrus.infra.gmfdiag.properties.util.LegacyOwnerObservable;
+import org.eclipse.papyrus.infra.gmfdiag.style.StylePackage;
 import org.eclipse.papyrus.infra.internationalization.utils.utils.InternationalizationConstants;
 import org.eclipse.papyrus.infra.properties.ui.modelelement.EMFModelElement;
 import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
 import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
 import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
-import org.eclipse.papyrus.infra.viewpoints.style.StylePackage;
 import org.eclipse.papyrus.infra.widgets.providers.EmptyContentProvider;
 import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
 import org.eclipse.swt.graphics.Image;
@@ -102,18 +102,18 @@ public class GMFModelElement extends EMFModelElement {
 			return new DiagramLabelObservableValue(diagram, getDomain());
 		}else if (propertyPath.endsWith("owner")) {
 			Diagram diagram = (Diagram) source;
-			Style style = diagram.getStyle(StylePackage.Literals.PAPYRUS_VIEW_STYLE);
+			Style style = diagram.getStyle(StylePackage.Literals.PAPYRUS_DIAGRAM_STYLE);
 			if (style != null) {
-				return new GMFObservableValue(style, StylePackage.Literals.PAPYRUS_VIEW_STYLE__OWNER, domain);
+				return new GMFObservableValue(style, StylePackage.Literals.PAPYRUS_DIAGRAM_STYLE__OWNER, domain);
 			}
-			return new LegacyOwnerObservable(diagram, StylePackage.Literals.PAPYRUS_VIEW_STYLE__OWNER, domain);
+			return new LegacyOwnerObservable(diagram, StylePackage.Literals.PAPYRUS_DIAGRAM_STYLE__OWNER, domain);
 		} else if (propertyPath.endsWith("prototype")) {
 			Diagram diagram = (Diagram) source;
-			Style style = diagram.getStyle(StylePackage.Literals.PAPYRUS_VIEW_STYLE);
+			Style style = diagram.getStyle(StylePackage.Literals.PAPYRUS_DIAGRAM_STYLE);
 			if (style != null) {
-				return new GMFObservableValue(style, StylePackage.Literals.PAPYRUS_VIEW_STYLE__CONFIGURATION, domain);
+				return new GMFObservableValue(style, StylePackage.Literals.PAPYRUS_DIAGRAM_STYLE__DIAGRAM_KIND, domain);
 			}
-			return new LegacyOwnerObservable(diagram, StylePackage.Literals.PAPYRUS_VIEW_STYLE__CONFIGURATION, domain);
+			return new LegacyOwnerObservable(diagram, StylePackage.Literals.PAPYRUS_DIAGRAM_STYLE__DIAGRAM_KIND, domain);
 		}
 
 		FeaturePath featurePath = getFeaturePath(propertyPath);
@@ -191,7 +191,7 @@ public class GMFModelElement extends EMFModelElement {
 
 					@Override
 					protected boolean isValid(EObject selection, Diagram diagram, ViewPrototype prototype) {
-						return PolicyChecker.getCurrent().canHaveNewView(selection, DiagramUtils.getOwner(diagram), prototype);
+						return PolicyChecker.getFor(diagram).canHaveNewView(selection, DiagramUtils.getOwner(diagram), prototype);
 					}
 				};
 			} else {
@@ -203,7 +203,7 @@ public class GMFModelElement extends EMFModelElement {
 
 				@Override
 				protected boolean isValid(EObject selection, Diagram diagram, ViewPrototype prototype) {
-					return (PolicyChecker.getCurrent().getOwningRuleFor(prototype, selection) != null);
+					return (PolicyChecker.getFor(diagram).getOwningRuleFor(prototype, selection) != null);
 				}
 			};
 		}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/provider/ModelContentProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/provider/ModelContentProvider.java
index 355f8ca0f3d..90236947f3c 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/provider/ModelContentProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/provider/ModelContentProvider.java
@@ -1,89 +1,89 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.properties.provider;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.infra.viewpoints.configuration.ui.ECoreModelContentProvider;

-import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;

-import org.eclipse.papyrus.infra.widgets.providers.IHierarchicContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

-

-/**

- * Represents a simple ECore model content provider for the selection of a diagram's root model element

- *

- * @author Laurent Wouters

- */

-public abstract class ModelContentProvider extends ECoreModelContentProvider implements IStaticContentProvider, IHierarchicContentProvider {

-

-	/**

-	 * The diagram

-	 */

-	private Diagram diagram;

-

-	/**

-	 * Initializes the provider with the given root

-	 *

-	 * @param diagram

-	 *            The diagram for which a root model element is to be provided

-	 * @param root

-	 *            The root object

-	 */

-	public ModelContentProvider(Diagram diagram, EObject root) {

-		super(root);

-		this.diagram = diagram;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider#getElements()

-	 */

-	public Object[] getElements() {

-		return getElements(null);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.papyrus.infra.widgets.providers.IHierarchicContentProvider#isValidValue(java.lang.Object)

-	 */

-	public boolean isValidValue(Object element) {

-		if (element == null) {

-			return false;

-		}

-		if (!(element instanceof EObject)) {

-			return false;

-		}

-		ViewPrototype prototype = DiagramUtils.getPrototype(diagram);

-		if (prototype == null) {

-			return false;

-		}

-		return isValid((EObject) element, diagram, prototype);

-	}

-

-	/**

-	 * Determines whether the selection is valid

-	 *

-	 * @param selection

-	 *            The selection

-	 * @param diagram

-	 *            The diagram

-	 * @param prototype

-	 *            The diagram's prototype

-	 * @return <code>true</code> if the selection is valid

-	 */

-	protected abstract boolean isValid(EObject selection, Diagram diagram, ViewPrototype prototype);

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.properties.provider;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
+import org.eclipse.papyrus.infra.ui.emf.utils.EcoreModelContentProvider;
+import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
+import org.eclipse.papyrus.infra.widgets.providers.IHierarchicContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+
+/**
+ * Represents a simple ECore model content provider for the selection of a diagram's root model element
+ *
+ * @author Laurent Wouters
+ */
+public abstract class ModelContentProvider extends EcoreModelContentProvider implements IStaticContentProvider, IHierarchicContentProvider {
+
+	/**
+	 * The diagram
+	 */
+	private Diagram diagram;
+
+	/**
+	 * Initializes the provider with the given root
+	 *
+	 * @param diagram
+	 *            The diagram for which a root model element is to be provided
+	 * @param root
+	 *            The root object
+	 */
+	public ModelContentProvider(Diagram diagram, EObject root) {
+		super(root);
+		this.diagram = diagram;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider#getElements()
+	 */
+	public Object[] getElements() {
+		return getElements(null);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.papyrus.infra.widgets.providers.IHierarchicContentProvider#isValidValue(java.lang.Object)
+	 */
+	public boolean isValidValue(Object element) {
+		if (element == null) {
+			return false;
+		}
+		if (!(element instanceof EObject)) {
+			return false;
+		}
+		ViewPrototype prototype = DiagramUtils.getPrototype(diagram);
+		if (prototype == null) {
+			return false;
+		}
+		return isValid((EObject) element, diagram, prototype);
+	}
+
+	/**
+	 * Determines whether the selection is valid
+	 *
+	 * @param selection
+	 *            The selection
+	 * @param diagram
+	 *            The diagram
+	 * @param prototype
+	 *            The diagram's prototype
+	 * @return <code>true</code> if the selection is valid
+	 */
+	protected abstract boolean isValid(EObject selection, Diagram diagram, ViewPrototype prototype);
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/util/LegacyOwnerObservable.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/util/LegacyOwnerObservable.java
index 6457df798b8..5ebc400a727 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/util/LegacyOwnerObservable.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/util/LegacyOwnerObservable.java
@@ -29,8 +29,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.Style;
 import org.eclipse.papyrus.infra.gmfdiag.common.databinding.GMFObservableValue;
 import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
+import org.eclipse.papyrus.infra.gmfdiag.style.StylePackage;
 import org.eclipse.papyrus.infra.services.edit.ui.databinding.PapyrusObservableValue;
-import org.eclipse.papyrus.infra.viewpoints.style.StylePackage;
 
 /**
  * Represents the observable value of a diagram's owner in the case where the diagram does not yet have the viewpoints-compatible style for holding the value itself
@@ -85,7 +85,7 @@ public class LegacyOwnerObservable extends AbstractObservableValue {
 				if (valueListener != null) {
 					return;
 				}
-				Style style = LegacyOwnerObservable.this.diagram.getStyle(StylePackage.Literals.PAPYRUS_VIEW_STYLE);
+				Style style = LegacyOwnerObservable.this.diagram.getStyle(StylePackage.Literals.PAPYRUS_DIAGRAM_STYLE);
 				if (style != null) {
 					buildValueListener(style);
 				}
@@ -159,7 +159,7 @@ public class LegacyOwnerObservable extends AbstractObservableValue {
 
 			@Override
 			public void execute() {
-				Style style = diagram.getStyle(StylePackage.Literals.PAPYRUS_VIEW_STYLE);
+				Style style = diagram.getStyle(StylePackage.Literals.PAPYRUS_DIAGRAM_STYLE);
 				createStyle = (style == null);
 				DiagramUtils.setOwner(diagram, newValue);
 			}
@@ -172,7 +172,7 @@ public class LegacyOwnerObservable extends AbstractObservableValue {
 			@Override
 			public void undo() {
 				if (createStyle) {
-					Style style = diagram.getStyle(StylePackage.Literals.PAPYRUS_VIEW_STYLE);
+					Style style = diagram.getStyle(StylePackage.Literals.PAPYRUS_DIAGRAM_STYLE);
 					diagram.getStyles().remove(style);
 				} else {
 					DiagramUtils.setOwner(diagram, oldValue);
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/.classpath
new file mode 100644
index 00000000000..2534a1484b3
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/.classpath
@@ -0,0 +1,8 @@
+<?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/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/.project
new file mode 100644
index 00000000000..c943d83aff9
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.gmfdiag.representation.edit</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.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..c50a4993065
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/META-INF/MANIFEST.MF
@@ -0,0 +1,23 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.representation.edit;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.representation.provider.RepresentationEditPlugin$Implementation
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.representation.provider
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.gmfdiag.representation;visibility:=reexport,
+ org.eclipse.emf.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.core.architecture;visibility:=reexport,
+ org.eclipse.papyrus.infra.core.architecture.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.constraints;visibility:=reexport,
+ org.eclipse.papyrus.infra.constraints.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.types;visibility:=reexport,
+ org.eclipse.papyrus.infra.types.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.architecture.representation;visibility:=reexport,
+ org.eclipse.papyrus.infra.architecture.representation.edit;visibility:=reexport
+Bundle-ActivationPolicy: lazy
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/about.html b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/about.html
new file mode 100755
index 00000000000..6e189dc4483
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/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>June 1, 2017</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/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/build.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/build.properties
new file mode 100644
index 00000000000..d28fe0d0f2e
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/build.properties
@@ -0,0 +1,21 @@
+# Copyright (c) 2017 CEA LIST.
+# 
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#  
+#  Contributors:
+#  Maged Elaasar - Initial API and implementation
+#  
+# 
+
+bin.includes = .,\
+               icons/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties
+jars.compile.order = .
+source.. = src-gen/,\
+           src/
+output.. = bin/
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/icons/full/ctool16/CreateArchitectureDescriptionLanguage_representationKinds_PapyrusDiagram.gif b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/icons/full/ctool16/CreateArchitectureDescriptionLanguage_representationKinds_PapyrusDiagram.gif
new file mode 100644
index 00000000000..e81c185d38b
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/icons/full/ctool16/CreateArchitectureDescriptionLanguage_representationKinds_PapyrusDiagram.gif
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/icons/full/ctool16/CreateChildRule_insertionPath_PathElement.gif b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/icons/full/ctool16/CreateChildRule_insertionPath_PathElement.gif
new file mode 100644
index 00000000000..a6fdabb17b6
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/icons/full/ctool16/CreateChildRule_insertionPath_PathElement.gif
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/icons/full/ctool16/CreatePapyrusDiagram_assistantRules_AssistantRule.gif b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/icons/full/ctool16/CreatePapyrusDiagram_assistantRules_AssistantRule.gif
new file mode 100644
index 00000000000..7786614d63c
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/icons/full/ctool16/CreatePapyrusDiagram_assistantRules_AssistantRule.gif
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/icons/full/ctool16/CreatePapyrusDiagram_childRules_ChildRule.gif b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/icons/full/ctool16/CreatePapyrusDiagram_childRules_ChildRule.gif
new file mode 100644
index 00000000000..c4ab84666a9
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/icons/full/ctool16/CreatePapyrusDiagram_childRules_ChildRule.gif
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/icons/full/ctool16/CreatePapyrusDiagram_paletteRules_PaletteRule.gif b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/icons/full/ctool16/CreatePapyrusDiagram_paletteRules_PaletteRule.gif
new file mode 100644
index 00000000000..07f63f9f843
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/icons/full/ctool16/CreatePapyrusDiagram_paletteRules_PaletteRule.gif
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/obj16/AssistantRule.png b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/icons/full/obj16/AssistantRule.gif
index dbad2213d36..dbad2213d36 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/obj16/AssistantRule.png
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/icons/full/obj16/AssistantRule.gif
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/obj16/ChildRule.png b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/icons/full/obj16/ChildRule.gif
index e5f7f2715b7..e5f7f2715b7 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/obj16/ChildRule.png
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/icons/full/obj16/ChildRule.gif
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/obj16/PaletteRule.png b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/icons/full/obj16/PaletteRule.gif
index 701d962b191..701d962b191 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/obj16/PaletteRule.png
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/icons/full/obj16/PaletteRule.gif
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/obj16/PapyrusDiagram.png b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/icons/full/obj16/PapyrusDiagram.gif
index 861fddb5f4a..861fddb5f4a 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/obj16/PapyrusDiagram.png
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/icons/full/obj16/PapyrusDiagram.gif
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/icons/full/obj16/PathElement.gif b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/icons/full/obj16/PathElement.gif
new file mode 100644
index 00000000000..c4295364c97
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/icons/full/obj16/PathElement.gif
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/plugin.properties
new file mode 100644
index 00000000000..a5ff4549eeb
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/plugin.properties
@@ -0,0 +1,50 @@
+# Copyright (c) 2017 CEA LIST.
+# 
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#  
+#  Contributors:
+#  Maged Elaasar - Initial API and implementation
+#  
+# 
+
+pluginName = GMF Representation Edit Support
+providerName = Eclipse Modeling Project
+
+_UI_CreateChild_text = {0}
+_UI_CreateChild_text2 = {1} {0}
+_UI_CreateChild_text3 = {1}
+_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
+_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
+_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
+
+_UI_PropertyDescriptor_description = The {0} of the {1}
+
+_UI_PapyrusDiagram_type = Papyrus Diagram
+_UI_ChildRule_type = Child Rule
+_UI_PaletteRule_type = Palette Rule
+_UI_PathElement_type = Path Element
+_UI_AssistantRule_type = Assistant Rule
+_UI_Unknown_type = Object
+
+_UI_Unknown_datatype= Value
+
+_UI_PapyrusDiagram_customPalette_feature = Custom Palette
+_UI_PapyrusDiagram_customStyle_feature = Custom Style
+_UI_PapyrusDiagram_childRules_feature = Child Rules
+_UI_PapyrusDiagram_paletteRules_feature = Palette Rules
+_UI_PapyrusDiagram_assistantRules_feature = Assistant Rules
+_UI_PapyrusDiagram_creationCommandClass_feature = Creation Command Class
+_UI_ChildRule_element_feature = Element
+_UI_ChildRule_stereotypes_feature = Stereotypes
+_UI_ChildRule_origin_feature = Origin
+_UI_ChildRule_insertionPath_feature = Insertion Path
+_UI_PaletteRule_element_feature = Element
+_UI_PathElement_feature_feature = Feature
+_UI_PathElement_origin_feature = Origin
+_UI_PathElement_target_feature = Target
+_UI_AssistantRule_elementTypeID_feature = Element Type ID
+_UI_Unknown_feature = Unspecified
+
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/plugin.xml
new file mode 100644
index 00000000000..26b4de7be30
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/plugin.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+ Copyright (c) 2017 CEA LIST.
+ 
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/legal/epl-v10.html
+  
+  Contributors:
+  Maged Elaasar - Initial API and implementation
+  
+ 
+-->
+
+<plugin>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated Representation -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/infra/gmfdiag/representation"
+            class="org.eclipse.papyrus.infra.gmfdiag.representation.provider.RepresentationItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.edit.childCreationExtenders">
+      <!-- @generated Representation -->
+      <extender
+            uri="http://www.eclipse.org/papyrus/infra/core/architecture"
+            class="org.eclipse.papyrus.infra.gmfdiag.representation.provider.RepresentationItemProviderAdapterFactory$ArchitectureChildCreationExtender"/>
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/pom.xml
new file mode 100755
index 00000000000..83e6ef962b1
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/pom.xml
@@ -0,0 +1,13 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.gmfdiag.representation.edit</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+	<description>Papyrus fork of org.eclipse.gmf.tooling.runtime to remain in the release train</description>
+</project>
\ No newline at end of file
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/AssistantRuleItemProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/provider/AssistantRuleItemProvider.java
index ae28bf90686..553aa01bd06 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/AssistantRuleItemProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/provider/AssistantRuleItemProvider.java
@@ -1,17 +1,17 @@
 /**
- * Copyright (c) 2015 Christian W. Damus and others.
- *
+ * Copyright (c) 2017 CEA LIST.
+ * 
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
  *  which accompanies this distribution, and is available at
  *  http://www.eclipse.org/legal/epl-v10.html
- *
+ *  
  *  Contributors:
- *  Christian W. Damus - Initial API and implementation
- *
- *
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
  */
-package org.eclipse.papyrus.infra.viewpoints.configuration.provider;
+package org.eclipse.papyrus.infra.gmfdiag.representation.provider;
 
 
 import java.util.Collection;
@@ -19,15 +19,19 @@ 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.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.infra.viewpoints.configuration.AssistantRule;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
+import org.eclipse.papyrus.infra.architecture.representation.provider.RuleItemProvider;
+import org.eclipse.papyrus.infra.gmfdiag.representation.AssistantRule;
+import org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.viewpoints.configuration.AssistantRule} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.gmfdiag.representation.AssistantRule} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
@@ -66,46 +70,36 @@ public class AssistantRuleItemProvider extends RuleItemProvider {
 	 * @generated
 	 */
 	protected void addElementTypeIDPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_AssistantRule_elementTypeID_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_AssistantRule_elementTypeID_feature", "_UI_AssistantRule_type"),
-				ConfigurationPackage.Literals.ASSISTANT_RULE__ELEMENT_TYPE_ID,
-				true,
-				false,
-				false,
-				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				null,
-				null));
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_AssistantRule_elementTypeID_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_AssistantRule_elementTypeID_feature", "_UI_AssistantRule_type"),
+				 RepresentationPackage.Literals.ASSISTANT_RULE__ELEMENT_TYPE_ID,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
 	}
 
 	/**
 	 * This returns AssistantRule.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @generated NOT - custom image
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AssistantRule.png"));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
-	protected boolean shouldComposeCreationImage() {
-		return true;
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AssistantRule"));
 	}
 
 	/**
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated NOT
 	 */
 	@Override
@@ -118,7 +112,7 @@ public class AssistantRuleItemProvider extends RuleItemProvider {
 		String permit = rule.isPermit() ? getString("_UI_allow") : getString("_UI_deny");
 		return getString("_UI_AssistantRule_label", new Object[] { pattern, permit });
 	}
-
+	
 
 	/**
 	 * This handles model notifications by calling {@link #updateChildren} to update any cached
@@ -132,9 +126,9 @@ public class AssistantRuleItemProvider extends RuleItemProvider {
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(AssistantRule.class)) {
-		case ConfigurationPackage.ASSISTANT_RULE__ELEMENT_TYPE_ID:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
+			case RepresentationPackage.ASSISTANT_RULE__ELEMENT_TYPE_ID:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -151,4 +145,15 @@ public class AssistantRuleItemProvider extends RuleItemProvider {
 		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 RepresentationEditPlugin.INSTANCE;
+	}
+
 }
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/ChildRuleItemProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/provider/ChildRuleItemProvider.java
index 59a66e51630..ae8e5d75af3 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/ChildRuleItemProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/provider/ChildRuleItemProvider.java
@@ -1,18 +1,17 @@
-/*****************************************************************************
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.viewpoints.configuration.provider;
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.gmfdiag.representation.provider;
 
 
 import java.util.Collection;
@@ -20,24 +19,25 @@ 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.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ChildRule;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationFactory;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.viewpoints.configuration.EClassPropertyDescriptor;
-import org.eclipse.papyrus.infra.viewpoints.configuration.StereotypePropertyDescriptor;
+import org.eclipse.papyrus.infra.architecture.representation.provider.EClassPropertyDescriptor;
+import org.eclipse.papyrus.infra.architecture.representation.provider.RuleItemProvider;
+import org.eclipse.papyrus.infra.architecture.representation.provider.StereotypePropertyDescriptor;
+import org.eclipse.papyrus.infra.gmfdiag.representation.ChildRule;
+import org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationFactory;
+import org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.viewpoints.configuration.ChildRule} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.gmfdiag.representation.ChildRule} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class ChildRuleItemProvider
-		extends RuleItemProvider {
+public class ChildRuleItemProvider extends RuleItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
@@ -70,63 +70,66 @@ public class ChildRuleItemProvider
 	 * This adds a property descriptor for the Element feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated NOT
 	 */
 	protected void addElementPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new EClassPropertyDescriptor(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_ChildRule_element_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_ChildRule_element_feature", "_UI_ChildRule_type"),
-				ConfigurationPackage.Literals.CHILD_RULE__ELEMENT,
-				true,
-				false,
-				true,
-				null,
-				null,
-				null)));
+		itemPropertyDescriptors.add(new EClassPropertyDescriptor
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ChildRule_element_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_ChildRule_element_feature", "_UI_ChildRule_type"),
+				 RepresentationPackage.Literals.CHILD_RULE__ELEMENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null)));
 	}
 
 	/**
 	 * This adds a property descriptor for the Stereotypes feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated NOT
 	 */
 	protected void addStereotypesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new StereotypePropertyDescriptor(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_ChildRule_stereotypes_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_ChildRule_stereotypes_feature", "_UI_ChildRule_type"),
-				ConfigurationPackage.Literals.CHILD_RULE__STEREOTYPES,
-				true,
-				false,
-				true,
-				null,
-				null,
-				null)));
+		itemPropertyDescriptors.add(new StereotypePropertyDescriptor
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ChildRule_stereotypes_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_ChildRule_stereotypes_feature", "_UI_ChildRule_type"),
+				 RepresentationPackage.Literals.CHILD_RULE__STEREOTYPES,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null)));
 	}
 
 	/**
 	 * This adds a property descriptor for the Origin feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated NOT
 	 */
 	protected void addOriginPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new EClassPropertyDescriptor(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_ChildRule_origin_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_ChildRule_origin_feature", "_UI_ChildRule_type"),
-				ConfigurationPackage.Literals.CHILD_RULE__ORIGIN,
-				true,
-				false,
-				true,
-				null,
-				null,
-				null)));
+		itemPropertyDescriptors.add(new EClassPropertyDescriptor
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ChildRule_origin_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_ChildRule_origin_feature", "_UI_ChildRule_type"),
+				 RepresentationPackage.Literals.CHILD_RULE__ORIGIN,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null)));
 	}
 
 	/**
@@ -141,7 +144,7 @@ public class ChildRuleItemProvider
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(ConfigurationPackage.Literals.CHILD_RULE__INSERTION_PATH);
+			childrenFeatures.add(RepresentationPackage.Literals.CHILD_RULE__INSERTION_PATH);
 		}
 		return childrenFeatures;
 	}
@@ -163,22 +166,11 @@ public class ChildRuleItemProvider
 	 * This returns ChildRule.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @generated NOT - custom image
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ChildRule.png"));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
-	protected boolean shouldComposeCreationImage() {
-		return true;
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ChildRule"));
 	}
 
 	/**
@@ -220,9 +212,9 @@ public class ChildRuleItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(ChildRule.class)) {
-		case ConfigurationPackage.CHILD_RULE__INSERTION_PATH:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-			return;
+			case RepresentationPackage.CHILD_RULE__INSERTION_PATH:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+				return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -238,8 +230,21 @@ public class ChildRuleItemProvider
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add(createChildParameter(ConfigurationPackage.Literals.CHILD_RULE__INSERTION_PATH,
-				ConfigurationFactory.eINSTANCE.createPathElement()));
+		newChildDescriptors.add
+			(createChildParameter
+				(RepresentationPackage.Literals.CHILD_RULE__INSERTION_PATH,
+				 RepresentationFactory.eINSTANCE.createPathElement()));
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return RepresentationEditPlugin.INSTANCE;
 	}
 
 }
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/PaletteRuleItemProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/provider/PaletteRuleItemProvider.java
index 2cc754a7adb..43f19b90f9a 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/PaletteRuleItemProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/provider/PaletteRuleItemProvider.java
@@ -1,18 +1,17 @@
-/*****************************************************************************
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.viewpoints.configuration.provider;
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.gmfdiag.representation.provider;
 
 
 import java.util.Collection;
@@ -20,21 +19,24 @@ 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.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PaletteRule;
+import org.eclipse.papyrus.infra.architecture.representation.provider.RuleItemProvider;
+import org.eclipse.papyrus.infra.gmfdiag.representation.PaletteRule;
+import org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.viewpoints.configuration.PaletteRule} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.gmfdiag.representation.PaletteRule} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class PaletteRuleItemProvider
-		extends RuleItemProvider {
+public class PaletteRuleItemProvider extends RuleItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
@@ -68,39 +70,30 @@ public class PaletteRuleItemProvider
 	 * @generated
 	 */
 	protected void addElementPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_PaletteRule_element_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_PaletteRule_element_feature", "_UI_PaletteRule_type"),
-				ConfigurationPackage.Literals.PALETTE_RULE__ELEMENT,
-				true,
-				false,
-				false,
-				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				null,
-				null));
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_PaletteRule_element_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_PaletteRule_element_feature", "_UI_PaletteRule_type"),
+				 RepresentationPackage.Literals.PALETTE_RULE__ELEMENT,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
 	}
 
 	/**
 	 * This returns PaletteRule.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @generated NOT - Custom Image
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/PaletteRule.png"));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
-	protected boolean shouldComposeCreationImage() {
-		return true;
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/PaletteRule"));
 	}
 
 	/**
@@ -130,9 +123,9 @@ public class PaletteRuleItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(PaletteRule.class)) {
-		case ConfigurationPackage.PALETTE_RULE__ELEMENT:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
+			case RepresentationPackage.PALETTE_RULE__ELEMENT:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -149,4 +142,15 @@ public class PaletteRuleItemProvider
 		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 RepresentationEditPlugin.INSTANCE;
+	}
+
 }
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/provider/PapyrusDiagramItemProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/provider/PapyrusDiagramItemProvider.java
new file mode 100644
index 00000000000..0353561aa46
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/provider/PapyrusDiagramItemProvider.java
@@ -0,0 +1,255 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.gmfdiag.representation.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.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.architecture.representation.provider.PapyrusRepresentationKindItemProvider;
+import org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram;
+import org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationFactory;
+import org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class PapyrusDiagramItemProvider extends PapyrusRepresentationKindItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public PapyrusDiagramItemProvider(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);
+
+			addCustomPalettePropertyDescriptor(object);
+			addCustomStylePropertyDescriptor(object);
+			addCreationCommandClassPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Custom Palette feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addCustomPalettePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_PapyrusDiagram_customPalette_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_PapyrusDiagram_customPalette_feature", "_UI_PapyrusDiagram_type"),
+				 RepresentationPackage.Literals.PAPYRUS_DIAGRAM__CUSTOM_PALETTE,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Custom Style feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addCustomStylePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_PapyrusDiagram_customStyle_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_PapyrusDiagram_customStyle_feature", "_UI_PapyrusDiagram_type"),
+				 RepresentationPackage.Literals.PAPYRUS_DIAGRAM__CUSTOM_STYLE,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Creation Command Class feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addCreationCommandClassPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_PapyrusDiagram_creationCommandClass_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_PapyrusDiagram_creationCommandClass_feature", "_UI_PapyrusDiagram_type"),
+				 RepresentationPackage.Literals.PAPYRUS_DIAGRAM__CREATION_COMMAND_CLASS,
+				 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(RepresentationPackage.Literals.PAPYRUS_DIAGRAM__CHILD_RULES);
+			childrenFeatures.add(RepresentationPackage.Literals.PAPYRUS_DIAGRAM__PALETTE_RULES);
+			childrenFeatures.add(RepresentationPackage.Literals.PAPYRUS_DIAGRAM__ASSISTANT_RULES);
+		}
+		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 PapyrusDiagram.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/PapyrusDiagram"));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	@Override
+	public String getText(Object object) {
+		return getTextFor((PapyrusDiagram) object);
+	}
+	
+	/**
+	 * 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(PapyrusDiagram.class)) {
+			case RepresentationPackage.PAPYRUS_DIAGRAM__CUSTOM_PALETTE:
+			case RepresentationPackage.PAPYRUS_DIAGRAM__CUSTOM_STYLE:
+			case RepresentationPackage.PAPYRUS_DIAGRAM__CREATION_COMMAND_CLASS:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+			case RepresentationPackage.PAPYRUS_DIAGRAM__CHILD_RULES:
+			case RepresentationPackage.PAPYRUS_DIAGRAM__PALETTE_RULES:
+			case RepresentationPackage.PAPYRUS_DIAGRAM__ASSISTANT_RULES:
+				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
+				(RepresentationPackage.Literals.PAPYRUS_DIAGRAM__CHILD_RULES,
+				 RepresentationFactory.eINSTANCE.createChildRule()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(RepresentationPackage.Literals.PAPYRUS_DIAGRAM__PALETTE_RULES,
+				 RepresentationFactory.eINSTANCE.createPaletteRule()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(RepresentationPackage.Literals.PAPYRUS_DIAGRAM__ASSISTANT_RULES,
+				 RepresentationFactory.eINSTANCE.createAssistantRule()));
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return RepresentationEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/PathElementItemProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/provider/PathElementItemProvider.java
index 5ec7850a03d..6b9f2c42267 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/PathElementItemProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/provider/PathElementItemProvider.java
@@ -1,18 +1,17 @@
-/*****************************************************************************
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.viewpoints.configuration.provider;
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.gmfdiag.representation.provider;
 
 
 import java.util.Collection;
@@ -24,7 +23,6 @@ import org.eclipse.emf.common.util.ResourceLocator;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
@@ -32,19 +30,18 @@ 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.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.viewpoints.configuration.EReferencePropertyDescriptor;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PathElement;
+import org.eclipse.papyrus.infra.gmfdiag.representation.PathElement;
+import org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.viewpoints.configuration.PathElement} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.gmfdiag.representation.PathElement} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class PathElementItemProvider
-		extends ItemProviderAdapter
-		implements
+public class PathElementItemProvider 
+	extends ItemProviderAdapter
+	implements
 		IEditingDomainItemProvider,
 		IStructuredItemContentProvider,
 		ITreeItemContentProvider,
@@ -82,40 +79,44 @@ public class PathElementItemProvider
 	 * This adds a property descriptor for the Feature feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated NOT
 	 */
 	protected void addFeaturePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new EReferencePropertyDescriptor(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_PathElement_feature_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_PathElement_feature_feature", "_UI_PathElement_type"),
-				ConfigurationPackage.Literals.PATH_ELEMENT__FEATURE,
-				true,
-				false,
-				true,
-				null,
-				null,
-				null)));
+		itemPropertyDescriptors.add(new EReferencePropertyDescriptor
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_PathElement_feature_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_PathElement_feature_feature", "_UI_PathElement_type"),
+				 RepresentationPackage.Literals.PATH_ELEMENT__FEATURE,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null)));
 	}
 
 	/**
 	 * This adds a property descriptor for the Origin feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @generated
 	 */
 	protected void addOriginPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_PathElement_origin_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_PathElement_origin_feature", "_UI_PathElement_type"),
-				ConfigurationPackage.Literals.PATH_ELEMENT__ORIGIN,
-				false,
-				false,
-				false,
-				null,
-				null,
-				null));
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_PathElement_origin_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_PathElement_origin_feature", "_UI_PathElement_type"),
+				 RepresentationPackage.Literals.PATH_ELEMENT__ORIGIN,
+				 false,
+				 false,
+				 false,
+				 null,
+				 null,
+				 null));
 	}
 
 	/**
@@ -125,39 +126,30 @@ public class PathElementItemProvider
 	 * @generated
 	 */
 	protected void addTargetPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_PathElement_target_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_PathElement_target_feature", "_UI_PathElement_type"),
-				ConfigurationPackage.Literals.PATH_ELEMENT__TARGET,
-				false,
-				false,
-				false,
-				null,
-				null,
-				null));
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_PathElement_target_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_PathElement_target_feature", "_UI_PathElement_type"),
+				 RepresentationPackage.Literals.PATH_ELEMENT__TARGET,
+				 false,
+				 false,
+				 false,
+				 null,
+				 null,
+				 null));
 	}
 
 	/**
 	 * This returns PathElement.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @generated NOT - Custom Image
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/PathElement.png"));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
-	protected boolean shouldComposeCreationImage() {
-		return true;
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/PathElement"));
 	}
 
 	/**
@@ -213,7 +205,7 @@ public class PathElementItemProvider
 	 */
 	@Override
 	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender) adapterFactory).getResourceLocator();
+		return RepresentationEditPlugin.INSTANCE;
 	}
 
 }
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/ConfigurationEditPlugin.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/provider/RepresentationEditPlugin.java
index 900c9f4c6fb..ed568fb99e8 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/ConfigurationEditPlugin.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/provider/RepresentationEditPlugin.java
@@ -1,38 +1,42 @@
-/*****************************************************************************
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.viewpoints.configuration.provider;
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.gmfdiag.representation.provider;
 
 import org.eclipse.emf.common.EMFPlugin;
+
 import org.eclipse.emf.common.util.ResourceLocator;
+
 import org.eclipse.papyrus.infra.constraints.provider.ConstraintsEditPlugin;
-import org.eclipse.papyrus.infra.viewpoints.iso42010.provider.Iso42010EditPlugin;
+
+import org.eclipse.papyrus.infra.core.architecture.provider.ArchitectureEditPlugin;
+
+import org.eclipse.papyrus.infra.types.provider.TypesConfigurationsEditPlugin;
 
 /**
- * This is the central singleton for the Configuration edit plugin.
+ * This is the central singleton for the Representation edit plugin.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public final class ConfigurationEditPlugin extends EMFPlugin {
+public final class RepresentationEditPlugin extends EMFPlugin {
 	/**
 	 * Keep track of the singleton.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final ConfigurationEditPlugin INSTANCE = new ConfigurationEditPlugin();
+	public static final RepresentationEditPlugin INSTANCE = new RepresentationEditPlugin();
 
 	/**
 	 * Keep track of the singleton.
@@ -48,10 +52,14 @@ public final class ConfigurationEditPlugin extends EMFPlugin {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ConfigurationEditPlugin() {
-		super(new ResourceLocator[] {
-				ConstraintsEditPlugin.INSTANCE,
-				Iso42010EditPlugin.INSTANCE, });
+	public RepresentationEditPlugin() {
+		super
+		  (new ResourceLocator [] {
+		     ArchitectureEditPlugin.INSTANCE,
+		     ConstraintsEditPlugin.INSTANCE,
+		     TypesConfigurationsEditPlugin.INSTANCE,
+		     org.eclipse.papyrus.infra.architecture.representation.provider.RepresentationEditPlugin.INSTANCE,
+		   });
 	}
 
 	/**
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/provider/RepresentationItemProviderAdapterFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/provider/RepresentationItemProviderAdapterFactory.java
new file mode 100644
index 00000000000..952ebc72adf
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/provider/RepresentationItemProviderAdapterFactory.java
@@ -0,0 +1,400 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.gmfdiag.representation.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.command.CommandParameter;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.provider.ChangeNotifier;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IChangeNotifier;
+import org.eclipse.emf.edit.provider.IChildCreationExtender;
+import org.eclipse.emf.edit.provider.IDisposable;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.INotifyChangedListener;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage;
+import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
+import org.eclipse.papyrus.infra.core.architecture.util.ArchitectureSwitch;
+import org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationFactory;
+import org.eclipse.papyrus.infra.gmfdiag.representation.util.RepresentationAdapterFactory;
+
+/**
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * Note that most of the adapters are shared among multiple instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class RepresentationItemProviderAdapterFactory extends RepresentationAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+	/**
+	 * This keeps track of the root adapter factory that delegates to this adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory parentAdapterFactory;
+
+	/**
+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IChangeNotifier changeNotifier = new ChangeNotifier();
+
+	/**
+	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Object> supportedTypes = new ArrayList<Object>();
+
+	/**
+	 * This constructs an instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RepresentationItemProviderAdapterFactory() {
+		supportedTypes.add(IEditingDomainItemProvider.class);
+		supportedTypes.add(IStructuredItemContentProvider.class);
+		supportedTypes.add(ITreeItemContentProvider.class);
+		supportedTypes.add(IItemLabelProvider.class);
+		supportedTypes.add(IItemPropertySource.class);
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected PapyrusDiagramItemProvider papyrusDiagramItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createPapyrusDiagramAdapter() {
+		if (papyrusDiagramItemProvider == null) {
+			papyrusDiagramItemProvider = new PapyrusDiagramItemProvider(this);
+		}
+
+		return papyrusDiagramItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.gmfdiag.representation.ChildRule} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ChildRuleItemProvider childRuleItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.gmfdiag.representation.ChildRule}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createChildRuleAdapter() {
+		if (childRuleItemProvider == null) {
+			childRuleItemProvider = new ChildRuleItemProvider(this);
+		}
+
+		return childRuleItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.gmfdiag.representation.PaletteRule} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected PaletteRuleItemProvider paletteRuleItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.gmfdiag.representation.PaletteRule}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createPaletteRuleAdapter() {
+		if (paletteRuleItemProvider == null) {
+			paletteRuleItemProvider = new PaletteRuleItemProvider(this);
+		}
+
+		return paletteRuleItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.gmfdiag.representation.PathElement} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected PathElementItemProvider pathElementItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.gmfdiag.representation.PathElement}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createPathElementAdapter() {
+		if (pathElementItemProvider == null) {
+			pathElementItemProvider = new PathElementItemProvider(this);
+		}
+
+		return pathElementItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.gmfdiag.representation.AssistantRule} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AssistantRuleItemProvider assistantRuleItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.gmfdiag.representation.AssistantRule}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createAssistantRuleAdapter() {
+		if (assistantRuleItemProvider == null) {
+			assistantRuleItemProvider = new AssistantRuleItemProvider(this);
+		}
+
+		return assistantRuleItemProvider;
+	}
+
+	/**
+	 * This returns the root adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ComposeableAdapterFactory getRootAdapterFactory() {
+		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
+	}
+
+	/**
+	 * This sets the composed adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
+		this.parentAdapterFactory = parentAdapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object type) {
+		return supportedTypes.contains(type) || super.isFactoryForType(type);
+	}
+
+	/**
+	 * This implementation substitutes the factory itself as the key for the adapter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter adapt(Notifier notifier, Object type) {
+		return super.adapt(notifier, this);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object adapt(Object object, Object type) {
+		if (isFactoryForType(type)) {
+			Object adapter = super.adapt(object, type);
+			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
+				return adapter;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * This adds a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void addListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.addListener(notifyChangedListener);
+	}
+
+	/**
+	 * This removes a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void removeListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.removeListener(notifyChangedListener);
+	}
+
+	/**
+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void fireNotifyChanged(Notification notification) {
+		changeNotifier.fireNotifyChanged(notification);
+
+		if (parentAdapterFactory != null) {
+			parentAdapterFactory.fireNotifyChanged(notification);
+		}
+	}
+
+	/**
+	 * This disposes all of the item providers created by this factory. 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void dispose() {
+		if (papyrusDiagramItemProvider != null) papyrusDiagramItemProvider.dispose();
+		if (childRuleItemProvider != null) childRuleItemProvider.dispose();
+		if (paletteRuleItemProvider != null) paletteRuleItemProvider.dispose();
+		if (pathElementItemProvider != null) pathElementItemProvider.dispose();
+		if (assistantRuleItemProvider != null) assistantRuleItemProvider.dispose();
+	}
+
+	/**
+	 * A child creation extender for the {@link ArchitecturePackage}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static class ArchitectureChildCreationExtender implements IChildCreationExtender {
+		/**
+		 * The switch for creating child descriptors specific to each extended class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected static class CreationSwitch extends ArchitectureSwitch<Object> {
+			/**
+			 * The child descriptors being populated.
+			 * <!-- begin-user-doc -->
+			 * <!-- end-user-doc -->
+			 * @generated
+			 */
+			protected List<Object> newChildDescriptors;
+
+			/**
+			 * The domain in which to create the children.
+			 * <!-- begin-user-doc -->
+			 * <!-- end-user-doc -->
+			 * @generated
+			 */
+			protected EditingDomain editingDomain;
+
+			/**
+			 * Creates the a switch for populating child descriptors in the given domain.
+			 * <!-- begin-user-doc -->
+			 * <!-- end-user-doc -->
+			 * @generated
+			 */
+			CreationSwitch(List<Object> newChildDescriptors, EditingDomain editingDomain) {
+				this.newChildDescriptors = newChildDescriptors;
+				this.editingDomain = editingDomain;
+			}
+			/**
+			 * <!-- begin-user-doc -->
+			 * <!-- end-user-doc -->
+			 * @generated
+			 */
+			@Override
+			public Object caseArchitectureDescriptionLanguage(ArchitectureDescriptionLanguage object) {
+				newChildDescriptors.add
+					(createChildParameter
+						(ArchitecturePackage.Literals.ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS,
+						 RepresentationFactory.eINSTANCE.createPapyrusDiagram()));
+
+				return null;
+			}
+ 
+			/**
+			 * <!-- begin-user-doc -->
+			 * <!-- end-user-doc -->
+			 * @generated
+			 */
+			protected CommandParameter createChildParameter(Object feature, Object child) {
+				return new CommandParameter(null, feature, child);
+			}
+
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public Collection<Object> getNewChildDescriptors(Object object, EditingDomain editingDomain) {
+			ArrayList<Object> result = new ArrayList<Object>();
+			new CreationSwitch(result, editingDomain).doSwitch((EObject)object);
+			return result;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public ResourceLocator getResourceLocator() {
+			return RepresentationEditPlugin.INSTANCE;
+		}
+	}
+
+}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/EReferencePropertyDescriptor.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src/org/eclipse/papyrus/infra/gmfdiag/representation/provider/EReferencePropertyDescriptor.java
index 927c39b0f9f..56db6755691 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/EReferencePropertyDescriptor.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src/org/eclipse/papyrus/infra/gmfdiag/representation/provider/EReferencePropertyDescriptor.java
@@ -8,10 +8,10 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *  Maged Elaasar - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.infra.viewpoints.configuration;
+package org.eclipse.papyrus.infra.gmfdiag.representation.provider;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -19,6 +19,8 @@ import java.util.Collection;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.infra.core.architecture.provider.SurrogateItemPropertyDescriptor;
+import org.eclipse.papyrus.infra.gmfdiag.representation.PathElement;
 
 /**
  * Represents a descriptor for properties of type EReference
@@ -41,13 +43,6 @@ public class EReferencePropertyDescriptor extends SurrogateItemPropertyDescripto
 				return empty;
 			}
 			return origin.getEAllReferences();
-		} else if (object instanceof ModelAutoCreate) {
-			ModelAutoCreate pe = (ModelAutoCreate) object;
-			EClass origin = pe.getOrigin();
-			if (origin == null) {
-				return empty;
-			}
-			return origin.getEAllReferences();
 		}
 		return empty;
 	}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/.classpath
new file mode 100644
index 00000000000..2534a1484b3
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/.classpath
@@ -0,0 +1,8 @@
+<?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/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/.project
new file mode 100644
index 00000000000..9a3cbe0a1ca
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.gmfdiag.representation</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.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..9ae204e9cbf
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/META-INF/MANIFEST.MF
@@ -0,0 +1,19 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.representation;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.representation,
+ org.eclipse.papyrus.infra.gmfdiag.representation.impl,
+ org.eclipse.papyrus.infra.gmfdiag.representation.util
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.papyrus.infra.core.architecture;visibility:=reexport,
+ org.eclipse.papyrus.infra.constraints;visibility:=reexport,
+ org.eclipse.papyrus.infra.types;visibility:=reexport,
+ org.eclipse.papyrus.infra.architecture.representation;visibility:=reexport
+Bundle-ActivationPolicy: lazy
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/about.html b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/about.html
new file mode 100755
index 00000000000..6e189dc4483
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/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>June 1, 2017</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/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/build.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/build.properties
new file mode 100644
index 00000000000..9c8bb397136
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/build.properties
@@ -0,0 +1,21 @@
+# Copyright (c) 2017 CEA LIST.
+# 
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#  
+#  Contributors:
+#  Maged Elaasar - Initial API and implementation
+#  
+# 
+
+bin.includes = .,\
+               model/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties
+jars.compile.order = .
+source.. = src-gen/,\
+           src/
+output.. = bin/
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.ecore b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.ecore
new file mode 100755
index 00000000000..db0a46e3490
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.ecore
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="representation" nsURI="http://www.eclipse.org/papyrus/infra/gmfdiag/representation"
+    nsPrefix="gmfdiagrepresentation">
+  <eClassifiers xsi:type="ecore:EClass" name="PapyrusDiagram" eSuperTypes="../../org.eclipse.papyrus.infra.architecture.representation/model/Representation.ecore#//PapyrusRepresentationKind">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="customPalette" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="customStyle" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="childRules" upperBound="-1"
+        eType="#//ChildRule" containment="true">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="These rules determine which model elements can be added as child of the origin through this diagram"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="paletteRules" upperBound="-1"
+        eType="#//PaletteRule" containment="true">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="These rules determine which palette elements should be available for this diagram"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="assistantRules" upperBound="-1"
+        eType="#//AssistantRule" containment="true">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="These rules determine which modeling assistants should be presented in this diagram"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="creationCommandClass" lowerBound="1">
+      <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
+        <eTypeArguments/>
+      </eGenericType>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ChildRule" eSuperTypes="../../org.eclipse.papyrus.infra.architecture.representation/model/Representation.ecore#//Rule">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="element" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="stereotypes" upperBound="-1"
+        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="origin" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="insertionPath" upperBound="-1"
+        eType="#//PathElement" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="PaletteRule" eSuperTypes="../../org.eclipse.papyrus.infra.architecture.representation/model/Representation.ecore#//Rule">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="element" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="PathElement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="feature" lowerBound="1"
+        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EReference"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="origin" lowerBound="1"
+        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass" changeable="false"
+        volatile="true" transient="true" derived="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"
+        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass" changeable="false"
+        volatile="true" transient="true" derived="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="AssistantRule" eSuperTypes="../../org.eclipse.papyrus.infra.architecture.representation/model/Representation.ecore#//Rule">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="A rule that permits or forbids one or more modeling assistants by element type ID."/>
+    </eAnnotations>
+    <eOperations name="matches" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Queries whether I match a given &lt;tt>elementType&lt;/tt>."/>
+      </eAnnotations>
+      <eParameters name="elementType" lowerBound="1" eType="#//ElementType"/>
+    </eOperations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="elementTypeID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="&lt;p>&#xA;Modeling assistants are identified by the ID of the element type that they create.&#xA;This element type ID supports very simple wildcard patterns:  an asterisk (&lt;tt>*&lt;/tt>)&#xA;may be used to match any substring, including the empty substring.  This is&#xA;particularly useful to match an entire family of related element types by namespace&#xA;prefix, using a terminal asterisk.&#xA;&lt;/p>&lt;p>&#xA;If the element type ID is omitted, then the rule applies to all element types&#xA;(universal wildcard).&#xA;&lt;/p>"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EDataType" name="ElementType" instanceClassName="org.eclipse.gmf.runtime.emf.type.core.IElementType"/>
+</ecore:EPackage>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.genmodel b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.genmodel
new file mode 100644
index 00000000000..f9e316def3f
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.genmodel
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2017 CEA LIST.&#xD;&#xA;&#xD;&#xA; All rights reserved. This program and the accompanying materials&#xD;&#xA; are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA; which accompanies this distribution, and is available at&#xD;&#xA; http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA; &#xD;&#xA; Contributors:&#xD;&#xA; Maged Elaasar - Initial API and implementation&#xD;&#xA; &#xD;&#xA;"
+    modelDirectory="/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen" editDirectory="/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src-gen"
+    editorDirectory="/org.eclipse.papyrus.infra.gmfdiag.representation.editor/src-gen"
+    modelPluginID="org.eclipse.papyrus.infra.gmfdiag.representation" modelName="Representation"
+    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory="/org.eclipse.papyrus.infra.gmfdiag.representation.tests/src-gen"
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
+    editPluginID="org.eclipse.papyrus.infra.gmfdiag.representation.edit" editorPluginID="org.eclipse.papyrus.infra.gmfdiag.representation.editor"
+    usedGenPackages="../../org.eclipse.papyrus.infra.core.architecture/model/Architecture.genmodel#//architecture ../../org.eclipse.papyrus.infra.constraints/Model/Constraints.genmodel#//constraints ../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel#//types ../../org.eclipse.papyrus.infra.architecture.representation/model/Representation.genmodel#//representation"
+    operationReflection="true" importOrganizing="true">
+  <foreignModel>GmfDiagRepresentation.ecore</foreignModel>
+  <genPackages prefix="Representation" basePackage="org.eclipse.papyrus.infra.gmfdiag"
+      disposableProviderFactory="true" childCreationExtenders="true" ecorePackage="GmfDiagRepresentation.ecore#/">
+    <genDataTypes ecoreDataType="GmfDiagRepresentation.ecore#//ElementType"/>
+    <genClasses ecoreClass="GmfDiagRepresentation.ecore#//PapyrusDiagram">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute GmfDiagRepresentation.ecore#//PapyrusDiagram/customPalette"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute GmfDiagRepresentation.ecore#//PapyrusDiagram/customStyle"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference GmfDiagRepresentation.ecore#//PapyrusDiagram/childRules"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference GmfDiagRepresentation.ecore#//PapyrusDiagram/paletteRules"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference GmfDiagRepresentation.ecore#//PapyrusDiagram/assistantRules"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute GmfDiagRepresentation.ecore#//PapyrusDiagram/creationCommandClass"/>
+    </genClasses>
+    <genClasses ecoreClass="GmfDiagRepresentation.ecore#//ChildRule">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference GmfDiagRepresentation.ecore#//ChildRule/element"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference GmfDiagRepresentation.ecore#//ChildRule/stereotypes"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference GmfDiagRepresentation.ecore#//ChildRule/origin"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference GmfDiagRepresentation.ecore#//ChildRule/insertionPath"/>
+    </genClasses>
+    <genClasses ecoreClass="GmfDiagRepresentation.ecore#//PaletteRule">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute GmfDiagRepresentation.ecore#//PaletteRule/element"/>
+    </genClasses>
+    <genClasses ecoreClass="GmfDiagRepresentation.ecore#//PathElement">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference GmfDiagRepresentation.ecore#//PathElement/feature"/>
+      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference GmfDiagRepresentation.ecore#//PathElement/origin"/>
+      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference GmfDiagRepresentation.ecore#//PathElement/target"/>
+    </genClasses>
+    <genClasses ecoreClass="GmfDiagRepresentation.ecore#//AssistantRule">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute GmfDiagRepresentation.ecore#//AssistantRule/elementTypeID"/>
+      <genOperations ecoreOperation="GmfDiagRepresentation.ecore#//AssistantRule/matches">
+        <genParameters ecoreParameter="GmfDiagRepresentation.ecore#//AssistantRule/matches/elementType"/>
+      </genOperations>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/plugin.properties
new file mode 100644
index 00000000000..a9fce49926f
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/plugin.properties
@@ -0,0 +1,14 @@
+# Copyright (c) 2017 CEA LIST.
+# 
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#  
+#  Contributors:
+#  Maged Elaasar - Initial API and implementation
+#  
+# 
+
+pluginName = GMF Representation Model
+providerName = Eclipse Modeling Project
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/plugin.xml
new file mode 100644
index 00000000000..8db0a40082c
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/plugin.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+ Copyright (c) 2017 CEA LIST.
+ 
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/legal/epl-v10.html
+  
+  Contributors:
+  Maged Elaasar - Initial API and implementation
+  
+ 
+-->
+
+<plugin>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated Representation -->
+      <package
+            uri="http://www.eclipse.org/papyrus/infra/gmfdiag/representation"
+            class="org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage"
+            genModel="model/GmfDiagRepresentation.genmodel"/>
+   </extension>
+
+   <extension
+         point="org.eclipse.emf.ecore.factory_override">
+      <factory
+            uri="http://www.eclipse.org/papyrus/infra/gmfdiag/representation"
+            class="org.eclipse.papyrus.infra.gmfdiag.representation.impl.RepresentationFactoryCustomImpl">
+      </factory>
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/pom.xml
new file mode 100755
index 00000000000..1024ce67b32
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/pom.xml
@@ -0,0 +1,13 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.gmfdiag.representation</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+	<description>Papyrus fork of org.eclipse.gmf.tooling.runtime to remain in the release train</description>
+</project>
\ No newline at end of file
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/AssistantRule.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/AssistantRule.java
index 1b466629d14..4cb0fde881d 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/AssistantRule.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/AssistantRule.java
@@ -1,20 +1,21 @@
 /**
- * Copyright (c) 2015 Christian W. Damus and others.
- *
+ * Copyright (c) 2017 CEA LIST.
+ * 
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
  *  which accompanies this distribution, and is available at
  *  http://www.eclipse.org/legal/epl-v10.html
- *
+ *  
  *  Contributors:
- *  Christian W. Damus - Initial API and implementation
- *
- *
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
  */
-package org.eclipse.papyrus.infra.viewpoints.configuration;
+package org.eclipse.papyrus.infra.gmfdiag.representation;
 
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 
+import org.eclipse.papyrus.infra.architecture.representation.Rule;
 
 /**
  * <!-- begin-user-doc -->
@@ -29,10 +30,10 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.AssistantRule#getElementTypeID <em>Element Type ID</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.AssistantRule#getElementTypeID <em>Element Type ID</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getAssistantRule()
+ * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getAssistantRule()
  * @model
  * @generated
  */
@@ -55,14 +56,14 @@ public interface AssistantRule extends Rule {
 	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Element Type ID</em>' attribute.
 	 * @see #setElementTypeID(String)
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getAssistantRule_ElementTypeID()
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getAssistantRule_ElementTypeID()
 	 * @model
 	 * @generated
 	 */
 	String getElementTypeID();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.AssistantRule#getElementTypeID <em>Element Type ID</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.representation.AssistantRule#getElementTypeID <em>Element Type ID</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Element Type ID</em>' attribute.
@@ -77,7 +78,7 @@ public interface AssistantRule extends Rule {
 	 * <!-- begin-model-doc -->
 	 * Queries whether I match a given <tt>elementType</tt>.
 	 * <!-- end-model-doc -->
-	 * @model required="true" elementTypeDataType="org.eclipse.papyrus.infra.viewpoints.configuration.ElementType" elementTypeRequired="true"
+	 * @model required="true" elementTypeDataType="org.eclipse.papyrus.infra.gmfdiag.representation.ElementType" elementTypeRequired="true"
 	 * @generated
 	 */
 	boolean matches(IElementType elementType);
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/ChildRule.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/ChildRule.java
index 78479a3827b..b1ee340f9ec 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/ChildRule.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/ChildRule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 CEA LIST.
+ * Copyright (c) 2017 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
@@ -7,16 +7,18 @@
  *  http://www.eclipse.org/legal/epl-v10.html
  *  
  *  Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *  Maged Elaasar - Initial API and implementation
  *  
  * 
  */
-package org.eclipse.papyrus.infra.viewpoints.configuration;
+package org.eclipse.papyrus.infra.gmfdiag.representation;
 
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.emf.ecore.EClass;
 
+import org.eclipse.papyrus.infra.architecture.representation.Rule;
+
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Child Rule</b></em>'.
@@ -26,13 +28,13 @@ import org.eclipse.emf.ecore.EClass;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.ChildRule#getElement <em>Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.ChildRule#getStereotypes <em>Stereotypes</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.ChildRule#getOrigin <em>Origin</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.ChildRule#getInsertionPath <em>Insertion Path</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.ChildRule#getElement <em>Element</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.ChildRule#getStereotypes <em>Stereotypes</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.ChildRule#getOrigin <em>Origin</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.ChildRule#getInsertionPath <em>Insertion Path</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getChildRule()
+ * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getChildRule()
  * @model
  * @generated
  */
@@ -47,14 +49,14 @@ public interface ChildRule extends Rule {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Element</em>' reference.
 	 * @see #setElement(EClass)
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getChildRule_Element()
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getChildRule_Element()
 	 * @model
 	 * @generated
 	 */
 	EClass getElement();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.ChildRule#getElement <em>Element</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.representation.ChildRule#getElement <em>Element</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Element</em>' reference.
@@ -73,7 +75,7 @@ public interface ChildRule extends Rule {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Stereotypes</em>' reference list.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getChildRule_Stereotypes()
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getChildRule_Stereotypes()
 	 * @model
 	 * @generated
 	 */
@@ -89,14 +91,14 @@ public interface ChildRule extends Rule {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Origin</em>' reference.
 	 * @see #setOrigin(EClass)
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getChildRule_Origin()
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getChildRule_Origin()
 	 * @model
 	 * @generated
 	 */
 	EClass getOrigin();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.ChildRule#getOrigin <em>Origin</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.representation.ChildRule#getOrigin <em>Origin</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Origin</em>' reference.
@@ -107,7 +109,7 @@ public interface ChildRule extends Rule {
 
 	/**
 	 * Returns the value of the '<em><b>Insertion Path</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.configuration.PathElement}.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.representation.PathElement}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Insertion Path</em>' containment reference list isn't clear,
@@ -115,7 +117,7 @@ public interface ChildRule extends Rule {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Insertion Path</em>' containment reference list.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getChildRule_InsertionPath()
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getChildRule_InsertionPath()
 	 * @model containment="true"
 	 * @generated
 	 */
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/PaletteRule.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/PaletteRule.java
index b1bfe75140a..a0531e7db50 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/PaletteRule.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/PaletteRule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 CEA LIST.
+ * Copyright (c) 2017 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
@@ -7,12 +7,13 @@
  *  http://www.eclipse.org/legal/epl-v10.html
  *  
  *  Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *  Maged Elaasar - Initial API and implementation
  *  
  * 
  */
-package org.eclipse.papyrus.infra.viewpoints.configuration;
+package org.eclipse.papyrus.infra.gmfdiag.representation;
 
+import org.eclipse.papyrus.infra.architecture.representation.Rule;
 
 /**
  * <!-- begin-user-doc -->
@@ -23,10 +24,10 @@ package org.eclipse.papyrus.infra.viewpoints.configuration;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.PaletteRule#getElement <em>Element</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.PaletteRule#getElement <em>Element</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getPaletteRule()
+ * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getPaletteRule()
  * @model
  * @generated
  */
@@ -41,14 +42,14 @@ public interface PaletteRule extends Rule {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Element</em>' attribute.
 	 * @see #setElement(String)
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getPaletteRule_Element()
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getPaletteRule_Element()
 	 * @model
 	 * @generated
 	 */
 	String getElement();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PaletteRule#getElement <em>Element</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.representation.PaletteRule#getElement <em>Element</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Element</em>' attribute.
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/PapyrusDiagram.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/PapyrusDiagram.java
index 6c8f709ef40..5fcbaf71c45 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/PapyrusDiagram.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/PapyrusDiagram.java
@@ -1,21 +1,22 @@
 /**
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
+ * Copyright (c) 2017 CEA LIST.
+ * 
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
  *  which accompanies this distribution, and is available at
  *  http://www.eclipse.org/legal/epl-v10.html
- *
+ *  
  *  Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
  */
-package org.eclipse.papyrus.infra.viewpoints.configuration;
+package org.eclipse.papyrus.infra.gmfdiag.representation;
 
 import org.eclipse.emf.common.util.EList;
 
+import org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind;
+
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Papyrus Diagram</b></em>'.
@@ -25,18 +26,19 @@ import org.eclipse.emf.common.util.EList;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram#getCustomPalette <em>Custom Palette</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram#getCustomStyle <em>Custom Style</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram#getChildRules <em>Child Rules</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram#getPaletteRules <em>Palette Rules</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram#getAssistantRules <em>Assistant Rules</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#getCustomPalette <em>Custom Palette</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#getCustomStyle <em>Custom Style</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#getChildRules <em>Child Rules</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#getPaletteRules <em>Palette Rules</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#getAssistantRules <em>Assistant Rules</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#getCreationCommandClass <em>Creation Command Class</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getPapyrusDiagram()
+ * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getPapyrusDiagram()
  * @model
  * @generated
  */
-public interface PapyrusDiagram extends PapyrusView {
+public interface PapyrusDiagram extends PapyrusRepresentationKind {
 	/**
 	 * Returns the value of the '<em><b>Custom Palette</b></em>' attribute.
 	 * <!-- begin-user-doc -->
@@ -47,14 +49,14 @@ public interface PapyrusDiagram extends PapyrusView {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Custom Palette</em>' attribute.
 	 * @see #setCustomPalette(String)
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getPapyrusDiagram_CustomPalette()
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getPapyrusDiagram_CustomPalette()
 	 * @model
 	 * @generated
 	 */
 	String getCustomPalette();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram#getCustomPalette <em>Custom Palette</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#getCustomPalette <em>Custom Palette</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Custom Palette</em>' attribute.
@@ -73,14 +75,14 @@ public interface PapyrusDiagram extends PapyrusView {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Custom Style</em>' attribute.
 	 * @see #setCustomStyle(String)
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getPapyrusDiagram_CustomStyle()
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getPapyrusDiagram_CustomStyle()
 	 * @model
 	 * @generated
 	 */
 	String getCustomStyle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram#getCustomStyle <em>Custom Style</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#getCustomStyle <em>Custom Style</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Custom Style</em>' attribute.
@@ -91,14 +93,14 @@ public interface PapyrusDiagram extends PapyrusView {
 
 	/**
 	 * Returns the value of the '<em><b>Child Rules</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.configuration.ChildRule}.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.representation.ChildRule}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
 	 * These rules determine which model elements can be added as child of the origin through this diagram
 	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Child Rules</em>' containment reference list.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getPapyrusDiagram_ChildRules()
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getPapyrusDiagram_ChildRules()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -106,14 +108,14 @@ public interface PapyrusDiagram extends PapyrusView {
 
 	/**
 	 * Returns the value of the '<em><b>Palette Rules</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.configuration.PaletteRule}.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.representation.PaletteRule}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
 	 * These rules determine which palette elements should be available for this diagram
 	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Palette Rules</em>' containment reference list.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getPapyrusDiagram_PaletteRules()
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getPapyrusDiagram_PaletteRules()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -121,17 +123,43 @@ public interface PapyrusDiagram extends PapyrusView {
 
 	/**
 	 * Returns the value of the '<em><b>Assistant Rules</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.configuration.AssistantRule}.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.representation.AssistantRule}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
 	 * These rules determine which modeling assistants should be presented in this diagram
 	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Assistant Rules</em>' containment reference list.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getPapyrusDiagram_AssistantRules()
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getPapyrusDiagram_AssistantRules()
 	 * @model containment="true"
 	 * @generated
 	 */
 	EList<AssistantRule> getAssistantRules();
 
+	/**
+	 * Returns the value of the '<em><b>Creation Command Class</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Creation Command Class</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Creation Command Class</em>' attribute.
+	 * @see #setCreationCommandClass(Class)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getPapyrusDiagram_CreationCommandClass()
+	 * @model required="true"
+	 * @generated
+	 */
+	Class<?> getCreationCommandClass();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#getCreationCommandClass <em>Creation Command Class</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Creation Command Class</em>' attribute.
+	 * @see #getCreationCommandClass()
+	 * @generated
+	 */
+	void setCreationCommandClass(Class<?> value);
+
 } // PapyrusDiagram
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/PathElement.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/PathElement.java
index 33bb78650ba..15dafaaea3d 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/PathElement.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/PathElement.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 CEA LIST.
+ * Copyright (c) 2017 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
@@ -7,11 +7,11 @@
  *  http://www.eclipse.org/legal/epl-v10.html
  *  
  *  Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *  Maged Elaasar - Initial API and implementation
  *  
  * 
  */
-package org.eclipse.papyrus.infra.viewpoints.configuration;
+package org.eclipse.papyrus.infra.gmfdiag.representation;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
@@ -26,12 +26,12 @@ import org.eclipse.emf.ecore.EReference;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.PathElement#getFeature <em>Feature</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.PathElement#getOrigin <em>Origin</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.PathElement#getTarget <em>Target</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.PathElement#getFeature <em>Feature</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.PathElement#getOrigin <em>Origin</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.PathElement#getTarget <em>Target</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getPathElement()
+ * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getPathElement()
  * @model
  * @generated
  */
@@ -46,14 +46,14 @@ public interface PathElement extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Feature</em>' reference.
 	 * @see #setFeature(EReference)
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getPathElement_Feature()
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getPathElement_Feature()
 	 * @model required="true"
 	 * @generated
 	 */
 	EReference getFeature();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PathElement#getFeature <em>Feature</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.representation.PathElement#getFeature <em>Feature</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Feature</em>' reference.
@@ -71,7 +71,7 @@ public interface PathElement extends EObject {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Origin</em>' reference.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getPathElement_Origin()
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getPathElement_Origin()
 	 * @model required="true" transient="true" changeable="false" volatile="true" derived="true"
 	 * @generated
 	 */
@@ -86,7 +86,7 @@ public interface PathElement extends EObject {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Target</em>' reference.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getPathElement_Target()
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getPathElement_Target()
 	 * @model required="true" transient="true" changeable="false" volatile="true" derived="true"
 	 * @generated
 	 */
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/RepresentationFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/RepresentationFactory.java
new file mode 100644
index 00000000000..dab240c8c32
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/RepresentationFactory.java
@@ -0,0 +1,89 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.gmfdiag.representation;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage
+ * @generated
+ */
+public interface RepresentationFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	RepresentationFactory eINSTANCE = org.eclipse.papyrus.infra.gmfdiag.representation.impl.RepresentationFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Papyrus Diagram</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Papyrus Diagram</em>'.
+	 * @generated
+	 */
+	PapyrusDiagram createPapyrusDiagram();
+
+	/**
+	 * Returns a new object of class '<em>Child Rule</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Child Rule</em>'.
+	 * @generated
+	 */
+	ChildRule createChildRule();
+
+	/**
+	 * Returns a new object of class '<em>Palette Rule</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Palette Rule</em>'.
+	 * @generated
+	 */
+	PaletteRule createPaletteRule();
+
+	/**
+	 * Returns a new object of class '<em>Path Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Path Element</em>'.
+	 * @generated
+	 */
+	PathElement createPathElement();
+
+	/**
+	 * Returns a new object of class '<em>Assistant Rule</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Assistant Rule</em>'.
+	 * @generated
+	 */
+	AssistantRule createAssistantRule();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	RepresentationPackage getRepresentationPackage();
+
+} //RepresentationFactory
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/RepresentationPackage.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/RepresentationPackage.java
new file mode 100644
index 00000000000..ea9b14d2316
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/RepresentationPackage.java
@@ -0,0 +1,933 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.gmfdiag.representation;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ *   <li>each class,</li>
+ *   <li>each feature of each class,</li>
+ *   <li>each operation of each class,</li>
+ *   <li>each enum,</li>
+ *   <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface RepresentationPackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "representation";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/infra/gmfdiag/representation";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "gmfdiagrepresentation";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	RepresentationPackage eINSTANCE = org.eclipse.papyrus.infra.gmfdiag.representation.impl.RepresentationPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.representation.impl.PapyrusDiagramImpl <em>Papyrus Diagram</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.impl.PapyrusDiagramImpl
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.impl.RepresentationPackageImpl#getPapyrusDiagram()
+	 * @generated
+	 */
+	int PAPYRUS_DIAGRAM = 0;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_DIAGRAM__NAME = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Desciption</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_DIAGRAM__DESCIPTION = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__DESCIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_DIAGRAM__QUALIFIED_NAME = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Language</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_DIAGRAM__LANGUAGE = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__LANGUAGE;
+
+	/**
+	 * The feature id for the '<em><b>Concerns</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_DIAGRAM__CONCERNS = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__CONCERNS;
+
+	/**
+	 * The feature id for the '<em><b>Icon</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_DIAGRAM__ICON = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__ICON;
+
+	/**
+	 * The feature id for the '<em><b>Parent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_DIAGRAM__PARENT = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__PARENT;
+
+	/**
+	 * The feature id for the '<em><b>Model Rules</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_DIAGRAM__MODEL_RULES = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__MODEL_RULES;
+
+	/**
+	 * The feature id for the '<em><b>Owning Rules</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_DIAGRAM__OWNING_RULES = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__OWNING_RULES;
+
+	/**
+	 * The feature id for the '<em><b>Implementation ID</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_DIAGRAM__IMPLEMENTATION_ID = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__IMPLEMENTATION_ID;
+
+	/**
+	 * The feature id for the '<em><b>Custom Palette</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_DIAGRAM__CUSTOM_PALETTE = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Custom Style</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_DIAGRAM__CUSTOM_STYLE = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Child Rules</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_DIAGRAM__CHILD_RULES = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Palette Rules</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_DIAGRAM__PALETTE_RULES = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Assistant Rules</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_DIAGRAM__ASSISTANT_RULES = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Creation Command Class</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_DIAGRAM__CREATION_COMMAND_CLASS = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND_FEATURE_COUNT + 5;
+
+	/**
+	 * The number of structural features of the '<em>Papyrus Diagram</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_DIAGRAM_FEATURE_COUNT = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND_FEATURE_COUNT + 6;
+
+	/**
+	 * The number of operations of the '<em>Papyrus Diagram</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_DIAGRAM_OPERATION_COUNT = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.representation.impl.ChildRuleImpl <em>Child Rule</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.impl.ChildRuleImpl
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.impl.RepresentationPackageImpl#getChildRule()
+	 * @generated
+	 */
+	int CHILD_RULE = 1;
+
+	/**
+	 * The feature id for the '<em><b>Permit</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHILD_RULE__PERMIT = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.RULE__PERMIT;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHILD_RULE__ELEMENT = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.RULE_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Stereotypes</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHILD_RULE__STEREOTYPES = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.RULE_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Origin</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHILD_RULE__ORIGIN = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.RULE_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Insertion Path</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHILD_RULE__INSERTION_PATH = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.RULE_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of structural features of the '<em>Child Rule</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHILD_RULE_FEATURE_COUNT = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.RULE_FEATURE_COUNT + 4;
+
+	/**
+	 * The number of operations of the '<em>Child Rule</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHILD_RULE_OPERATION_COUNT = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.RULE_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.representation.impl.PaletteRuleImpl <em>Palette Rule</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.impl.PaletteRuleImpl
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.impl.RepresentationPackageImpl#getPaletteRule()
+	 * @generated
+	 */
+	int PALETTE_RULE = 2;
+
+	/**
+	 * The feature id for the '<em><b>Permit</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PALETTE_RULE__PERMIT = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.RULE__PERMIT;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PALETTE_RULE__ELEMENT = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.RULE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Palette Rule</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PALETTE_RULE_FEATURE_COUNT = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.RULE_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Palette Rule</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PALETTE_RULE_OPERATION_COUNT = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.RULE_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.representation.impl.PathElementImpl <em>Path Element</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.impl.PathElementImpl
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.impl.RepresentationPackageImpl#getPathElement()
+	 * @generated
+	 */
+	int PATH_ELEMENT = 3;
+
+	/**
+	 * The feature id for the '<em><b>Feature</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PATH_ELEMENT__FEATURE = 0;
+
+	/**
+	 * The feature id for the '<em><b>Origin</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PATH_ELEMENT__ORIGIN = 1;
+
+	/**
+	 * The feature id for the '<em><b>Target</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PATH_ELEMENT__TARGET = 2;
+
+	/**
+	 * The number of structural features of the '<em>Path Element</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PATH_ELEMENT_FEATURE_COUNT = 3;
+
+	/**
+	 * The number of operations of the '<em>Path Element</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PATH_ELEMENT_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.representation.impl.AssistantRuleImpl <em>Assistant Rule</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.impl.AssistantRuleImpl
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.impl.RepresentationPackageImpl#getAssistantRule()
+	 * @generated
+	 */
+	int ASSISTANT_RULE = 4;
+
+	/**
+	 * The feature id for the '<em><b>Permit</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ASSISTANT_RULE__PERMIT = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.RULE__PERMIT;
+
+	/**
+	 * The feature id for the '<em><b>Element Type ID</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ASSISTANT_RULE__ELEMENT_TYPE_ID = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.RULE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Assistant Rule</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ASSISTANT_RULE_FEATURE_COUNT = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.RULE_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Matches</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ASSISTANT_RULE___MATCHES__IELEMENTTYPE = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.RULE_OPERATION_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Assistant Rule</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ASSISTANT_RULE_OPERATION_COUNT = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.RULE_OPERATION_COUNT + 1;
+
+	/**
+	 * The meta object id for the '<em>Element Type</em>' data type.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.gmf.runtime.emf.type.core.IElementType
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.impl.RepresentationPackageImpl#getElementType()
+	 * @generated
+	 */
+	int ELEMENT_TYPE = 5;
+
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram <em>Papyrus Diagram</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Papyrus Diagram</em>'.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram
+	 * @generated
+	 */
+	EClass getPapyrusDiagram();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#getCustomPalette <em>Custom Palette</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Custom Palette</em>'.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#getCustomPalette()
+	 * @see #getPapyrusDiagram()
+	 * @generated
+	 */
+	EAttribute getPapyrusDiagram_CustomPalette();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#getCustomStyle <em>Custom Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Custom Style</em>'.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#getCustomStyle()
+	 * @see #getPapyrusDiagram()
+	 * @generated
+	 */
+	EAttribute getPapyrusDiagram_CustomStyle();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#getChildRules <em>Child Rules</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Child Rules</em>'.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#getChildRules()
+	 * @see #getPapyrusDiagram()
+	 * @generated
+	 */
+	EReference getPapyrusDiagram_ChildRules();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#getPaletteRules <em>Palette Rules</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Palette Rules</em>'.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#getPaletteRules()
+	 * @see #getPapyrusDiagram()
+	 * @generated
+	 */
+	EReference getPapyrusDiagram_PaletteRules();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#getAssistantRules <em>Assistant Rules</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Assistant Rules</em>'.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#getAssistantRules()
+	 * @see #getPapyrusDiagram()
+	 * @generated
+	 */
+	EReference getPapyrusDiagram_AssistantRules();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#getCreationCommandClass <em>Creation Command Class</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Creation Command Class</em>'.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#getCreationCommandClass()
+	 * @see #getPapyrusDiagram()
+	 * @generated
+	 */
+	EAttribute getPapyrusDiagram_CreationCommandClass();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.representation.ChildRule <em>Child Rule</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Child Rule</em>'.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.ChildRule
+	 * @generated
+	 */
+	EClass getChildRule();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.gmfdiag.representation.ChildRule#getElement <em>Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Element</em>'.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.ChildRule#getElement()
+	 * @see #getChildRule()
+	 * @generated
+	 */
+	EReference getChildRule_Element();
+
+	/**
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.gmfdiag.representation.ChildRule#getStereotypes <em>Stereotypes</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>Stereotypes</em>'.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.ChildRule#getStereotypes()
+	 * @see #getChildRule()
+	 * @generated
+	 */
+	EReference getChildRule_Stereotypes();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.gmfdiag.representation.ChildRule#getOrigin <em>Origin</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Origin</em>'.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.ChildRule#getOrigin()
+	 * @see #getChildRule()
+	 * @generated
+	 */
+	EReference getChildRule_Origin();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.gmfdiag.representation.ChildRule#getInsertionPath <em>Insertion Path</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Insertion Path</em>'.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.ChildRule#getInsertionPath()
+	 * @see #getChildRule()
+	 * @generated
+	 */
+	EReference getChildRule_InsertionPath();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.representation.PaletteRule <em>Palette Rule</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Palette Rule</em>'.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.PaletteRule
+	 * @generated
+	 */
+	EClass getPaletteRule();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.representation.PaletteRule#getElement <em>Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Element</em>'.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.PaletteRule#getElement()
+	 * @see #getPaletteRule()
+	 * @generated
+	 */
+	EAttribute getPaletteRule_Element();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.representation.PathElement <em>Path Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Path Element</em>'.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.PathElement
+	 * @generated
+	 */
+	EClass getPathElement();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.gmfdiag.representation.PathElement#getFeature <em>Feature</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Feature</em>'.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.PathElement#getFeature()
+	 * @see #getPathElement()
+	 * @generated
+	 */
+	EReference getPathElement_Feature();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.gmfdiag.representation.PathElement#getOrigin <em>Origin</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Origin</em>'.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.PathElement#getOrigin()
+	 * @see #getPathElement()
+	 * @generated
+	 */
+	EReference getPathElement_Origin();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.gmfdiag.representation.PathElement#getTarget <em>Target</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Target</em>'.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.PathElement#getTarget()
+	 * @see #getPathElement()
+	 * @generated
+	 */
+	EReference getPathElement_Target();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.representation.AssistantRule <em>Assistant Rule</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Assistant Rule</em>'.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.AssistantRule
+	 * @generated
+	 */
+	EClass getAssistantRule();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.representation.AssistantRule#getElementTypeID <em>Element Type ID</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Element Type ID</em>'.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.AssistantRule#getElementTypeID()
+	 * @see #getAssistantRule()
+	 * @generated
+	 */
+	EAttribute getAssistantRule_ElementTypeID();
+
+	/**
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.gmfdiag.representation.AssistantRule#matches(org.eclipse.gmf.runtime.emf.type.core.IElementType) <em>Matches</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Matches</em>' operation.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.AssistantRule#matches(org.eclipse.gmf.runtime.emf.type.core.IElementType)
+	 * @generated
+	 */
+	EOperation getAssistantRule__Matches__IElementType();
+
+	/**
+	 * Returns the meta object for data type '{@link org.eclipse.gmf.runtime.emf.type.core.IElementType <em>Element Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for data type '<em>Element Type</em>'.
+	 * @see org.eclipse.gmf.runtime.emf.type.core.IElementType
+	 * @model instanceClass="org.eclipse.gmf.runtime.emf.type.core.IElementType"
+	 * @generated
+	 */
+	EDataType getElementType();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	RepresentationFactory getRepresentationFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 *   <li>each class,</li>
+	 *   <li>each feature of each class,</li>
+	 *   <li>each operation of each class,</li>
+	 *   <li>each enum,</li>
+	 *   <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.representation.impl.PapyrusDiagramImpl <em>Papyrus Diagram</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.gmfdiag.representation.impl.PapyrusDiagramImpl
+		 * @see org.eclipse.papyrus.infra.gmfdiag.representation.impl.RepresentationPackageImpl#getPapyrusDiagram()
+		 * @generated
+		 */
+		EClass PAPYRUS_DIAGRAM = eINSTANCE.getPapyrusDiagram();
+
+		/**
+		 * The meta object literal for the '<em><b>Custom Palette</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PAPYRUS_DIAGRAM__CUSTOM_PALETTE = eINSTANCE.getPapyrusDiagram_CustomPalette();
+
+		/**
+		 * The meta object literal for the '<em><b>Custom Style</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PAPYRUS_DIAGRAM__CUSTOM_STYLE = eINSTANCE.getPapyrusDiagram_CustomStyle();
+
+		/**
+		 * The meta object literal for the '<em><b>Child Rules</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PAPYRUS_DIAGRAM__CHILD_RULES = eINSTANCE.getPapyrusDiagram_ChildRules();
+
+		/**
+		 * The meta object literal for the '<em><b>Palette Rules</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PAPYRUS_DIAGRAM__PALETTE_RULES = eINSTANCE.getPapyrusDiagram_PaletteRules();
+
+		/**
+		 * The meta object literal for the '<em><b>Assistant Rules</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PAPYRUS_DIAGRAM__ASSISTANT_RULES = eINSTANCE.getPapyrusDiagram_AssistantRules();
+
+		/**
+		 * The meta object literal for the '<em><b>Creation Command Class</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PAPYRUS_DIAGRAM__CREATION_COMMAND_CLASS = eINSTANCE.getPapyrusDiagram_CreationCommandClass();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.representation.impl.ChildRuleImpl <em>Child Rule</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.gmfdiag.representation.impl.ChildRuleImpl
+		 * @see org.eclipse.papyrus.infra.gmfdiag.representation.impl.RepresentationPackageImpl#getChildRule()
+		 * @generated
+		 */
+		EClass CHILD_RULE = eINSTANCE.getChildRule();
+
+		/**
+		 * The meta object literal for the '<em><b>Element</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CHILD_RULE__ELEMENT = eINSTANCE.getChildRule_Element();
+
+		/**
+		 * The meta object literal for the '<em><b>Stereotypes</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CHILD_RULE__STEREOTYPES = eINSTANCE.getChildRule_Stereotypes();
+
+		/**
+		 * The meta object literal for the '<em><b>Origin</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CHILD_RULE__ORIGIN = eINSTANCE.getChildRule_Origin();
+
+		/**
+		 * The meta object literal for the '<em><b>Insertion Path</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CHILD_RULE__INSERTION_PATH = eINSTANCE.getChildRule_InsertionPath();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.representation.impl.PaletteRuleImpl <em>Palette Rule</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.gmfdiag.representation.impl.PaletteRuleImpl
+		 * @see org.eclipse.papyrus.infra.gmfdiag.representation.impl.RepresentationPackageImpl#getPaletteRule()
+		 * @generated
+		 */
+		EClass PALETTE_RULE = eINSTANCE.getPaletteRule();
+
+		/**
+		 * The meta object literal for the '<em><b>Element</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PALETTE_RULE__ELEMENT = eINSTANCE.getPaletteRule_Element();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.representation.impl.PathElementImpl <em>Path Element</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.gmfdiag.representation.impl.PathElementImpl
+		 * @see org.eclipse.papyrus.infra.gmfdiag.representation.impl.RepresentationPackageImpl#getPathElement()
+		 * @generated
+		 */
+		EClass PATH_ELEMENT = eINSTANCE.getPathElement();
+
+		/**
+		 * The meta object literal for the '<em><b>Feature</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PATH_ELEMENT__FEATURE = eINSTANCE.getPathElement_Feature();
+
+		/**
+		 * The meta object literal for the '<em><b>Origin</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PATH_ELEMENT__ORIGIN = eINSTANCE.getPathElement_Origin();
+
+		/**
+		 * The meta object literal for the '<em><b>Target</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PATH_ELEMENT__TARGET = eINSTANCE.getPathElement_Target();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.representation.impl.AssistantRuleImpl <em>Assistant Rule</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.gmfdiag.representation.impl.AssistantRuleImpl
+		 * @see org.eclipse.papyrus.infra.gmfdiag.representation.impl.RepresentationPackageImpl#getAssistantRule()
+		 * @generated
+		 */
+		EClass ASSISTANT_RULE = eINSTANCE.getAssistantRule();
+
+		/**
+		 * The meta object literal for the '<em><b>Element Type ID</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute ASSISTANT_RULE__ELEMENT_TYPE_ID = eINSTANCE.getAssistantRule_ElementTypeID();
+
+		/**
+		 * The meta object literal for the '<em><b>Matches</b></em>' operation.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EOperation ASSISTANT_RULE___MATCHES__IELEMENTTYPE = eINSTANCE.getAssistantRule__Matches__IElementType();
+
+		/**
+		 * The meta object literal for the '<em>Element Type</em>' data type.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.gmf.runtime.emf.type.core.IElementType
+		 * @see org.eclipse.papyrus.infra.gmfdiag.representation.impl.RepresentationPackageImpl#getElementType()
+		 * @generated
+		 */
+		EDataType ELEMENT_TYPE = eINSTANCE.getElementType();
+
+	}
+
+} //RepresentationPackage
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/AssistantRuleImpl.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/AssistantRuleImpl.java
index a5e7a783900..ad91294f957 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/AssistantRuleImpl.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/AssistantRuleImpl.java
@@ -1,27 +1,34 @@
 /**
- * Copyright (c) 2015 Christian W. Damus and others.
- *
+ * Copyright (c) 2017 CEA LIST.
+ * 
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
  *  which accompanies this distribution, and is available at
  *  http://www.eclipse.org/legal/epl-v10.html
- *
+ *  
  *  Contributors:
- *  Christian W. Damus - Initial API and implementation
- *
- *
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
  */
-package org.eclipse.papyrus.infra.viewpoints.configuration.impl;
+package org.eclipse.papyrus.infra.gmfdiag.representation.impl;
 
 import java.lang.reflect.InvocationTargetException;
 
 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.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.infra.viewpoints.configuration.AssistantRule;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
+
+import org.eclipse.papyrus.infra.architecture.representation.impl.RuleImpl;
+
+import org.eclipse.papyrus.infra.gmfdiag.representation.AssistantRule;
+import org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,7 +38,7 @@ import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.AssistantRuleImpl#getElementTypeID <em>Element Type ID</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.impl.AssistantRuleImpl#getElementTypeID <em>Element Type ID</em>}</li>
  * </ul>
  *
  * @generated
@@ -73,7 +80,7 @@ public class AssistantRuleImpl extends RuleImpl implements AssistantRule {
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return ConfigurationPackage.Literals.ASSISTANT_RULE;
+		return RepresentationPackage.Literals.ASSISTANT_RULE;
 	}
 
 	/**
@@ -93,19 +100,18 @@ public class AssistantRuleImpl extends RuleImpl implements AssistantRule {
 	public void setElementTypeID(String newElementTypeID) {
 		String oldElementTypeID = elementTypeID;
 		elementTypeID = newElementTypeID;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ConfigurationPackage.ASSISTANT_RULE__ELEMENT_TYPE_ID, oldElementTypeID, elementTypeID));
-		}
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, RepresentationPackage.ASSISTANT_RULE__ELEMENT_TYPE_ID, oldElementTypeID, elementTypeID));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @generated NOT
+	 * @generated
 	 */
 	public boolean matches(IElementType elementType) {
-		// Implemented in the custom subclass
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
 		throw new UnsupportedOperationException();
 	}
 
@@ -117,8 +123,8 @@ public class AssistantRuleImpl extends RuleImpl implements AssistantRule {
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case ConfigurationPackage.ASSISTANT_RULE__ELEMENT_TYPE_ID:
-			return getElementTypeID();
+			case RepresentationPackage.ASSISTANT_RULE__ELEMENT_TYPE_ID:
+				return getElementTypeID();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -131,9 +137,9 @@ public class AssistantRuleImpl extends RuleImpl implements AssistantRule {
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case ConfigurationPackage.ASSISTANT_RULE__ELEMENT_TYPE_ID:
-			setElementTypeID((String) newValue);
-			return;
+			case RepresentationPackage.ASSISTANT_RULE__ELEMENT_TYPE_ID:
+				setElementTypeID((String)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -146,9 +152,9 @@ public class AssistantRuleImpl extends RuleImpl implements AssistantRule {
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case ConfigurationPackage.ASSISTANT_RULE__ELEMENT_TYPE_ID:
-			setElementTypeID(ELEMENT_TYPE_ID_EDEFAULT);
-			return;
+			case RepresentationPackage.ASSISTANT_RULE__ELEMENT_TYPE_ID:
+				setElementTypeID(ELEMENT_TYPE_ID_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -161,8 +167,8 @@ public class AssistantRuleImpl extends RuleImpl implements AssistantRule {
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case ConfigurationPackage.ASSISTANT_RULE__ELEMENT_TYPE_ID:
-			return ELEMENT_TYPE_ID_EDEFAULT == null ? elementTypeID != null : !ELEMENT_TYPE_ID_EDEFAULT.equals(elementTypeID);
+			case RepresentationPackage.ASSISTANT_RULE__ELEMENT_TYPE_ID:
+				return ELEMENT_TYPE_ID_EDEFAULT == null ? elementTypeID != null : !ELEMENT_TYPE_ID_EDEFAULT.equals(elementTypeID);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -175,8 +181,8 @@ public class AssistantRuleImpl extends RuleImpl implements AssistantRule {
 	@Override
 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
 		switch (operationID) {
-		case ConfigurationPackage.ASSISTANT_RULE___MATCHES__IELEMENTTYPE:
-			return matches((IElementType) arguments.get(0));
+			case RepresentationPackage.ASSISTANT_RULE___MATCHES__IELEMENTTYPE:
+				return matches((IElementType)arguments.get(0));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
@@ -188,9 +194,7 @@ public class AssistantRuleImpl extends RuleImpl implements AssistantRule {
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
-			return super.toString();
-		}
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (elementTypeID: ");
@@ -199,4 +203,4 @@ public class AssistantRuleImpl extends RuleImpl implements AssistantRule {
 		return result.toString();
 	}
 
-} // AssistantRuleImpl
+} //AssistantRuleImpl
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/ChildRuleImpl.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/ChildRuleImpl.java
index acdb441d65b..f4ce8a08818 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/ChildRuleImpl.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/ChildRuleImpl.java
@@ -1,18 +1,17 @@
 /**
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
+ * Copyright (c) 2017 CEA LIST.
+ * 
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
  *  which accompanies this distribution, and is available at
  *  http://www.eclipse.org/legal/epl-v10.html
- *
+ *  
  *  Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
  */
-package org.eclipse.papyrus.infra.viewpoints.configuration.impl;
+package org.eclipse.papyrus.infra.gmfdiag.representation.impl;
 
 import java.util.Collection;
 
@@ -30,9 +29,11 @@ import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
-import org.eclipse.papyrus.infra.viewpoints.configuration.ChildRule;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PathElement;
+import org.eclipse.papyrus.infra.architecture.representation.impl.RuleImpl;
+
+import org.eclipse.papyrus.infra.gmfdiag.representation.ChildRule;
+import org.eclipse.papyrus.infra.gmfdiag.representation.PathElement;
+import org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -42,10 +43,10 @@ import org.eclipse.papyrus.infra.viewpoints.configuration.PathElement;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.ChildRuleImpl#getElement <em>Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.ChildRuleImpl#getStereotypes <em>Stereotypes</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.ChildRuleImpl#getOrigin <em>Origin</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.ChildRuleImpl#getInsertionPath <em>Insertion Path</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.impl.ChildRuleImpl#getElement <em>Element</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.impl.ChildRuleImpl#getStereotypes <em>Stereotypes</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.impl.ChildRuleImpl#getOrigin <em>Origin</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.impl.ChildRuleImpl#getInsertionPath <em>Insertion Path</em>}</li>
  * </ul>
  *
  * @generated
@@ -107,7 +108,7 @@ public class ChildRuleImpl extends RuleImpl implements ChildRule {
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return ConfigurationPackage.Literals.CHILD_RULE;
+		return RepresentationPackage.Literals.CHILD_RULE;
 	}
 
 	/**
@@ -117,12 +118,11 @@ public class ChildRuleImpl extends RuleImpl implements ChildRule {
 	 */
 	public EClass getElement() {
 		if (element != null && element.eIsProxy()) {
-			InternalEObject oldElement = (InternalEObject) element;
-			element = (EClass) eResolveProxy(oldElement);
+			InternalEObject oldElement = (InternalEObject)element;
+			element = (EClass)eResolveProxy(oldElement);
 			if (element != oldElement) {
-				if (eNotificationRequired()) {
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ConfigurationPackage.CHILD_RULE__ELEMENT, oldElement, element));
-				}
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RepresentationPackage.CHILD_RULE__ELEMENT, oldElement, element));
 			}
 		}
 		return element;
@@ -145,9 +145,8 @@ public class ChildRuleImpl extends RuleImpl implements ChildRule {
 	public void setElement(EClass newElement) {
 		EClass oldElement = element;
 		element = newElement;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ConfigurationPackage.CHILD_RULE__ELEMENT, oldElement, element));
-		}
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, RepresentationPackage.CHILD_RULE__ELEMENT, oldElement, element));
 	}
 
 	/**
@@ -157,7 +156,7 @@ public class ChildRuleImpl extends RuleImpl implements ChildRule {
 	 */
 	public EList<EClass> getStereotypes() {
 		if (stereotypes == null) {
-			stereotypes = new EObjectResolvingEList<EClass>(EClass.class, this, ConfigurationPackage.CHILD_RULE__STEREOTYPES);
+			stereotypes = new EObjectResolvingEList<EClass>(EClass.class, this, RepresentationPackage.CHILD_RULE__STEREOTYPES);
 		}
 		return stereotypes;
 	}
@@ -169,12 +168,11 @@ public class ChildRuleImpl extends RuleImpl implements ChildRule {
 	 */
 	public EClass getOrigin() {
 		if (origin != null && origin.eIsProxy()) {
-			InternalEObject oldOrigin = (InternalEObject) origin;
-			origin = (EClass) eResolveProxy(oldOrigin);
+			InternalEObject oldOrigin = (InternalEObject)origin;
+			origin = (EClass)eResolveProxy(oldOrigin);
 			if (origin != oldOrigin) {
-				if (eNotificationRequired()) {
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ConfigurationPackage.CHILD_RULE__ORIGIN, oldOrigin, origin));
-				}
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RepresentationPackage.CHILD_RULE__ORIGIN, oldOrigin, origin));
 			}
 		}
 		return origin;
@@ -197,9 +195,8 @@ public class ChildRuleImpl extends RuleImpl implements ChildRule {
 	public void setOrigin(EClass newOrigin) {
 		EClass oldOrigin = origin;
 		origin = newOrigin;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ConfigurationPackage.CHILD_RULE__ORIGIN, oldOrigin, origin));
-		}
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, RepresentationPackage.CHILD_RULE__ORIGIN, oldOrigin, origin));
 	}
 
 	/**
@@ -209,7 +206,7 @@ public class ChildRuleImpl extends RuleImpl implements ChildRule {
 	 */
 	public EList<PathElement> getInsertionPath() {
 		if (insertionPath == null) {
-			insertionPath = new EObjectContainmentEList<PathElement>(PathElement.class, this, ConfigurationPackage.CHILD_RULE__INSERTION_PATH);
+			insertionPath = new EObjectContainmentEList<PathElement>(PathElement.class, this, RepresentationPackage.CHILD_RULE__INSERTION_PATH);
 		}
 		return insertionPath;
 	}
@@ -222,8 +219,8 @@ public class ChildRuleImpl extends RuleImpl implements ChildRule {
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case ConfigurationPackage.CHILD_RULE__INSERTION_PATH:
-			return ((InternalEList<?>) getInsertionPath()).basicRemove(otherEnd, msgs);
+			case RepresentationPackage.CHILD_RULE__INSERTION_PATH:
+				return ((InternalEList<?>)getInsertionPath()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -236,20 +233,16 @@ public class ChildRuleImpl extends RuleImpl implements ChildRule {
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case ConfigurationPackage.CHILD_RULE__ELEMENT:
-			if (resolve) {
-				return getElement();
-			}
-			return basicGetElement();
-		case ConfigurationPackage.CHILD_RULE__STEREOTYPES:
-			return getStereotypes();
-		case ConfigurationPackage.CHILD_RULE__ORIGIN:
-			if (resolve) {
-				return getOrigin();
-			}
-			return basicGetOrigin();
-		case ConfigurationPackage.CHILD_RULE__INSERTION_PATH:
-			return getInsertionPath();
+			case RepresentationPackage.CHILD_RULE__ELEMENT:
+				if (resolve) return getElement();
+				return basicGetElement();
+			case RepresentationPackage.CHILD_RULE__STEREOTYPES:
+				return getStereotypes();
+			case RepresentationPackage.CHILD_RULE__ORIGIN:
+				if (resolve) return getOrigin();
+				return basicGetOrigin();
+			case RepresentationPackage.CHILD_RULE__INSERTION_PATH:
+				return getInsertionPath();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -263,20 +256,20 @@ public class ChildRuleImpl extends RuleImpl implements ChildRule {
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case ConfigurationPackage.CHILD_RULE__ELEMENT:
-			setElement((EClass) newValue);
-			return;
-		case ConfigurationPackage.CHILD_RULE__STEREOTYPES:
-			getStereotypes().clear();
-			getStereotypes().addAll((Collection<? extends EClass>) newValue);
-			return;
-		case ConfigurationPackage.CHILD_RULE__ORIGIN:
-			setOrigin((EClass) newValue);
-			return;
-		case ConfigurationPackage.CHILD_RULE__INSERTION_PATH:
-			getInsertionPath().clear();
-			getInsertionPath().addAll((Collection<? extends PathElement>) newValue);
-			return;
+			case RepresentationPackage.CHILD_RULE__ELEMENT:
+				setElement((EClass)newValue);
+				return;
+			case RepresentationPackage.CHILD_RULE__STEREOTYPES:
+				getStereotypes().clear();
+				getStereotypes().addAll((Collection<? extends EClass>)newValue);
+				return;
+			case RepresentationPackage.CHILD_RULE__ORIGIN:
+				setOrigin((EClass)newValue);
+				return;
+			case RepresentationPackage.CHILD_RULE__INSERTION_PATH:
+				getInsertionPath().clear();
+				getInsertionPath().addAll((Collection<? extends PathElement>)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -289,18 +282,18 @@ public class ChildRuleImpl extends RuleImpl implements ChildRule {
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case ConfigurationPackage.CHILD_RULE__ELEMENT:
-			setElement((EClass) null);
-			return;
-		case ConfigurationPackage.CHILD_RULE__STEREOTYPES:
-			getStereotypes().clear();
-			return;
-		case ConfigurationPackage.CHILD_RULE__ORIGIN:
-			setOrigin((EClass) null);
-			return;
-		case ConfigurationPackage.CHILD_RULE__INSERTION_PATH:
-			getInsertionPath().clear();
-			return;
+			case RepresentationPackage.CHILD_RULE__ELEMENT:
+				setElement((EClass)null);
+				return;
+			case RepresentationPackage.CHILD_RULE__STEREOTYPES:
+				getStereotypes().clear();
+				return;
+			case RepresentationPackage.CHILD_RULE__ORIGIN:
+				setOrigin((EClass)null);
+				return;
+			case RepresentationPackage.CHILD_RULE__INSERTION_PATH:
+				getInsertionPath().clear();
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -313,14 +306,14 @@ public class ChildRuleImpl extends RuleImpl implements ChildRule {
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case ConfigurationPackage.CHILD_RULE__ELEMENT:
-			return element != null;
-		case ConfigurationPackage.CHILD_RULE__STEREOTYPES:
-			return stereotypes != null && !stereotypes.isEmpty();
-		case ConfigurationPackage.CHILD_RULE__ORIGIN:
-			return origin != null;
-		case ConfigurationPackage.CHILD_RULE__INSERTION_PATH:
-			return insertionPath != null && !insertionPath.isEmpty();
+			case RepresentationPackage.CHILD_RULE__ELEMENT:
+				return element != null;
+			case RepresentationPackage.CHILD_RULE__STEREOTYPES:
+				return stereotypes != null && !stereotypes.isEmpty();
+			case RepresentationPackage.CHILD_RULE__ORIGIN:
+				return origin != null;
+			case RepresentationPackage.CHILD_RULE__INSERTION_PATH:
+				return insertionPath != null && !insertionPath.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/PaletteRuleImpl.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/PaletteRuleImpl.java
index c0e7e3c4697..6d1cd726ba9 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/PaletteRuleImpl.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/PaletteRuleImpl.java
@@ -1,18 +1,17 @@
 /**
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
+ * Copyright (c) 2017 CEA LIST.
+ * 
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
  *  which accompanies this distribution, and is available at
  *  http://www.eclipse.org/legal/epl-v10.html
- *
+ *  
  *  Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
  */
-package org.eclipse.papyrus.infra.viewpoints.configuration.impl;
+package org.eclipse.papyrus.infra.gmfdiag.representation.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -20,8 +19,10 @@ import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PaletteRule;
+import org.eclipse.papyrus.infra.architecture.representation.impl.RuleImpl;
+
+import org.eclipse.papyrus.infra.gmfdiag.representation.PaletteRule;
+import org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,7 +32,7 @@ import org.eclipse.papyrus.infra.viewpoints.configuration.PaletteRule;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PaletteRuleImpl#getElement <em>Element</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.impl.PaletteRuleImpl#getElement <em>Element</em>}</li>
  * </ul>
  *
  * @generated
@@ -73,7 +74,7 @@ public class PaletteRuleImpl extends RuleImpl implements PaletteRule {
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return ConfigurationPackage.Literals.PALETTE_RULE;
+		return RepresentationPackage.Literals.PALETTE_RULE;
 	}
 
 	/**
@@ -93,9 +94,8 @@ public class PaletteRuleImpl extends RuleImpl implements PaletteRule {
 	public void setElement(String newElement) {
 		String oldElement = element;
 		element = newElement;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ConfigurationPackage.PALETTE_RULE__ELEMENT, oldElement, element));
-		}
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, RepresentationPackage.PALETTE_RULE__ELEMENT, oldElement, element));
 	}
 
 	/**
@@ -106,8 +106,8 @@ public class PaletteRuleImpl extends RuleImpl implements PaletteRule {
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case ConfigurationPackage.PALETTE_RULE__ELEMENT:
-			return getElement();
+			case RepresentationPackage.PALETTE_RULE__ELEMENT:
+				return getElement();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -120,9 +120,9 @@ public class PaletteRuleImpl extends RuleImpl implements PaletteRule {
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case ConfigurationPackage.PALETTE_RULE__ELEMENT:
-			setElement((String) newValue);
-			return;
+			case RepresentationPackage.PALETTE_RULE__ELEMENT:
+				setElement((String)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -135,9 +135,9 @@ public class PaletteRuleImpl extends RuleImpl implements PaletteRule {
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case ConfigurationPackage.PALETTE_RULE__ELEMENT:
-			setElement(ELEMENT_EDEFAULT);
-			return;
+			case RepresentationPackage.PALETTE_RULE__ELEMENT:
+				setElement(ELEMENT_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -150,8 +150,8 @@ public class PaletteRuleImpl extends RuleImpl implements PaletteRule {
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case ConfigurationPackage.PALETTE_RULE__ELEMENT:
-			return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
+			case RepresentationPackage.PALETTE_RULE__ELEMENT:
+				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -163,9 +163,7 @@ public class PaletteRuleImpl extends RuleImpl implements PaletteRule {
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
-			return super.toString();
-		}
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (element: ");
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/PapyrusDiagramImpl.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/PapyrusDiagramImpl.java
new file mode 100644
index 00000000000..81a111279a2
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/PapyrusDiagramImpl.java
@@ -0,0 +1,406 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.gmfdiag.representation.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.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.papyrus.infra.architecture.representation.impl.PapyrusRepresentationKindImpl;
+
+import org.eclipse.papyrus.infra.gmfdiag.representation.AssistantRule;
+import org.eclipse.papyrus.infra.gmfdiag.representation.ChildRule;
+import org.eclipse.papyrus.infra.gmfdiag.representation.PaletteRule;
+import org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram;
+import org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Papyrus Diagram</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.impl.PapyrusDiagramImpl#getCustomPalette <em>Custom Palette</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.impl.PapyrusDiagramImpl#getCustomStyle <em>Custom Style</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.impl.PapyrusDiagramImpl#getChildRules <em>Child Rules</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.impl.PapyrusDiagramImpl#getPaletteRules <em>Palette Rules</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.impl.PapyrusDiagramImpl#getAssistantRules <em>Assistant Rules</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.impl.PapyrusDiagramImpl#getCreationCommandClass <em>Creation Command Class</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements PapyrusDiagram {
+	/**
+	 * The default value of the '{@link #getCustomPalette() <em>Custom Palette</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCustomPalette()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String CUSTOM_PALETTE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getCustomPalette() <em>Custom Palette</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCustomPalette()
+	 * @generated
+	 * @ordered
+	 */
+	protected String customPalette = CUSTOM_PALETTE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getCustomStyle() <em>Custom Style</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCustomStyle()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String CUSTOM_STYLE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getCustomStyle() <em>Custom Style</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCustomStyle()
+	 * @generated
+	 * @ordered
+	 */
+	protected String customStyle = CUSTOM_STYLE_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getChildRules() <em>Child Rules</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getChildRules()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<ChildRule> childRules;
+
+	/**
+	 * The cached value of the '{@link #getPaletteRules() <em>Palette Rules</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPaletteRules()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<PaletteRule> paletteRules;
+
+	/**
+	 * The cached value of the '{@link #getAssistantRules() <em>Assistant Rules</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAssistantRules()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<AssistantRule> assistantRules;
+
+	/**
+	 * The cached value of the '{@link #getCreationCommandClass() <em>Creation Command Class</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCreationCommandClass()
+	 * @generated
+	 * @ordered
+	 */
+	protected Class<?> creationCommandClass;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected PapyrusDiagramImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return RepresentationPackage.Literals.PAPYRUS_DIAGRAM;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getCustomPalette() {
+		return customPalette;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCustomPalette(String newCustomPalette) {
+		String oldCustomPalette = customPalette;
+		customPalette = newCustomPalette;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, RepresentationPackage.PAPYRUS_DIAGRAM__CUSTOM_PALETTE, oldCustomPalette, customPalette));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getCustomStyle() {
+		return customStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCustomStyle(String newCustomStyle) {
+		String oldCustomStyle = customStyle;
+		customStyle = newCustomStyle;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, RepresentationPackage.PAPYRUS_DIAGRAM__CUSTOM_STYLE, oldCustomStyle, customStyle));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<ChildRule> getChildRules() {
+		if (childRules == null) {
+			childRules = new EObjectContainmentEList<ChildRule>(ChildRule.class, this, RepresentationPackage.PAPYRUS_DIAGRAM__CHILD_RULES);
+		}
+		return childRules;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<PaletteRule> getPaletteRules() {
+		if (paletteRules == null) {
+			paletteRules = new EObjectContainmentEList<PaletteRule>(PaletteRule.class, this, RepresentationPackage.PAPYRUS_DIAGRAM__PALETTE_RULES);
+		}
+		return paletteRules;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<AssistantRule> getAssistantRules() {
+		if (assistantRules == null) {
+			assistantRules = new EObjectContainmentEList<AssistantRule>(AssistantRule.class, this, RepresentationPackage.PAPYRUS_DIAGRAM__ASSISTANT_RULES);
+		}
+		return assistantRules;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Class<?> getCreationCommandClass() {
+		return creationCommandClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCreationCommandClass(Class<?> newCreationCommandClass) {
+		Class<?> oldCreationCommandClass = creationCommandClass;
+		creationCommandClass = newCreationCommandClass;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, RepresentationPackage.PAPYRUS_DIAGRAM__CREATION_COMMAND_CLASS, oldCreationCommandClass, creationCommandClass));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case RepresentationPackage.PAPYRUS_DIAGRAM__CHILD_RULES:
+				return ((InternalEList<?>)getChildRules()).basicRemove(otherEnd, msgs);
+			case RepresentationPackage.PAPYRUS_DIAGRAM__PALETTE_RULES:
+				return ((InternalEList<?>)getPaletteRules()).basicRemove(otherEnd, msgs);
+			case RepresentationPackage.PAPYRUS_DIAGRAM__ASSISTANT_RULES:
+				return ((InternalEList<?>)getAssistantRules()).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 RepresentationPackage.PAPYRUS_DIAGRAM__CUSTOM_PALETTE:
+				return getCustomPalette();
+			case RepresentationPackage.PAPYRUS_DIAGRAM__CUSTOM_STYLE:
+				return getCustomStyle();
+			case RepresentationPackage.PAPYRUS_DIAGRAM__CHILD_RULES:
+				return getChildRules();
+			case RepresentationPackage.PAPYRUS_DIAGRAM__PALETTE_RULES:
+				return getPaletteRules();
+			case RepresentationPackage.PAPYRUS_DIAGRAM__ASSISTANT_RULES:
+				return getAssistantRules();
+			case RepresentationPackage.PAPYRUS_DIAGRAM__CREATION_COMMAND_CLASS:
+				return getCreationCommandClass();
+		}
+		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 RepresentationPackage.PAPYRUS_DIAGRAM__CUSTOM_PALETTE:
+				setCustomPalette((String)newValue);
+				return;
+			case RepresentationPackage.PAPYRUS_DIAGRAM__CUSTOM_STYLE:
+				setCustomStyle((String)newValue);
+				return;
+			case RepresentationPackage.PAPYRUS_DIAGRAM__CHILD_RULES:
+				getChildRules().clear();
+				getChildRules().addAll((Collection<? extends ChildRule>)newValue);
+				return;
+			case RepresentationPackage.PAPYRUS_DIAGRAM__PALETTE_RULES:
+				getPaletteRules().clear();
+				getPaletteRules().addAll((Collection<? extends PaletteRule>)newValue);
+				return;
+			case RepresentationPackage.PAPYRUS_DIAGRAM__ASSISTANT_RULES:
+				getAssistantRules().clear();
+				getAssistantRules().addAll((Collection<? extends AssistantRule>)newValue);
+				return;
+			case RepresentationPackage.PAPYRUS_DIAGRAM__CREATION_COMMAND_CLASS:
+				setCreationCommandClass((Class<?>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case RepresentationPackage.PAPYRUS_DIAGRAM__CUSTOM_PALETTE:
+				setCustomPalette(CUSTOM_PALETTE_EDEFAULT);
+				return;
+			case RepresentationPackage.PAPYRUS_DIAGRAM__CUSTOM_STYLE:
+				setCustomStyle(CUSTOM_STYLE_EDEFAULT);
+				return;
+			case RepresentationPackage.PAPYRUS_DIAGRAM__CHILD_RULES:
+				getChildRules().clear();
+				return;
+			case RepresentationPackage.PAPYRUS_DIAGRAM__PALETTE_RULES:
+				getPaletteRules().clear();
+				return;
+			case RepresentationPackage.PAPYRUS_DIAGRAM__ASSISTANT_RULES:
+				getAssistantRules().clear();
+				return;
+			case RepresentationPackage.PAPYRUS_DIAGRAM__CREATION_COMMAND_CLASS:
+				setCreationCommandClass((Class<?>)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case RepresentationPackage.PAPYRUS_DIAGRAM__CUSTOM_PALETTE:
+				return CUSTOM_PALETTE_EDEFAULT == null ? customPalette != null : !CUSTOM_PALETTE_EDEFAULT.equals(customPalette);
+			case RepresentationPackage.PAPYRUS_DIAGRAM__CUSTOM_STYLE:
+				return CUSTOM_STYLE_EDEFAULT == null ? customStyle != null : !CUSTOM_STYLE_EDEFAULT.equals(customStyle);
+			case RepresentationPackage.PAPYRUS_DIAGRAM__CHILD_RULES:
+				return childRules != null && !childRules.isEmpty();
+			case RepresentationPackage.PAPYRUS_DIAGRAM__PALETTE_RULES:
+				return paletteRules != null && !paletteRules.isEmpty();
+			case RepresentationPackage.PAPYRUS_DIAGRAM__ASSISTANT_RULES:
+				return assistantRules != null && !assistantRules.isEmpty();
+			case RepresentationPackage.PAPYRUS_DIAGRAM__CREATION_COMMAND_CLASS:
+				return creationCommandClass != 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(" (customPalette: ");
+		result.append(customPalette);
+		result.append(", customStyle: ");
+		result.append(customStyle);
+		result.append(", creationCommandClass: ");
+		result.append(creationCommandClass);
+		result.append(')');
+		return result.toString();
+	}
+
+} //PapyrusDiagramImpl
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/PathElementImpl.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/PathElementImpl.java
index f6ac0a01591..c369750ee0c 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/PathElementImpl.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/PathElementImpl.java
@@ -1,18 +1,17 @@
 /**
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
+ * Copyright (c) 2017 CEA LIST.
+ * 
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
  *  which accompanies this distribution, and is available at
  *  http://www.eclipse.org/legal/epl-v10.html
- *
+ *  
  *  Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
  */
-package org.eclipse.papyrus.infra.viewpoints.configuration.impl;
+package org.eclipse.papyrus.infra.gmfdiag.representation.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -23,8 +22,8 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PathElement;
+import org.eclipse.papyrus.infra.gmfdiag.representation.PathElement;
+import org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -34,9 +33,9 @@ import org.eclipse.papyrus.infra.viewpoints.configuration.PathElement;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PathElementImpl#getFeature <em>Feature</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PathElementImpl#getOrigin <em>Origin</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PathElementImpl#getTarget <em>Target</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.impl.PathElementImpl#getFeature <em>Feature</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.impl.PathElementImpl#getOrigin <em>Origin</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.impl.PathElementImpl#getTarget <em>Target</em>}</li>
  * </ul>
  *
  * @generated
@@ -68,7 +67,7 @@ public class PathElementImpl extends MinimalEObjectImpl.Container implements Pat
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return ConfigurationPackage.Literals.PATH_ELEMENT;
+		return RepresentationPackage.Literals.PATH_ELEMENT;
 	}
 
 	/**
@@ -78,12 +77,11 @@ public class PathElementImpl extends MinimalEObjectImpl.Container implements Pat
 	 */
 	public EReference getFeature() {
 		if (feature != null && feature.eIsProxy()) {
-			InternalEObject oldFeature = (InternalEObject) feature;
-			feature = (EReference) eResolveProxy(oldFeature);
+			InternalEObject oldFeature = (InternalEObject)feature;
+			feature = (EReference)eResolveProxy(oldFeature);
 			if (feature != oldFeature) {
-				if (eNotificationRequired()) {
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ConfigurationPackage.PATH_ELEMENT__FEATURE, oldFeature, feature));
-				}
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RepresentationPackage.PATH_ELEMENT__FEATURE, oldFeature, feature));
 			}
 		}
 		return feature;
@@ -106,9 +104,8 @@ public class PathElementImpl extends MinimalEObjectImpl.Container implements Pat
 	public void setFeature(EReference newFeature) {
 		EReference oldFeature = feature;
 		feature = newFeature;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ConfigurationPackage.PATH_ELEMENT__FEATURE, oldFeature, feature));
-		}
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, RepresentationPackage.PATH_ELEMENT__FEATURE, oldFeature, feature));
 	}
 
 	/**
@@ -118,7 +115,7 @@ public class PathElementImpl extends MinimalEObjectImpl.Container implements Pat
 	 */
 	public EClass getOrigin() {
 		EClass origin = basicGetOrigin();
-		return origin != null && origin.eIsProxy() ? (EClass) eResolveProxy((InternalEObject) origin) : origin;
+		return origin != null && origin.eIsProxy() ? (EClass)eResolveProxy((InternalEObject)origin) : origin;
 	}
 
 	/**
@@ -140,7 +137,7 @@ public class PathElementImpl extends MinimalEObjectImpl.Container implements Pat
 	 */
 	public EClass getTarget() {
 		EClass target = basicGetTarget();
-		return target != null && target.eIsProxy() ? (EClass) eResolveProxy((InternalEObject) target) : target;
+		return target != null && target.eIsProxy() ? (EClass)eResolveProxy((InternalEObject)target) : target;
 	}
 
 	/**
@@ -163,21 +160,15 @@ public class PathElementImpl extends MinimalEObjectImpl.Container implements Pat
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case ConfigurationPackage.PATH_ELEMENT__FEATURE:
-			if (resolve) {
-				return getFeature();
-			}
-			return basicGetFeature();
-		case ConfigurationPackage.PATH_ELEMENT__ORIGIN:
-			if (resolve) {
-				return getOrigin();
-			}
-			return basicGetOrigin();
-		case ConfigurationPackage.PATH_ELEMENT__TARGET:
-			if (resolve) {
-				return getTarget();
-			}
-			return basicGetTarget();
+			case RepresentationPackage.PATH_ELEMENT__FEATURE:
+				if (resolve) return getFeature();
+				return basicGetFeature();
+			case RepresentationPackage.PATH_ELEMENT__ORIGIN:
+				if (resolve) return getOrigin();
+				return basicGetOrigin();
+			case RepresentationPackage.PATH_ELEMENT__TARGET:
+				if (resolve) return getTarget();
+				return basicGetTarget();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -190,9 +181,9 @@ public class PathElementImpl extends MinimalEObjectImpl.Container implements Pat
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case ConfigurationPackage.PATH_ELEMENT__FEATURE:
-			setFeature((EReference) newValue);
-			return;
+			case RepresentationPackage.PATH_ELEMENT__FEATURE:
+				setFeature((EReference)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -205,9 +196,9 @@ public class PathElementImpl extends MinimalEObjectImpl.Container implements Pat
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case ConfigurationPackage.PATH_ELEMENT__FEATURE:
-			setFeature((EReference) null);
-			return;
+			case RepresentationPackage.PATH_ELEMENT__FEATURE:
+				setFeature((EReference)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -220,12 +211,12 @@ public class PathElementImpl extends MinimalEObjectImpl.Container implements Pat
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case ConfigurationPackage.PATH_ELEMENT__FEATURE:
-			return feature != null;
-		case ConfigurationPackage.PATH_ELEMENT__ORIGIN:
-			return basicGetOrigin() != null;
-		case ConfigurationPackage.PATH_ELEMENT__TARGET:
-			return basicGetTarget() != null;
+			case RepresentationPackage.PATH_ELEMENT__FEATURE:
+				return feature != null;
+			case RepresentationPackage.PATH_ELEMENT__ORIGIN:
+				return basicGetOrigin() != null;
+			case RepresentationPackage.PATH_ELEMENT__TARGET:
+				return basicGetTarget() != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/RepresentationFactoryImpl.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/RepresentationFactoryImpl.java
new file mode 100644
index 00000000000..86bdee11d04
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/RepresentationFactoryImpl.java
@@ -0,0 +1,201 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.gmfdiag.representation.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+
+import org.eclipse.papyrus.infra.gmfdiag.representation.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class RepresentationFactoryImpl extends EFactoryImpl implements RepresentationFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static RepresentationFactory init() {
+		try {
+			RepresentationFactory theRepresentationFactory = (RepresentationFactory)EPackage.Registry.INSTANCE.getEFactory(RepresentationPackage.eNS_URI);
+			if (theRepresentationFactory != null) {
+				return theRepresentationFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new RepresentationFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RepresentationFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case RepresentationPackage.PAPYRUS_DIAGRAM: return createPapyrusDiagram();
+			case RepresentationPackage.CHILD_RULE: return createChildRule();
+			case RepresentationPackage.PALETTE_RULE: return createPaletteRule();
+			case RepresentationPackage.PATH_ELEMENT: return createPathElement();
+			case RepresentationPackage.ASSISTANT_RULE: return createAssistantRule();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object createFromString(EDataType eDataType, String initialValue) {
+		switch (eDataType.getClassifierID()) {
+			case RepresentationPackage.ELEMENT_TYPE:
+				return createElementTypeFromString(eDataType, initialValue);
+			default:
+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String convertToString(EDataType eDataType, Object instanceValue) {
+		switch (eDataType.getClassifierID()) {
+			case RepresentationPackage.ELEMENT_TYPE:
+				return convertElementTypeToString(eDataType, instanceValue);
+			default:
+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public PapyrusDiagram createPapyrusDiagram() {
+		PapyrusDiagramImpl papyrusDiagram = new PapyrusDiagramImpl();
+		return papyrusDiagram;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ChildRule createChildRule() {
+		ChildRuleImpl childRule = new ChildRuleImpl();
+		return childRule;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public PaletteRule createPaletteRule() {
+		PaletteRuleImpl paletteRule = new PaletteRuleImpl();
+		return paletteRule;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public PathElement createPathElement() {
+		PathElementImpl pathElement = new PathElementImpl();
+		return pathElement;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AssistantRule createAssistantRule() {
+		AssistantRuleImpl assistantRule = new AssistantRuleImpl();
+		return assistantRule;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IElementType createElementTypeFromString(EDataType eDataType, String initialValue) {
+		return (IElementType)super.createFromString(eDataType, initialValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertElementTypeToString(EDataType eDataType, Object instanceValue) {
+		return super.convertToString(eDataType, instanceValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RepresentationPackage getRepresentationPackage() {
+		return (RepresentationPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static RepresentationPackage getPackage() {
+		return RepresentationPackage.eINSTANCE;
+	}
+
+} //RepresentationFactoryImpl
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/RepresentationPackageImpl.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/RepresentationPackageImpl.java
new file mode 100644
index 00000000000..e3fe7adaa9d
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/RepresentationPackageImpl.java
@@ -0,0 +1,480 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.gmfdiag.representation.impl;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EGenericType;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+
+import org.eclipse.papyrus.infra.gmfdiag.representation.AssistantRule;
+import org.eclipse.papyrus.infra.gmfdiag.representation.ChildRule;
+import org.eclipse.papyrus.infra.gmfdiag.representation.PaletteRule;
+import org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram;
+import org.eclipse.papyrus.infra.gmfdiag.representation.PathElement;
+import org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationFactory;
+import org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class RepresentationPackageImpl extends EPackageImpl implements RepresentationPackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass papyrusDiagramEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass childRuleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass paletteRuleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass pathElementEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass assistantRuleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EDataType elementTypeEDataType = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private RepresentationPackageImpl() {
+		super(eNS_URI, RepresentationFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>This method is used to initialize {@link RepresentationPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static RepresentationPackage init() {
+		if (isInited) return (RepresentationPackage)EPackage.Registry.INSTANCE.getEPackage(RepresentationPackage.eNS_URI);
+
+		// Obtain or create and register package
+		RepresentationPackageImpl theRepresentationPackage = (RepresentationPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof RepresentationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new RepresentationPackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.eINSTANCE.eClass();
+
+		// Create package meta-data objects
+		theRepresentationPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theRepresentationPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theRepresentationPackage.freeze();
+
+  
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(RepresentationPackage.eNS_URI, theRepresentationPackage);
+		return theRepresentationPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getPapyrusDiagram() {
+		return papyrusDiagramEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getPapyrusDiagram_CustomPalette() {
+		return (EAttribute)papyrusDiagramEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getPapyrusDiagram_CustomStyle() {
+		return (EAttribute)papyrusDiagramEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getPapyrusDiagram_ChildRules() {
+		return (EReference)papyrusDiagramEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getPapyrusDiagram_PaletteRules() {
+		return (EReference)papyrusDiagramEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getPapyrusDiagram_AssistantRules() {
+		return (EReference)papyrusDiagramEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getPapyrusDiagram_CreationCommandClass() {
+		return (EAttribute)papyrusDiagramEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getChildRule() {
+		return childRuleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getChildRule_Element() {
+		return (EReference)childRuleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getChildRule_Stereotypes() {
+		return (EReference)childRuleEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getChildRule_Origin() {
+		return (EReference)childRuleEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getChildRule_InsertionPath() {
+		return (EReference)childRuleEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getPaletteRule() {
+		return paletteRuleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getPaletteRule_Element() {
+		return (EAttribute)paletteRuleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getPathElement() {
+		return pathElementEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getPathElement_Feature() {
+		return (EReference)pathElementEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getPathElement_Origin() {
+		return (EReference)pathElementEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getPathElement_Target() {
+		return (EReference)pathElementEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getAssistantRule() {
+		return assistantRuleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getAssistantRule_ElementTypeID() {
+		return (EAttribute)assistantRuleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EOperation getAssistantRule__Matches__IElementType() {
+		return assistantRuleEClass.getEOperations().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EDataType getElementType() {
+		return elementTypeEDataType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RepresentationFactory getRepresentationFactory() {
+		return (RepresentationFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		papyrusDiagramEClass = createEClass(PAPYRUS_DIAGRAM);
+		createEAttribute(papyrusDiagramEClass, PAPYRUS_DIAGRAM__CUSTOM_PALETTE);
+		createEAttribute(papyrusDiagramEClass, PAPYRUS_DIAGRAM__CUSTOM_STYLE);
+		createEReference(papyrusDiagramEClass, PAPYRUS_DIAGRAM__CHILD_RULES);
+		createEReference(papyrusDiagramEClass, PAPYRUS_DIAGRAM__PALETTE_RULES);
+		createEReference(papyrusDiagramEClass, PAPYRUS_DIAGRAM__ASSISTANT_RULES);
+		createEAttribute(papyrusDiagramEClass, PAPYRUS_DIAGRAM__CREATION_COMMAND_CLASS);
+
+		childRuleEClass = createEClass(CHILD_RULE);
+		createEReference(childRuleEClass, CHILD_RULE__ELEMENT);
+		createEReference(childRuleEClass, CHILD_RULE__STEREOTYPES);
+		createEReference(childRuleEClass, CHILD_RULE__ORIGIN);
+		createEReference(childRuleEClass, CHILD_RULE__INSERTION_PATH);
+
+		paletteRuleEClass = createEClass(PALETTE_RULE);
+		createEAttribute(paletteRuleEClass, PALETTE_RULE__ELEMENT);
+
+		pathElementEClass = createEClass(PATH_ELEMENT);
+		createEReference(pathElementEClass, PATH_ELEMENT__FEATURE);
+		createEReference(pathElementEClass, PATH_ELEMENT__ORIGIN);
+		createEReference(pathElementEClass, PATH_ELEMENT__TARGET);
+
+		assistantRuleEClass = createEClass(ASSISTANT_RULE);
+		createEAttribute(assistantRuleEClass, ASSISTANT_RULE__ELEMENT_TYPE_ID);
+		createEOperation(assistantRuleEClass, ASSISTANT_RULE___MATCHES__IELEMENTTYPE);
+
+		// Create data types
+		elementTypeEDataType = createEDataType(ELEMENT_TYPE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage theRepresentationPackage_1 = (org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage)EPackage.Registry.INSTANCE.getEPackage(org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		papyrusDiagramEClass.getESuperTypes().add(theRepresentationPackage_1.getPapyrusRepresentationKind());
+		childRuleEClass.getESuperTypes().add(theRepresentationPackage_1.getRule());
+		paletteRuleEClass.getESuperTypes().add(theRepresentationPackage_1.getRule());
+		assistantRuleEClass.getESuperTypes().add(theRepresentationPackage_1.getRule());
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(papyrusDiagramEClass, PapyrusDiagram.class, "PapyrusDiagram", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getPapyrusDiagram_CustomPalette(), ecorePackage.getEString(), "customPalette", null, 0, 1, PapyrusDiagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getPapyrusDiagram_CustomStyle(), ecorePackage.getEString(), "customStyle", null, 0, 1, PapyrusDiagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getPapyrusDiagram_ChildRules(), this.getChildRule(), null, "childRules", null, 0, -1, PapyrusDiagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getPapyrusDiagram_PaletteRules(), this.getPaletteRule(), null, "paletteRules", null, 0, -1, PapyrusDiagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getPapyrusDiagram_AssistantRules(), this.getAssistantRule(), null, "assistantRules", null, 0, -1, PapyrusDiagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		EGenericType g1 = createEGenericType(ecorePackage.getEJavaClass());
+		EGenericType g2 = createEGenericType();
+		g1.getETypeArguments().add(g2);
+		initEAttribute(getPapyrusDiagram_CreationCommandClass(), g1, "creationCommandClass", null, 1, 1, PapyrusDiagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(childRuleEClass, ChildRule.class, "ChildRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getChildRule_Element(), ecorePackage.getEClass(), null, "element", null, 0, 1, ChildRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getChildRule_Stereotypes(), ecorePackage.getEClass(), null, "stereotypes", null, 0, -1, ChildRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getChildRule_Origin(), ecorePackage.getEClass(), null, "origin", null, 0, 1, ChildRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getChildRule_InsertionPath(), this.getPathElement(), null, "insertionPath", null, 0, -1, ChildRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(paletteRuleEClass, PaletteRule.class, "PaletteRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getPaletteRule_Element(), ecorePackage.getEString(), "element", null, 0, 1, PaletteRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(pathElementEClass, PathElement.class, "PathElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getPathElement_Feature(), ecorePackage.getEReference(), null, "feature", null, 1, 1, PathElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getPathElement_Origin(), ecorePackage.getEClass(), null, "origin", null, 1, 1, PathElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+		initEReference(getPathElement_Target(), ecorePackage.getEClass(), null, "target", null, 1, 1, PathElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+
+		initEClass(assistantRuleEClass, AssistantRule.class, "AssistantRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getAssistantRule_ElementTypeID(), ecorePackage.getEString(), "elementTypeID", null, 0, 1, AssistantRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		EOperation op = initEOperation(getAssistantRule__Matches__IElementType(), ecorePackage.getEBoolean(), "matches", 1, 1, IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, this.getElementType(), "elementType", 1, 1, IS_UNIQUE, IS_ORDERED);
+
+		// Initialize data types
+		initEDataType(elementTypeEDataType, IElementType.class, "ElementType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
+
+		// Create resource
+		createResource(eNS_URI);
+	}
+
+} //RepresentationPackageImpl
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/util/RepresentationAdapterFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/util/RepresentationAdapterFactory.java
new file mode 100644
index 00000000000..280bef9953f
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/util/RepresentationAdapterFactory.java
@@ -0,0 +1,281 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.gmfdiag.representation.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.papyrus.infra.core.architecture.ADElement;
+import org.eclipse.papyrus.infra.core.architecture.RepresentationKind;
+
+import org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind;
+import org.eclipse.papyrus.infra.architecture.representation.Rule;
+
+import org.eclipse.papyrus.infra.gmfdiag.representation.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage
+ * @generated
+ */
+public class RepresentationAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static RepresentationPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RepresentationAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = RepresentationPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected RepresentationSwitch<Adapter> modelSwitch =
+		new RepresentationSwitch<Adapter>() {
+			@Override
+			public Adapter casePapyrusDiagram(PapyrusDiagram object) {
+				return createPapyrusDiagramAdapter();
+			}
+			@Override
+			public Adapter caseChildRule(ChildRule object) {
+				return createChildRuleAdapter();
+			}
+			@Override
+			public Adapter casePaletteRule(PaletteRule object) {
+				return createPaletteRuleAdapter();
+			}
+			@Override
+			public Adapter casePathElement(PathElement object) {
+				return createPathElementAdapter();
+			}
+			@Override
+			public Adapter caseAssistantRule(AssistantRule object) {
+				return createAssistantRuleAdapter();
+			}
+			@Override
+			public Adapter caseADElement(ADElement object) {
+				return createADElementAdapter();
+			}
+			@Override
+			public Adapter caseRepresentationKind(RepresentationKind object) {
+				return createRepresentationKindAdapter();
+			}
+			@Override
+			public Adapter casePapyrusRepresentationKind(PapyrusRepresentationKind object) {
+				return createPapyrusRepresentationKindAdapter();
+			}
+			@Override
+			public Adapter caseRule(Rule object) {
+				return createRuleAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram <em>Papyrus Diagram</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram
+	 * @generated
+	 */
+	public Adapter createPapyrusDiagramAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.representation.ChildRule <em>Child Rule</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.ChildRule
+	 * @generated
+	 */
+	public Adapter createChildRuleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.representation.PaletteRule <em>Palette Rule</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.PaletteRule
+	 * @generated
+	 */
+	public Adapter createPaletteRuleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.representation.PathElement <em>Path Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.PathElement
+	 * @generated
+	 */
+	public Adapter createPathElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.representation.AssistantRule <em>Assistant Rule</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.AssistantRule
+	 * @generated
+	 */
+	public Adapter createAssistantRuleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.core.architecture.ADElement <em>AD Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ADElement
+	 * @generated
+	 */
+	public Adapter createADElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.core.architecture.RepresentationKind <em>Representation Kind</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.core.architecture.RepresentationKind
+	 * @generated
+	 */
+	public Adapter createRepresentationKindAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind <em>Papyrus Representation Kind</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind
+	 * @generated
+	 */
+	public Adapter createPapyrusRepresentationKindAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.architecture.representation.Rule <em>Rule</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.architecture.representation.Rule
+	 * @generated
+	 */
+	public Adapter createRuleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+
+} //RepresentationAdapterFactory
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/util/RepresentationSwitch.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/util/RepresentationSwitch.java
new file mode 100644
index 00000000000..aae8826a227
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/util/RepresentationSwitch.java
@@ -0,0 +1,277 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.gmfdiag.representation.util;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.util.Switch;
+
+import org.eclipse.papyrus.infra.core.architecture.ADElement;
+import org.eclipse.papyrus.infra.core.architecture.RepresentationKind;
+
+import org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind;
+import org.eclipse.papyrus.infra.architecture.representation.Rule;
+
+import org.eclipse.papyrus.infra.gmfdiag.representation.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage
+ * @generated
+ */
+public class RepresentationSwitch<T> extends Switch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static RepresentationPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RepresentationSwitch() {
+		if (modelPackage == null) {
+			modelPackage = RepresentationPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case RepresentationPackage.PAPYRUS_DIAGRAM: {
+				PapyrusDiagram papyrusDiagram = (PapyrusDiagram)theEObject;
+				T result = casePapyrusDiagram(papyrusDiagram);
+				if (result == null) result = casePapyrusRepresentationKind(papyrusDiagram);
+				if (result == null) result = caseRepresentationKind(papyrusDiagram);
+				if (result == null) result = caseADElement(papyrusDiagram);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case RepresentationPackage.CHILD_RULE: {
+				ChildRule childRule = (ChildRule)theEObject;
+				T result = caseChildRule(childRule);
+				if (result == null) result = caseRule(childRule);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case RepresentationPackage.PALETTE_RULE: {
+				PaletteRule paletteRule = (PaletteRule)theEObject;
+				T result = casePaletteRule(paletteRule);
+				if (result == null) result = caseRule(paletteRule);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case RepresentationPackage.PATH_ELEMENT: {
+				PathElement pathElement = (PathElement)theEObject;
+				T result = casePathElement(pathElement);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case RepresentationPackage.ASSISTANT_RULE: {
+				AssistantRule assistantRule = (AssistantRule)theEObject;
+				T result = caseAssistantRule(assistantRule);
+				if (result == null) result = caseRule(assistantRule);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Papyrus Diagram</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>Papyrus Diagram</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T casePapyrusDiagram(PapyrusDiagram object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Child Rule</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>Child Rule</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseChildRule(ChildRule object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Palette Rule</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>Palette Rule</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T casePaletteRule(PaletteRule object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Path Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Path Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T casePathElement(PathElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Assistant Rule</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>Assistant Rule</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseAssistantRule(AssistantRule object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>AD Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>AD Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseADElement(ADElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Representation Kind</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>Representation Kind</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseRepresentationKind(RepresentationKind object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Papyrus Representation Kind</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>Papyrus Representation Kind</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T casePapyrusRepresentationKind(PapyrusRepresentationKind object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Rule</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>Rule</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseRule(Rule object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+
+} //RepresentationSwitch
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/impl/AssistantRuleCustomImpl.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src/org/eclipse/papyrus/infra/gmfdiag/representation/impl/AssistantRuleCustomImpl.java
index c88993a04c7..0a399f263f0 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/impl/AssistantRuleCustomImpl.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src/org/eclipse/papyrus/infra/gmfdiag/representation/impl/AssistantRuleCustomImpl.java
@@ -11,14 +11,14 @@
  *   
  *****************************************************************************/
 
-package org.eclipse.papyrus.infra.viewpoints.configuration.impl;
+package org.eclipse.papyrus.infra.gmfdiag.representation.impl;
 
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.infra.viewpoints.configuration.Activator;
-import org.eclipse.papyrus.infra.viewpoints.configuration.AssistantRule;
+import org.eclipse.papyrus.infra.gmfdiag.representation.AssistantRule;
+import org.eclipse.papyrus.infra.gmfdiag.representation.impl.AssistantRuleImpl;
 
 /**
  * Implementation of derived features and operations for the {@link AssistantRule} model class.
@@ -49,7 +49,6 @@ public class AssistantRuleCustomImpl extends AssistantRuleImpl {
 				String elementTypeID = getElementTypeID();
 				elementTypeIDPattern = (elementTypeID == null) ? WILDCARD_PATTERN : Pattern.compile(asRegex(elementTypeID));
 			} catch (PatternSyntaxException e) {
-				Activator.INSTANCE.log(e);
 				elementTypeIDPattern = IMPOSSIBLE_PATTERN;
 			}
 		}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/impl/PathElementCustomImpl.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src/org/eclipse/papyrus/infra/gmfdiag/representation/impl/PathElementCustomImpl.java
index 002e80a8156..21d0ac1706c 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/impl/PathElementCustomImpl.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src/org/eclipse/papyrus/infra/gmfdiag/representation/impl/PathElementCustomImpl.java
@@ -10,20 +10,23 @@
  *  Benoit Maggi benoit.maggi@cea.fr - Initial API and implementation
  *
  */
-package org.eclipse.papyrus.infra.viewpoints.configuration.impl;
+package org.eclipse.papyrus.infra.gmfdiag.representation.impl;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EReference;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ChildRule;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PathElement;
-
+import org.eclipse.papyrus.infra.gmfdiag.representation.AssistantRule;
+import org.eclipse.papyrus.infra.gmfdiag.representation.ChildRule;
+import org.eclipse.papyrus.infra.gmfdiag.representation.PathElement;
 
+/**
+ * Implementation of derived features and operations for the {@link PathElement} model class.
+ */
 public class PathElementCustomImpl extends PathElementImpl implements PathElement {
 	
 	
 	/**
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.PathElementImpl#basicGetOrigin()
+	 * @see org.eclipse.papyrus.infra.architecture.representation.impl.PathElementImpl#basicGetOrigin()
 	 *
 	 * @return
 	 */
@@ -48,7 +51,7 @@ public class PathElementCustomImpl extends PathElementImpl implements PathElemen
 	
 	
 	/**
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.PathElementImpl#basicGetTarget()
+	 * @see org.eclipse.papyrus.infra.architecture.representation.impl.PathElementImpl#basicGetTarget()
 	 *
 	 * @return
 	 */
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/impl/ConfigurationFactoryCustomImpl.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src/org/eclipse/papyrus/infra/gmfdiag/representation/impl/RepresentationFactoryCustomImpl.java
index a3de46c9ba0..23f1f944479 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/impl/ConfigurationFactoryCustomImpl.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src/org/eclipse/papyrus/infra/gmfdiag/representation/impl/RepresentationFactoryCustomImpl.java
@@ -11,29 +11,30 @@
  *  Christian W. Damus - bug 463156
  *
  */
-package org.eclipse.papyrus.infra.viewpoints.configuration.impl;
+package org.eclipse.papyrus.infra.gmfdiag.representation.impl;
 
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.papyrus.infra.viewpoints.configuration.AssistantRule;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationFactory;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ModelAutoCreate;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PathElement;
+import org.eclipse.papyrus.infra.gmfdiag.representation.AssistantRule;
+import org.eclipse.papyrus.infra.gmfdiag.representation.PathElement;
+import org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationFactory;
+import org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage;
 
+/**
+ * Override for the generated {@link RepresentationFactory} class to instantiate custom classes
+ */
+public class RepresentationFactoryCustomImpl extends RepresentationFactoryImpl implements RepresentationFactory {
 
-public class ConfigurationFactoryCustomImpl extends ConfigurationFactoryImpl implements ConfigurationFactory {
-
-	public static ConfigurationFactory init() {
+	public static RepresentationFactory init() {
 		try {
-			ConfigurationFactory theConfigurationFactory = (ConfigurationFactory) EPackage.Registry.INSTANCE.getEFactory(ConfigurationPackage.eNS_URI);
-			if (theConfigurationFactory != null) {
-				return theConfigurationFactory;
+			RepresentationFactory theRepresentationFactory = (RepresentationFactory) EPackage.Registry.INSTANCE.getEFactory(RepresentationPackage.eNS_URI);
+			if (theRepresentationFactory != null) {
+				return theRepresentationFactory;
 			}
 		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
-		return new ConfigurationFactoryImpl();
+		return new RepresentationFactoryImpl();
 	}
 
 	/**
@@ -43,17 +44,11 @@ public class ConfigurationFactoryCustomImpl extends ConfigurationFactoryImpl imp
 	 * 
 	 * @generated
 	 */
-	public ConfigurationFactoryCustomImpl() {
+	public RepresentationFactoryCustomImpl() {
 		super();
 	}
 
 	@Override
-	public ModelAutoCreate createModelAutoCreate() {
-		ModelAutoCreateImpl modelAutoCreate = new ModelAutoCreateCustomImpl();
-		return modelAutoCreate;
-	}
-
-	@Override
 	public PathElement createPathElement() {
 		PathElementImpl pathElement = new PathElementCustomImpl();
 		return pathElement;
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/.classpath
index 1bdc2a0ba05..858bac421b8 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/.classpath
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/.classpath
@@ -1,7 +1,7 @@
 <?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-gen"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/.project
new file mode 100644
index 00000000000..3d6d9ee9e2d
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.gmfdiag.style.edit</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.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..087168f2cb8
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/META-INF/MANIFEST.MF
@@ -0,0 +1,29 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.style.edit;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.style.provider.StyleEditPlugin$Implementation
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.style.provider
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.gmfdiag.style;visibility:=reexport,
+ org.eclipse.emf.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.core.architecture;visibility:=reexport,
+ org.eclipse.papyrus.infra.core.architecture.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.constraints;visibility:=reexport,
+ org.eclipse.papyrus.infra.constraints.edit;visibility:=reexport,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.emf.ecore.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.types;visibility:=reexport,
+ org.eclipse.papyrus.infra.types.edit;visibility:=reexport,
+ org.eclipse.gmf.runtime.notation;visibility:=reexport,
+ org.eclipse.gmf.runtime.notation.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.architecture.representation;visibility:=reexport,
+ org.eclipse.papyrus.infra.architecture.representation.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.gmfdiag.representation;visibility:=reexport,
+ org.eclipse.papyrus.infra.gmfdiag.representation.edit;visibility:=reexport
+Bundle-ActivationPolicy: lazy
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/about.html b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/about.html
new file mode 100755
index 00000000000..6e189dc4483
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/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>June 1, 2017</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/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/build.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/build.properties
new file mode 100644
index 00000000000..7379028b912
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/build.properties
@@ -0,0 +1,20 @@
+# Copyright (c) 2013 CEA LIST.
+# 
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#  
+#  Contributors:
+#  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+#  
+# 
+
+bin.includes = .,\
+               icons/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties
+jars.compile.order = .
+source.. = src-gen/
+output.. = bin/
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/icons/full/obj16/PapyrusDiagramStyle.gif b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/icons/full/obj16/PapyrusDiagramStyle.gif
new file mode 100644
index 00000000000..2124f3e3ab2
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/icons/full/obj16/PapyrusDiagramStyle.gif
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/plugin.properties
new file mode 100644
index 00000000000..765edf79725
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/plugin.properties
@@ -0,0 +1,33 @@
+# Copyright (c) 2013 CEA LIST.
+# 
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#  
+#  Contributors:
+#  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+#  
+# 
+
+pluginName = GMF Style Edit Support
+providerName = Eclipse Modeling Project
+
+_UI_CreateChild_text = {0}
+_UI_CreateChild_text2 = {1} {0}
+_UI_CreateChild_text3 = {1}
+_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
+_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
+_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
+
+_UI_PropertyDescriptor_description = The {0} of the {1}
+
+_UI_PapyrusDiagramStyle_type = Papyrus Diagram Style
+_UI_Unknown_type = Object
+
+_UI_Unknown_datatype= Value
+
+_UI_PapyrusDiagramStyle_owner_feature = Owner
+_UI_PapyrusDiagramStyle_diagramKind_feature = Diagram Kind
+_UI_Unknown_feature = Unspecified
+
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/plugin.xml
new file mode 100644
index 00000000000..2f646b161aa
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/plugin.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+ Copyright (c) 2013 CEA LIST.
+ 
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/legal/epl-v10.html
+  
+  Contributors:
+  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+  
+ 
+-->
+
+<plugin>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated style -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/infra/gmfdiag/style"
+            class="org.eclipse.papyrus.infra.gmfdiag.style.provider.StyleItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/pom.xml
new file mode 100755
index 00000000000..c83b3b30d96
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/pom.xml
@@ -0,0 +1,13 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.gmfdiag.style.edit</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+	<description>Papyrus fork of org.eclipse.gmf.tooling.runtime to remain in the release train</description>
+</project>
\ No newline at end of file
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/ArchitectureItemProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/provider/PapyrusDiagramStyleItemProvider.java
index a7da35017f1..fa3f8f036dd 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/ArchitectureItemProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/provider/PapyrusDiagramStyleItemProvider.java
@@ -1,162 +1,180 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010.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.ItemProviderAdapter;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.viewpoints.iso42010.Architecture} object.

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

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

- *

- * @generated

- */

-public class ArchitectureItemProvider

-		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 ArchitectureItemProvider(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);

-

-			addExhibitedInPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Exhibited In feature.

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

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

-	 *

-	 * @generated

-	 */

-	protected void addExhibitedInPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_Architecture_exhibitedIn_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_Architecture_exhibitedIn_feature", "_UI_Architecture_type"),

-						Iso42010Package.Literals.ARCHITECTURE__EXHIBITED_IN,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

-	 * This returns Architecture.gif.

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

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

-	}

-

-	/**

-	 * 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_Architecture_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);

-	}

-

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return Iso42010EditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.gmfdiag.style.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.ItemProviderAdapter;
+
+import org.eclipse.papyrus.infra.gmfdiag.style.StylePackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.gmfdiag.style.PapyrusDiagramStyle} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class PapyrusDiagramStyleItemProvider 
+	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 PapyrusDiagramStyleItemProvider(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);
+
+			addOwnerPropertyDescriptor(object);
+			addDiagramKindPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Owner feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addOwnerPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_PapyrusDiagramStyle_owner_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_PapyrusDiagramStyle_owner_feature", "_UI_PapyrusDiagramStyle_type"),
+				 StylePackage.Literals.PAPYRUS_DIAGRAM_STYLE__OWNER,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Diagram Kind feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDiagramKindPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_PapyrusDiagramStyle_diagramKind_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_PapyrusDiagramStyle_diagramKind_feature", "_UI_PapyrusDiagramStyle_type"),
+				 StylePackage.Literals.PAPYRUS_DIAGRAM_STYLE__DIAGRAM_KIND,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns PapyrusDiagramStyle.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/PapyrusDiagramStyle"));
+	}
+
+	/**
+	 * 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_PapyrusDiagramStyle_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);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return StyleEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/provider/StyleEditPlugin.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/provider/StyleEditPlugin.java
new file mode 100644
index 00000000000..6d3ba4e1c37
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/provider/StyleEditPlugin.java
@@ -0,0 +1,116 @@
+/**
+ * Copyright (c) 2013 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.gmfdiag.style.provider;
+
+import org.eclipse.emf.common.EMFPlugin;
+
+import org.eclipse.emf.common.util.ResourceLocator;
+
+import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
+
+import org.eclipse.gmf.runtime.notation.NotationEditPlugin;
+import org.eclipse.papyrus.infra.architecture.representation.provider.RepresentationEditPlugin;
+import org.eclipse.papyrus.infra.constraints.provider.ConstraintsEditPlugin;
+
+import org.eclipse.papyrus.infra.core.architecture.provider.ArchitectureEditPlugin;
+import org.eclipse.papyrus.infra.types.provider.TypesConfigurationsEditPlugin;
+
+/**
+ * This is the central singleton for the Style edit plugin.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public final class StyleEditPlugin extends EMFPlugin {
+	/**
+	 * Keep track of the singleton.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final StyleEditPlugin INSTANCE = new StyleEditPlugin();
+
+	/**
+	 * Keep track of the singleton.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static Implementation plugin;
+
+	/**
+	 * Create the instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public StyleEditPlugin() {
+		super
+		  (new ResourceLocator [] {
+		     ArchitectureEditPlugin.INSTANCE,
+		     ConstraintsEditPlugin.INSTANCE,
+		     EcoreEditPlugin.INSTANCE,
+		     TypesConfigurationsEditPlugin.INSTANCE,
+		     NotationEditPlugin.INSTANCE,
+		     RepresentationEditPlugin.INSTANCE,
+		     org.eclipse.papyrus.infra.gmfdiag.representation.provider.RepresentationEditPlugin.INSTANCE,
+		   });
+	}
+
+	/**
+	 * Returns the singleton instance of the Eclipse plugin.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the singleton instance.
+	 * @generated
+	 */
+	@Override
+	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 EclipsePlugin {
+		/**
+		 * Creates an instance.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public Implementation() {
+			super();
+
+			// Remember the static instance.
+			//
+			plugin = this;
+		}
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/provider/StyleItemProviderAdapterFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/provider/StyleItemProviderAdapterFactory.java
new file mode 100644
index 00000000000..1b1b91ea184
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/provider/StyleItemProviderAdapterFactory.java
@@ -0,0 +1,210 @@
+/**
+ * Copyright (c) 2013 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.gmfdiag.style.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+
+import org.eclipse.emf.edit.provider.ChangeNotifier;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IChangeNotifier;
+import org.eclipse.emf.edit.provider.IDisposable;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.INotifyChangedListener;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+
+import org.eclipse.papyrus.infra.gmfdiag.style.util.StyleAdapterFactory;
+
+/**
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * Note that most of the adapters are shared among multiple instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class StyleItemProviderAdapterFactory extends StyleAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+	/**
+	 * This keeps track of the root adapter factory that delegates to this adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory parentAdapterFactory;
+
+	/**
+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IChangeNotifier changeNotifier = new ChangeNotifier();
+
+	/**
+	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Object> supportedTypes = new ArrayList<Object>();
+
+	/**
+	 * This constructs an instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public StyleItemProviderAdapterFactory() {
+		supportedTypes.add(IEditingDomainItemProvider.class);
+		supportedTypes.add(IStructuredItemContentProvider.class);
+		supportedTypes.add(ITreeItemContentProvider.class);
+		supportedTypes.add(IItemLabelProvider.class);
+		supportedTypes.add(IItemPropertySource.class);
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.gmfdiag.style.PapyrusDiagramStyle} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected PapyrusDiagramStyleItemProvider papyrusDiagramStyleItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.gmfdiag.style.PapyrusDiagramStyle}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createPapyrusDiagramStyleAdapter() {
+		if (papyrusDiagramStyleItemProvider == null) {
+			papyrusDiagramStyleItemProvider = new PapyrusDiagramStyleItemProvider(this);
+		}
+
+		return papyrusDiagramStyleItemProvider;
+	}
+
+	/**
+	 * This returns the root adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ComposeableAdapterFactory getRootAdapterFactory() {
+		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
+	}
+
+	/**
+	 * This sets the composed adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
+		this.parentAdapterFactory = parentAdapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object type) {
+		return supportedTypes.contains(type) || super.isFactoryForType(type);
+	}
+
+	/**
+	 * This implementation substitutes the factory itself as the key for the adapter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter adapt(Notifier notifier, Object type) {
+		return super.adapt(notifier, this);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object adapt(Object object, Object type) {
+		if (isFactoryForType(type)) {
+			Object adapter = super.adapt(object, type);
+			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
+				return adapter;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * This adds a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void addListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.addListener(notifyChangedListener);
+	}
+
+	/**
+	 * This removes a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void removeListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.removeListener(notifyChangedListener);
+	}
+
+	/**
+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void fireNotifyChanged(Notification notification) {
+		changeNotifier.fireNotifyChanged(notification);
+
+		if (parentAdapterFactory != null) {
+			parentAdapterFactory.fireNotifyChanged(notification);
+		}
+	}
+
+	/**
+	 * This disposes all of the item providers created by this factory. 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void dispose() {
+		if (papyrusDiagramStyleItemProvider != null) papyrusDiagramStyleItemProvider.dispose();
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/.classpath
new file mode 100644
index 00000000000..26e67d64ad0
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/.classpath
@@ -0,0 +1,7 @@
+<?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/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src-gen"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/.project
new file mode 100644
index 00000000000..f4d831a590c
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.gmfdiag.style</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.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..a698e59674f
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..5361a31cfdc
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/META-INF/MANIFEST.MF
@@ -0,0 +1,22 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.style;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.style,
+ org.eclipse.papyrus.infra.gmfdiag.style.impl,
+ org.eclipse.papyrus.infra.gmfdiag.style.util
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
+ org.eclipse.papyrus.infra.core.architecture;visibility:=reexport,
+ org.eclipse.papyrus.infra.constraints;visibility:=reexport,
+ org.eclipse.papyrus.infra.types;visibility:=reexport,
+ org.eclipse.gmf.runtime.notation;visibility:=reexport,
+ org.eclipse.papyrus.infra.architecture.representation;visibility:=reexport,
+ org.eclipse.papyrus.infra.gmfdiag.representation;visibility:=reexport
+Bundle-ActivationPolicy: lazy
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/about.html b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/about.html
new file mode 100755
index 00000000000..6e189dc4483
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/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>June 1, 2017</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/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/build.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/build.properties
new file mode 100644
index 00000000000..68a9505209f
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/build.properties
@@ -0,0 +1,20 @@
+# Copyright (c) 2013 CEA LIST.
+# 
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#  
+#  Contributors:
+#  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+#  
+# 
+
+bin.includes = .,\
+               model/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties
+jars.compile.order = .
+source.. = src-gen/
+output.. = bin/
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/model/style.ecore b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/model/style.ecore
new file mode 100755
index 00000000000..d01f3e9ca29
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/model/style.ecore
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="style" nsURI="http://www.eclipse.org/papyrus/infra/gmfdiag/style"
+    nsPrefix="style">
+  <eClassifiers xsi:type="ecore:EClass" name="PapyrusDiagramStyle" eSuperTypes="../../org.eclipse.gmf.runtime.notation/model/notation.ecore#//Style">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="owner" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="diagramKind" eType="ecore:EClass ../../org.eclipse.papyrus.infra.gmfdiag.representation/model/Representation.ecore#//PapyrusDiagram"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/model/style.genmodel b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/model/style.genmodel
new file mode 100755
index 00000000000..6aadfc98292
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/model/style.genmodel
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2013 CEA LIST.&#xD;&#xA;&#xD;&#xA; All rights reserved. This program and the accompanying materials&#xD;&#xA; are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA; which accompanies this distribution, and is available at&#xD;&#xA; http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA; &#xD;&#xA; Contributors:&#xD;&#xA; Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation&#xD;&#xA; &#xD;&#xA;"
+    modelDirectory="/org.eclipse.papyrus.infra.gmfdiag.style/src-gen" editDirectory="/org.eclipse.papyrus.infra.gmfdiag.style.edit/src-gen"
+    editorDirectory="/org.eclipse.papyrus.infra.gmfdiag.style.editor/src-gen" modelPluginID="org.eclipse.papyrus.infra.gmfdiag.style"
+    modelName="Style" editPluginClass="org.eclipse.papyrus.infra.gmfdiag.style.provider.StyleEditPlugin"
+    editorPluginClass="org.eclipse.papyrus.infra.gmfdiag.style.presentation.StyleEditorPlugin"
+    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory="/org.eclipse.papyrus.infra.gmfdiag.style.tests/src-gen"
+    testSuiteClass="org.eclipse.papyrus.infra.gmfdiag.style.tests.StyleAllTests" importerID="org.eclipse.emf.importer.ecore"
+    complianceLevel="6.0" copyrightFields="false" language="" usedGenPackages="../../org.eclipse.papyrus.infra.core.architecture/model/Architecture.genmodel#//architecture ../../org.eclipse.papyrus.infra.constraints/Model/Constraints.genmodel#//constraints platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel#//types ../../org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation ../../org.eclipse.papyrus.infra.architecture.representation/model/Representation.genmodel#//representation ../../org.eclipse.papyrus.infra.gmfdiag.representation/model/Representation.genmodel#//representation"
+    operationReflection="true" importOrganizing="true">
+  <foreignModel>style.ecore</foreignModel>
+  <genPackages prefix="Style" basePackage="org.eclipse.papyrus.infra.gmfdiag" resource="XMI"
+      disposableProviderFactory="true" ecorePackage="style.ecore#/">
+    <genClasses ecoreClass="style.ecore#//PapyrusDiagramStyle">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference style.ecore#//PapyrusDiagramStyle/owner"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference style.ecore#//PapyrusDiagramStyle/diagramKind"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/plugin.properties
new file mode 100644
index 00000000000..3af47a8e84a
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/plugin.properties
@@ -0,0 +1,14 @@
+# Copyright (c) 2013 CEA LIST.
+# 
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#  
+#  Contributors:
+#  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+#  
+# 
+
+pluginName = GMF Style Model
+providerName = Eclipse Modeling Project
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/plugin.xml
new file mode 100644
index 00000000000..c9dcf0cd3de
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/plugin.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+ Copyright (c) 2013 CEA LIST.
+ 
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/legal/epl-v10.html
+  
+  Contributors:
+  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+  
+ 
+-->
+
+<plugin>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated style -->
+      <package
+            uri="http://www.eclipse.org/papyrus/infra/gmfdiag/style"
+            class="org.eclipse.papyrus.infra.gmfdiag.style.StylePackage"
+            genModel="model/style.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.extension_parser">
+      <!-- @generated style -->
+      <parser
+            type="style"
+            class="org.eclipse.papyrus.infra.gmfdiag.style.util.StyleResourceFactoryImpl"/>
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/pom.xml
new file mode 100755
index 00000000000..76ebabf6aef
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/pom.xml
@@ -0,0 +1,13 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.gmfdiag.style</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+	<description>Papyrus fork of org.eclipse.gmf.tooling.runtime to remain in the release train</description>
+</project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/PapyrusDiagramStyle.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/PapyrusDiagramStyle.java
new file mode 100644
index 00000000000..c83263f1147
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/PapyrusDiagramStyle.java
@@ -0,0 +1,92 @@
+/**
+ * Copyright (c) 2013 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.gmfdiag.style;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.gmf.runtime.notation.Style;
+
+import org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Papyrus Diagram Style</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.style.PapyrusDiagramStyle#getOwner <em>Owner</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.style.PapyrusDiagramStyle#getDiagramKind <em>Diagram Kind</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.gmfdiag.style.StylePackage#getPapyrusDiagramStyle()
+ * @model
+ * @generated
+ */
+public interface PapyrusDiagramStyle extends Style {
+	/**
+	 * Returns the value of the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Owner</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Owner</em>' reference.
+	 * @see #setOwner(EObject)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.style.StylePackage#getPapyrusDiagramStyle_Owner()
+	 * @model required="true"
+	 * @generated
+	 */
+	EObject getOwner();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.style.PapyrusDiagramStyle#getOwner <em>Owner</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Owner</em>' reference.
+	 * @see #getOwner()
+	 * @generated
+	 */
+	void setOwner(EObject value);
+
+	/**
+	 * Returns the value of the '<em><b>Diagram Kind</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Diagram Kind</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Diagram Kind</em>' reference.
+	 * @see #setDiagramKind(PapyrusDiagram)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.style.StylePackage#getPapyrusDiagramStyle_DiagramKind()
+	 * @model
+	 * @generated
+	 */
+	PapyrusDiagram getDiagramKind();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.style.PapyrusDiagramStyle#getDiagramKind <em>Diagram Kind</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Diagram Kind</em>' reference.
+	 * @see #getDiagramKind()
+	 * @generated
+	 */
+	void setDiagramKind(PapyrusDiagram value);
+
+} // PapyrusDiagramStyle
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/StyleFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/StyleFactory.java
new file mode 100644
index 00000000000..4c19799e218
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/StyleFactory.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) 2013 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.gmfdiag.style;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.gmfdiag.style.StylePackage
+ * @generated
+ */
+public interface StyleFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	StyleFactory eINSTANCE = org.eclipse.papyrus.infra.gmfdiag.style.impl.StyleFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Papyrus Diagram Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Papyrus Diagram Style</em>'.
+	 * @generated
+	 */
+	PapyrusDiagramStyle createPapyrusDiagramStyle();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	StylePackage getStylePackage();
+
+} //StyleFactory
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/StylePackage.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/StylePackage.java
new file mode 100644
index 00000000000..7915e85d260
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/StylePackage.java
@@ -0,0 +1,201 @@
+/**
+ * Copyright (c) 2013 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.gmfdiag.style;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ *   <li>each class,</li>
+ *   <li>each feature of each class,</li>
+ *   <li>each operation of each class,</li>
+ *   <li>each enum,</li>
+ *   <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.gmfdiag.style.StyleFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface StylePackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "style";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/infra/gmfdiag/style";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "style";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	StylePackage eINSTANCE = org.eclipse.papyrus.infra.gmfdiag.style.impl.StylePackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.style.impl.PapyrusDiagramStyleImpl <em>Papyrus Diagram Style</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.gmfdiag.style.impl.PapyrusDiagramStyleImpl
+	 * @see org.eclipse.papyrus.infra.gmfdiag.style.impl.StylePackageImpl#getPapyrusDiagramStyle()
+	 * @generated
+	 */
+	int PAPYRUS_DIAGRAM_STYLE = 0;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_DIAGRAM_STYLE__OWNER = NotationPackage.STYLE_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Diagram Kind</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_DIAGRAM_STYLE__DIAGRAM_KIND = NotationPackage.STYLE_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Papyrus Diagram Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_DIAGRAM_STYLE_FEATURE_COUNT = NotationPackage.STYLE_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of operations of the '<em>Papyrus Diagram Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 * @ordered
+	 */
+	int PAPYRUS_DIAGRAM_STYLE_OPERATION_COUNT = 0;
+
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.style.PapyrusDiagramStyle <em>Papyrus Diagram Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Papyrus Diagram Style</em>'.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.style.PapyrusDiagramStyle
+	 * @generated
+	 */
+	EClass getPapyrusDiagramStyle();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.gmfdiag.style.PapyrusDiagramStyle#getOwner <em>Owner</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Owner</em>'.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.style.PapyrusDiagramStyle#getOwner()
+	 * @see #getPapyrusDiagramStyle()
+	 * @generated
+	 */
+	EReference getPapyrusDiagramStyle_Owner();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.gmfdiag.style.PapyrusDiagramStyle#getDiagramKind <em>Diagram Kind</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Diagram Kind</em>'.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.style.PapyrusDiagramStyle#getDiagramKind()
+	 * @see #getPapyrusDiagramStyle()
+	 * @generated
+	 */
+	EReference getPapyrusDiagramStyle_DiagramKind();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	StyleFactory getStyleFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 *   <li>each class,</li>
+	 *   <li>each feature of each class,</li>
+	 *   <li>each operation of each class,</li>
+	 *   <li>each enum,</li>
+	 *   <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.style.impl.PapyrusDiagramStyleImpl <em>Papyrus Diagram Style</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.gmfdiag.style.impl.PapyrusDiagramStyleImpl
+		 * @see org.eclipse.papyrus.infra.gmfdiag.style.impl.StylePackageImpl#getPapyrusDiagramStyle()
+		 * @generated
+		 */
+		EClass PAPYRUS_DIAGRAM_STYLE = eINSTANCE.getPapyrusDiagramStyle();
+
+		/**
+		 * The meta object literal for the '<em><b>Owner</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PAPYRUS_DIAGRAM_STYLE__OWNER = eINSTANCE.getPapyrusDiagramStyle_Owner();
+
+		/**
+		 * The meta object literal for the '<em><b>Diagram Kind</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PAPYRUS_DIAGRAM_STYLE__DIAGRAM_KIND = eINSTANCE.getPapyrusDiagramStyle_DiagramKind();
+
+	}
+
+} //StylePackage
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/impl/PapyrusDiagramStyleImpl.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/impl/PapyrusDiagramStyleImpl.java
new file mode 100644
index 00000000000..a28294a5a8f
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/impl/PapyrusDiagramStyleImpl.java
@@ -0,0 +1,229 @@
+/**
+ * Copyright (c) 2013 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.gmfdiag.style.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram;
+import org.eclipse.papyrus.infra.gmfdiag.style.PapyrusDiagramStyle;
+import org.eclipse.papyrus.infra.gmfdiag.style.StylePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Papyrus Diagram Style</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.style.impl.PapyrusDiagramStyleImpl#getOwner <em>Owner</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.style.impl.PapyrusDiagramStyleImpl#getDiagramKind <em>Diagram Kind</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class PapyrusDiagramStyleImpl extends MinimalEObjectImpl.Container implements PapyrusDiagramStyle {
+	/**
+	 * The cached value of the '{@link #getOwner() <em>Owner</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getOwner()
+	 * @generated
+	 * @ordered
+	 */
+	protected EObject owner;
+
+	/**
+	 * The cached value of the '{@link #getDiagramKind() <em>Diagram Kind</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDiagramKind()
+	 * @generated
+	 * @ordered
+	 */
+	protected PapyrusDiagram diagramKind;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected PapyrusDiagramStyleImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return StylePackage.Literals.PAPYRUS_DIAGRAM_STYLE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EObject getOwner() {
+		if (owner != null && owner.eIsProxy()) {
+			InternalEObject oldOwner = (InternalEObject)owner;
+			owner = eResolveProxy(oldOwner);
+			if (owner != oldOwner) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, StylePackage.PAPYRUS_DIAGRAM_STYLE__OWNER, oldOwner, owner));
+			}
+		}
+		return owner;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EObject basicGetOwner() {
+		return owner;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setOwner(EObject newOwner) {
+		EObject oldOwner = owner;
+		owner = newOwner;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StylePackage.PAPYRUS_DIAGRAM_STYLE__OWNER, oldOwner, owner));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public PapyrusDiagram getDiagramKind() {
+		if (diagramKind != null && diagramKind.eIsProxy()) {
+			InternalEObject oldDiagramKind = (InternalEObject)diagramKind;
+			diagramKind = (PapyrusDiagram)eResolveProxy(oldDiagramKind);
+			if (diagramKind != oldDiagramKind) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, StylePackage.PAPYRUS_DIAGRAM_STYLE__DIAGRAM_KIND, oldDiagramKind, diagramKind));
+			}
+		}
+		return diagramKind;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public PapyrusDiagram basicGetDiagramKind() {
+		return diagramKind;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDiagramKind(PapyrusDiagram newDiagramKind) {
+		PapyrusDiagram oldDiagramKind = diagramKind;
+		diagramKind = newDiagramKind;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StylePackage.PAPYRUS_DIAGRAM_STYLE__DIAGRAM_KIND, oldDiagramKind, diagramKind));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case StylePackage.PAPYRUS_DIAGRAM_STYLE__OWNER:
+				if (resolve) return getOwner();
+				return basicGetOwner();
+			case StylePackage.PAPYRUS_DIAGRAM_STYLE__DIAGRAM_KIND:
+				if (resolve) return getDiagramKind();
+				return basicGetDiagramKind();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case StylePackage.PAPYRUS_DIAGRAM_STYLE__OWNER:
+				setOwner((EObject)newValue);
+				return;
+			case StylePackage.PAPYRUS_DIAGRAM_STYLE__DIAGRAM_KIND:
+				setDiagramKind((PapyrusDiagram)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case StylePackage.PAPYRUS_DIAGRAM_STYLE__OWNER:
+				setOwner((EObject)null);
+				return;
+			case StylePackage.PAPYRUS_DIAGRAM_STYLE__DIAGRAM_KIND:
+				setDiagramKind((PapyrusDiagram)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case StylePackage.PAPYRUS_DIAGRAM_STYLE__OWNER:
+				return owner != null;
+			case StylePackage.PAPYRUS_DIAGRAM_STYLE__DIAGRAM_KIND:
+				return diagramKind != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //PapyrusDiagramStyleImpl
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/impl/StyleFactoryImpl.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/impl/StyleFactoryImpl.java
new file mode 100644
index 00000000000..ea04a6f7fcb
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/impl/StyleFactoryImpl.java
@@ -0,0 +1,105 @@
+/**
+ * Copyright (c) 2013 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.gmfdiag.style.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.infra.gmfdiag.style.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class StyleFactoryImpl extends EFactoryImpl implements StyleFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static StyleFactory init() {
+		try {
+			StyleFactory theStyleFactory = (StyleFactory)EPackage.Registry.INSTANCE.getEFactory(StylePackage.eNS_URI);
+			if (theStyleFactory != null) {
+				return theStyleFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new StyleFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public StyleFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case StylePackage.PAPYRUS_DIAGRAM_STYLE: return createPapyrusDiagramStyle();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public PapyrusDiagramStyle createPapyrusDiagramStyle() {
+		PapyrusDiagramStyleImpl papyrusDiagramStyle = new PapyrusDiagramStyleImpl();
+		return papyrusDiagramStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public StylePackage getStylePackage() {
+		return (StylePackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static StylePackage getPackage() {
+		return StylePackage.eINSTANCE;
+	}
+
+} //StyleFactoryImpl
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/impl/StylePackageImpl.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/impl/StylePackageImpl.java
new file mode 100644
index 00000000000..05a2b21db9a
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/impl/StylePackageImpl.java
@@ -0,0 +1,213 @@
+/**
+ * Copyright (c) 2013 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.gmfdiag.style.impl;
+
+import org.eclipse.emf.ecore.EClass;
+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.gmf.runtime.notation.NotationPackage;
+
+import org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage;
+import org.eclipse.papyrus.infra.gmfdiag.style.PapyrusDiagramStyle;
+import org.eclipse.papyrus.infra.gmfdiag.style.StyleFactory;
+import org.eclipse.papyrus.infra.gmfdiag.style.StylePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class StylePackageImpl extends EPackageImpl implements StylePackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass papyrusDiagramStyleEClass = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.papyrus.infra.gmfdiag.style.StylePackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private StylePackageImpl() {
+		super(eNS_URI, StyleFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>This method is used to initialize {@link StylePackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static StylePackage init() {
+		if (isInited) return (StylePackage)EPackage.Registry.INSTANCE.getEPackage(StylePackage.eNS_URI);
+
+		// Obtain or create and register package
+		StylePackageImpl theStylePackage = (StylePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof StylePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new StylePackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		NotationPackage.eINSTANCE.eClass();
+		RepresentationPackage.eINSTANCE.eClass();
+
+		// Create package meta-data objects
+		theStylePackage.createPackageContents();
+
+		// Initialize created meta-data
+		theStylePackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theStylePackage.freeze();
+
+  
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(StylePackage.eNS_URI, theStylePackage);
+		return theStylePackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getPapyrusDiagramStyle() {
+		return papyrusDiagramStyleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getPapyrusDiagramStyle_Owner() {
+		return (EReference)papyrusDiagramStyleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getPapyrusDiagramStyle_DiagramKind() {
+		return (EReference)papyrusDiagramStyleEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public StyleFactory getStyleFactory() {
+		return (StyleFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		papyrusDiagramStyleEClass = createEClass(PAPYRUS_DIAGRAM_STYLE);
+		createEReference(papyrusDiagramStyleEClass, PAPYRUS_DIAGRAM_STYLE__OWNER);
+		createEReference(papyrusDiagramStyleEClass, PAPYRUS_DIAGRAM_STYLE__DIAGRAM_KIND);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		NotationPackage theNotationPackage = (NotationPackage)EPackage.Registry.INSTANCE.getEPackage(NotationPackage.eNS_URI);
+		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+		RepresentationPackage theRepresentationPackage = (RepresentationPackage)EPackage.Registry.INSTANCE.getEPackage(RepresentationPackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		papyrusDiagramStyleEClass.getESuperTypes().add(theNotationPackage.getStyle());
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(papyrusDiagramStyleEClass, PapyrusDiagramStyle.class, "PapyrusDiagramStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getPapyrusDiagramStyle_Owner(), theEcorePackage.getEObject(), null, "owner", null, 1, 1, PapyrusDiagramStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getPapyrusDiagramStyle_DiagramKind(), theRepresentationPackage.getPapyrusDiagram(), null, "diagramKind", null, 0, 1, PapyrusDiagramStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		// Create resource
+		createResource(eNS_URI);
+	}
+
+} //StylePackageImpl
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/util/StyleAdapterFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/util/StyleAdapterFactory.java
new file mode 100644
index 00000000000..8f64e5cb68c
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/util/StyleAdapterFactory.java
@@ -0,0 +1,150 @@
+/**
+ * Copyright (c) 2013 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.gmfdiag.style.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.gmf.runtime.notation.Style;
+import org.eclipse.papyrus.infra.gmfdiag.style.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.gmfdiag.style.StylePackage
+ * @generated
+ */
+public class StyleAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static StylePackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public StyleAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = StylePackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected StyleSwitch<Adapter> modelSwitch =
+		new StyleSwitch<Adapter>() {
+			@Override
+			public Adapter casePapyrusDiagramStyle(PapyrusDiagramStyle object) {
+				return createPapyrusDiagramStyleAdapter();
+			}
+			@Override
+			public Adapter caseStyle(Style object) {
+				return createStyleAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.gmfdiag.style.PapyrusDiagramStyle <em>Papyrus Diagram Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.style.PapyrusDiagramStyle
+	 * @generated
+	 */
+	public Adapter createPapyrusDiagramStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.Style <em>Style</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.gmf.runtime.notation.Style
+	 * @generated
+	 */
+	public Adapter createStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+
+} //StyleAdapterFactory
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/util/ConfigurationResourceFactoryImpl.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/util/StyleResourceFactoryImpl.java
index f53210e44c4..eeb1e9dba4a 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/util/ConfigurationResourceFactoryImpl.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/util/StyleResourceFactoryImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
+ * Copyright (c) 2013 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
@@ -8,35 +8,32 @@
  *  
  *  Contributors:
  *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
  *  
  * 
  */
-package org.eclipse.papyrus.infra.viewpoints.configuration.util;
+package org.eclipse.papyrus.infra.gmfdiag.style.util;
 
 import org.eclipse.emf.common.util.URI;
+
 import org.eclipse.emf.ecore.resource.Resource;
+
 import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
 
 /**
  * <!-- begin-user-doc -->
  * The <b>Resource Factory</b> associated with the package.
  * <!-- end-user-doc -->
- * 
- * @see org.eclipse.papyrus.infra.viewpoints.configuration.util.ConfigurationResourceImpl
+ * @see org.eclipse.papyrus.infra.gmfdiag.style.util.StyleResourceImpl
  * @generated
- * @deprecated Use the {@link ConfigurationResourceFactoryCustomImpl} class, instead.
  */
-@Deprecated
-public class ConfigurationResourceFactoryImpl extends ResourceFactoryImpl {
+public class StyleResourceFactoryImpl extends ResourceFactoryImpl {
 	/**
 	 * Creates an instance of the resource factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
-	public ConfigurationResourceFactoryImpl() {
+	public StyleResourceFactoryImpl() {
 		super();
 	}
 
@@ -44,13 +41,12 @@ public class ConfigurationResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Resource createResource(URI uri) {
-		Resource result = new ConfigurationResourceImpl(uri);
+		Resource result = new StyleResourceImpl(uri);
 		return result;
 	}
 
-} // ConfigurationResourceFactoryImpl
+} //StyleResourceFactoryImpl
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/util/ConfigurationResourceImpl.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/util/StyleResourceImpl.java
index 19ff2e1eff1..a7a1598232d 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/util/ConfigurationResourceImpl.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/util/StyleResourceImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
+ * Copyright (c) 2013 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
@@ -8,37 +8,40 @@
  *  
  *  Contributors:
  *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
  *  
  * 
  */
-package org.eclipse.papyrus.infra.viewpoints.configuration.util;
+package org.eclipse.papyrus.infra.gmfdiag.style.util;
 
 import org.eclipse.emf.common.util.URI;
+
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
 
 /**
  * <!-- begin-user-doc -->
  * The <b>Resource </b> associated with the package.
  * <!-- end-user-doc -->
- * 
- * @see org.eclipse.papyrus.infra.viewpoints.configuration.util.ConfigurationResourceFactoryImpl
+ * @see org.eclipse.papyrus.infra.gmfdiag.style.util.StyleResourceFactoryImpl
  * @generated
- * @deprecated Use the {@link ConfigurationResourceCustomImpl} class, instead.
  */
-@Deprecated
-public class ConfigurationResourceImpl extends XMIResourceImpl {
+public class StyleResourceImpl extends XMIResourceImpl {
 	/**
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @param uri
-	 *            the URI of the new resource.
+	 * @param uri the URI of the new resource.
 	 * @generated
 	 */
-	public ConfigurationResourceImpl(URI uri) {
+	public StyleResourceImpl(URI uri) {
 		super(uri);
 	}
 
-} // ConfigurationResourceImpl
+	/**
+	 * @generated NOT - use UUIDs rather than positions
+	 */
+	@Override
+	protected boolean useUUIDs() {
+		return true;
+	}
+
+} //StyleResourceImpl
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/util/StyleSwitch.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/util/StyleSwitch.java
new file mode 100644
index 00000000000..b0009c5c2d6
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/util/StyleSwitch.java
@@ -0,0 +1,138 @@
+/**
+ * Copyright (c) 2013 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.gmfdiag.style.util;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.util.Switch;
+
+import org.eclipse.gmf.runtime.notation.Style;
+import org.eclipse.papyrus.infra.gmfdiag.style.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.gmfdiag.style.StylePackage
+ * @generated
+ */
+public class StyleSwitch<T> extends Switch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static StylePackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public StyleSwitch() {
+		if (modelPackage == null) {
+			modelPackage = StylePackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case StylePackage.PAPYRUS_DIAGRAM_STYLE: {
+				PapyrusDiagramStyle papyrusDiagramStyle = (PapyrusDiagramStyle)theEObject;
+				T result = casePapyrusDiagramStyle(papyrusDiagramStyle);
+				if (result == null) result = caseStyle(papyrusDiagramStyle);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Papyrus Diagram Style</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>Papyrus Diagram Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T casePapyrusDiagramStyle(PapyrusDiagramStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Style</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>Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseStyle(Style object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+
+} //StyleSwitch
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/plugin.xml
index 2097a231bae..e83cbca1ad3 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/plugin.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/plugin.xml
@@ -3,7 +3,7 @@
 <plugin>
 	<extension-point id="ocl_tracker_factory" name="GMF-Tooling OCL Tracker Factory" schema="schema/ocl_tracker_factory.exsd"/>
 
-	<extension point="org.eclipse.gmf.tooling.runtime.ocl_tracker_factory">
+	<extension point="org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl_tracker_factory">
 		<oclTrackerFactory
         	class="org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.tracker.activeocl.ActiveOclTrackerFactory"
         	default="false"/>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/src/org/eclipse/papyrus/infra/gmfdiag/welcome/internal/widgets/CreateNewNotationButton.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/src/org/eclipse/papyrus/infra/gmfdiag/welcome/internal/widgets/CreateNewNotationButton.java
index 577901f1026..e7bc13ee032 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/src/org/eclipse/papyrus/infra/gmfdiag/welcome/internal/widgets/CreateNewNotationButton.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/src/org/eclipse/papyrus/infra/gmfdiag/welcome/internal/widgets/CreateNewNotationButton.java
@@ -126,7 +126,7 @@ public class CreateNewNotationButton extends Composite {
 					EObject object = EMFHelper.getEObject(element);
 					if (object != null) {
 						// build a list of all the available prototypes
-						for (final ViewPrototype proto : PolicyChecker.getCurrent().getPrototypesFor(object)) {
+						for (final ViewPrototype proto : PolicyChecker.getFor(object).getPrototypesFor(object)) {
 							availablePrototypes.add(proto);
 						}
 					}
diff --git a/plugins/infra/gmfdiag/pom.xml b/plugins/infra/gmfdiag/pom.xml
index 6a68dbc8863..e5b9819f1aa 100644
--- a/plugins/infra/gmfdiag/pom.xml
+++ b/plugins/infra/gmfdiag/pom.xml
@@ -33,6 +33,10 @@
 		<module>org.eclipse.papyrus.infra.gmfdiag.welcome</module>
 		<module>org.eclipse.papyrus.infra.gmfdiag.widgets</module>
 		<module>org.eclipse.papyrus.infra.gmfdiag.tooling.runtime</module>
+		<module>org.eclipse.papyrus.infra.gmfdiag.representation</module>
+		<module>org.eclipse.papyrus.infra.gmfdiag.representation.edit</module>
+		<module>org.eclipse.papyrus.infra.gmfdiag.style</module>
+		<module>org.eclipse.papyrus.infra.gmfdiag.style.edit</module>
 		<module>assistant</module>
 		<module>css</module>
 		<module>expansion</module>
diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.common/META-INF/MANIFEST.MF b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.common/META-INF/MANIFEST.MF
index d0413afa7d4..7e90ac58bfe 100644
--- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.common/META-INF/MANIFEST.MF
+++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.common/META-INF/MANIFEST.MF
@@ -14,6 +14,7 @@ Export-Package: org.eclipse.papyrus.infra.internationalization.common,
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[2.3.0,3.0.0)",
  org.eclipse.ui.workbench;bundle-version="[3.108.0,4.0.0)",
  org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.jface;bundle-version="[3.12.0,4.0.0)"
diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/src/org/eclipse/papyrus/infra/internationalization/modelresource/InternationalizationModelResource.java b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/src/org/eclipse/papyrus/infra/internationalization/modelresource/InternationalizationModelResource.java
index f822992cac8..ee8bc05ebb4 100644
--- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/src/org/eclipse/papyrus/infra/internationalization/modelresource/InternationalizationModelResource.java
+++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/src/org/eclipse/papyrus/infra/internationalization/modelresource/InternationalizationModelResource.java
@@ -255,7 +255,7 @@ public class InternationalizationModelResource extends AbstractModelWithSharedRe
 	 */
 	public void addResourceToModel(final URI uri, final Resource resource, final Locale locale) {
 		resourceURI = uri.trimFileExtension().appendFileExtension(getModelFileExtension());
-		configureResource(resource, locale);
+		configureResource(resourceURI, resource, locale);
 	}
 
 	/**
@@ -359,13 +359,13 @@ public class InternationalizationModelResource extends AbstractModelWithSharedRe
 
 			// Check if model is loaded.
 			if (null != resource) {
-				configureResource(resource, locale);
+				configureResource(uri, resource, locale);
 			} else {
 				// model is not loaded, do it.
 				// Create Resource of appropriate type
 				resource = modelSet.createResource(resourceBundleAndURI.getUri());
 
-				configureResource(resource, locale);
+				configureResource(uri, resource, locale);
 
 				// call registered snippets
 				startSnippets();
@@ -425,22 +425,22 @@ public class InternationalizationModelResource extends AbstractModelWithSharedRe
 	 * @param locale
 	 *            The locale to manage.
 	 */
-	protected void configureResource(final Resource resourceToConfigure, final Locale locale) {
+	protected void configureResource(final URI uri, final Resource resourceToConfigure, final Locale locale) {
 		if (resourceToConfigure instanceof InternationalizationResource) {
 			final Map<Object, Object> defaultLoadOptions = ((InternationalizationResource) resourceToConfigure)
 					.getDefaultLoadOptions();
 			defaultLoadOptions.put(InternationalizationResourceOptionsConstants.LOAD_SAVE_OPTION_KEY_RESOLVER,
 					keyResolver);
 			defaultLoadOptions.put(InternationalizationResourceOptionsConstants.LOAD_OPTION_LOCALE, locale);
-			defaultLoadOptions.put(InternationalizationResourceOptionsConstants.LOAD_OPTION_URI, resourceURI);
+			defaultLoadOptions.put(InternationalizationResourceOptionsConstants.LOAD_OPTION_URI, uri);
 		}
 		super.configureResource(resourceToConfigure);
 		// Add the resource to the resource properties classified by their
 		// locale
-		if (null == propertiesByLocale.get(resourceURI)) {
-			propertiesByLocale.put(resourceURI, new HashMap<Locale, Resource>());
+		if (null == propertiesByLocale.get(uri)) {
+			propertiesByLocale.put(uri, new HashMap<Locale, Resource>());
 		}
-		propertiesByLocale.get(resourceURI).put(locale, resourceToConfigure);
+		propertiesByLocale.get(uri).put(locale, resourceToConfigure);
 	}
 
 	/**
@@ -491,7 +491,7 @@ public class InternationalizationModelResource extends AbstractModelWithSharedRe
 
 		// Create the resource needed
 		final Resource resultResource = modelSet.createResource(propertiesURI);
-		configureResource(resultResource, locale);
+		configureResource(propertiesURI, resultResource, locale);
 		// Load the resource if not already loaded
 		if (!resultResource.isLoaded()) {
 			try {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/.classpath b/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/.classpath
index 098194ca4b7..eca7bdba8f0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/.classpath
+++ b/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/.classpath
@@ -1,6 +1,6 @@
 <?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/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/.settings/org.eclipse.jdt.core.prefs
index f08be2b06c4..8ddd9a88d57 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/META-INF/MANIFEST.MF
index ae89ae09070..c38826267f5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/META-INF/MANIFEST.MF
@@ -25,7 +25,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.papyrus.customization.nattableconfiguration,
  org.eclipse.papyrus.customization.nattableconfiguration.edition,
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/AbstractSynchronizedOnEStructuralFeatureAxisManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/AbstractSynchronizedOnEStructuralFeatureAxisManager.java
index 52648dce925..83db1f276a8 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/AbstractSynchronizedOnEStructuralFeatureAxisManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/AbstractSynchronizedOnEStructuralFeatureAxisManager.java
@@ -28,8 +28,11 @@ import org.eclipse.emf.common.notify.impl.AdapterImpl;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.nattable.Activator;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager;
 import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
@@ -38,6 +41,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurati
 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;
 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
 import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
 
@@ -481,14 +485,19 @@ public abstract class AbstractSynchronizedOnEStructuralFeatureAxisManager extend
 	 */
 	@Override
 	public Command getDestroyAxisElementCommand(TransactionalEditingDomain domain, Integer axisPosition) {
-		if (canDestroyAxisElement(axisPosition)) {
-			final Object current = getElements().get(axisPosition);
-			Object elementToDestroy = AxisUtils.getRepresentedElement(current);
-			if (elementToDestroy != null && elementToDestroy instanceof EObject) {
-				final DestroyElementRequest request = new DestroyElementRequest(getContextEditingDomain(), (EObject) elementToDestroy, false);
-				final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(elementToDestroy);
-				return new RemoveCommandWrapper(new GMFtoEMFCommandWrapper(provider.getEditCommand(request)), Collections.singleton(elementToDestroy));
+		try {
+			if (canDestroyAxisElement(axisPosition)) {
+				final Object current = getElements().get(axisPosition);
+				Object elementToDestroy = AxisUtils.getRepresentedElement(current);
+				if (elementToDestroy != null && elementToDestroy instanceof EObject) {
+					final DestroyElementRequest request = new DestroyElementRequest(getContextEditingDomain(), (EObject) elementToDestroy, false);
+					IClientContext context = TypeContext.getContext(domain);
+					final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(elementToDestroy, context);
+					return new RemoveCommandWrapper(new GMFtoEMFCommandWrapper(provider.getEditCommand(request)), Collections.singleton(elementToDestroy));
+				}
 			}
+		} catch (ServiceException e) {
+			Activator.log.error(e);
 		}
 		return UnexecutableCommand.INSTANCE;
 	}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF
index 17c21e03b24..f9ead8618e5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF
@@ -4,7 +4,9 @@ Export-Package: org.eclipse.papyrus.infra.nattable.common,
  org.eclipse.papyrus.infra.nattable.common.editor,
  org.eclipse.papyrus.infra.nattable.common.factory,
  org.eclipse.papyrus.infra.nattable.common.handlers,
+ org.eclipse.papyrus.infra.nattable.common.helper,
  org.eclipse.papyrus.infra.nattable.common.modelresource,
+ org.eclipse.papyrus.infra.nattable.common.reconciler,
  org.eclipse.papyrus.infra.nattable.common.utils,
  org.eclipse.papyrus.infra.nattable.common.wizards,
  org.eclipse.papyrus.infra.nattable.internal.common.commands;x-friends:="org.eclipse.papyrus.infra.nattable.gmfdiag"
@@ -18,7 +20,8 @@ Require-Bundle: org.eclipse.papyrus.infra.nattable;bundle-version="[3.0.0,4.0.0)
  org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.infra.internationalization.common;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.papyrus.infra.internationalization.common;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.nattable.representation;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 3.0.0.qualifier
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/plugin.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/plugin.xml
index 2c10f8d75c4..de1199dbc77 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/plugin.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/plugin.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <plugin>
+   <extension-point id="tableReconciler" name="tableReconciler" schema="schema/tableReconciler.exsd"/>
+
 <!--We declare the model used for the Papyrus Table Editor  -->
    <extension point="org.eclipse.papyrus.infra.core.model">
       <model classname="org.eclipse.papyrus.infra.nattable.common.modelresource.PapyrusNattableModel" description="Model for Papyrus Nattable editors">
@@ -271,11 +273,4 @@
       </activeWhen>
    </handler>
 </extension>
-<extension
-      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
-   <elementTypeSet
-         clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
-         path="model/nattable-common.elementtypesconfigurations">
-   </elementTypeSet>
-</extension>
 </plugin>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.configuration.exsd b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/schema/tableReconciler.exsd
index e2551c85634..eebd998baae 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.configuration.exsd
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/schema/tableReconciler.exsd
@@ -1,134 +1,116 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.nattable" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appinfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.nattable" id="org.eclipse.papyrus.infra.nattable.configuration" name="Nattable Configuration"/>

-      </appinfo>

-      <documentation>

-         This extension point allows to contribute table configurations to a catalog. This catalog allows to reuse existing configuration in a editor, a property view, and so on.

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appinfo>

-            <meta.element />

-         </appinfo>

-      </annotation>

-      <complexType>

-         <sequence minOccurs="1" maxOccurs="unbounded">

-            <element ref="configuration"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute translatable="true"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="configuration">

-      <annotation>

-         <documentation>

-            The file must be an EMF Model, with only one root. This root must be a TableConfiguration and its extension must be &quot;.nattableconfiguration&quot;.

-         </documentation>

-      </annotation>

-      <complexType>

-         <attribute name="file" type="string" use="required">

-            <annotation>

-               <documentation>

-                  a file with the extension .nattableconfiguration

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="resource"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-         <attribute name="type" type="string" use="required">

-            <annotation>

-               <documentation>

-                  The unique type identifier of the table as a string

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="since"/>

-      </appinfo>

-      <documentation>

-         MDT papyrus 0.10.0

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="examples"/>

-      </appinfo>

-      <documentation>

-         See Papyrus nattable plugins

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="apiinfo"/>

-      </appinfo>

-      <documentation>

-         one

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="implementation"/>

-      </appinfo>

-      <documentation>

-         none

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="copyright"/>

-      </appinfo>

-      <documentation>

-         /*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-      </documentation>

-   </annotation>

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.nattable.common" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.nattable.common" id="tableReconciler" name="tableReconciler"/>
+      </appinfo>
+      <documentation>
+         [Enter description of this extension point.]
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <sequence minOccurs="1" maxOccurs="unbounded">
+            <element ref="tableReconciler"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute translatable="true"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="tableReconciler">
+      <complexType>
+         <attribute name="reconcilerClass" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn="org.eclipse.papyrus.infra.nattable.common.reconciler.TableReconciler:"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+         <attribute name="source" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="target" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="since"/>
+      </appinfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="examples"/>
+      </appinfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="apiinfo"/>
+      </appinfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="implementation"/>
+      </appinfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+
+</schema>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/api/TableEditorCreationHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/api/TableEditorCreationHelper.java
index 4e8f340936a..2a55b328ec9 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/api/TableEditorCreationHelper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/api/TableEditorCreationHelper.java
@@ -26,6 +26,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind;
 import org.eclipse.papyrus.infra.core.resource.ModelSet;
 import org.eclipse.papyrus.infra.core.resource.NotFoundException;
 import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
@@ -40,9 +41,8 @@ import org.eclipse.papyrus.infra.nattable.internal.common.commands.CreateAndOpen
 import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;
 import org.eclipse.papyrus.infra.nattable.nattableconfiguration.NattableConfigurationRegistry;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusSyncTable;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusTable;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView;
+import org.eclipse.papyrus.infra.nattable.representation.PapyrusSyncTable;
+import org.eclipse.papyrus.infra.nattable.representation.PapyrusTable;
 import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
 import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
 
@@ -372,15 +372,15 @@ public class TableEditorCreationHelper {
 	 */
 	protected URI getTableConfigurationURI(TableViewPrototype viewPrototype) {
 		Assert.isNotNull(viewPrototype);
-		if (viewPrototype.getConfiguration() instanceof PapyrusTable) {
-			PapyrusTable papyrusTable = (PapyrusTable) viewPrototype.getConfiguration();
+		if (viewPrototype.getRepresentationKind() instanceof PapyrusTable) {
+			PapyrusTable papyrusTable = (PapyrusTable) viewPrototype.getRepresentationKind();
 			String uri = papyrusTable.getConfiguration();
 			if (uri != null && uri.length() > 0) {
 				return URI.createURI(uri);
 			}
 		}
-		if (viewPrototype.getConfiguration() instanceof PapyrusSyncTable) {
-			return NattableConfigurationRegistry.INSTANCE.getConfigurationURI(((PapyrusSyncTable) viewPrototype.getConfiguration()).getImplementationID());
+		if (viewPrototype.getRepresentationKind() instanceof PapyrusSyncTable) {
+			return NattableConfigurationRegistry.INSTANCE.getConfigurationURI(((PapyrusSyncTable) viewPrototype.getRepresentationKind()).getImplementationID());
 		}
 		return null;
 	}
@@ -399,7 +399,7 @@ public class TableEditorCreationHelper {
 			return null;
 		}
 		// 1. get all available view prototype for the table context
-		Collection<ViewPrototype> prototypes = PolicyChecker.getCurrent().getPrototypesFor(tableContext);
+		Collection<ViewPrototype> prototypes = PolicyChecker.getFor(tableContext).getPrototypesFor(tableContext);
 		Iterator<ViewPrototype> iter = prototypes.iterator();
 
 		// 2. find the view prototype allowing to create the wanted table, identified by it ViewPrototype
@@ -412,7 +412,7 @@ public class TableEditorCreationHelper {
 					return prototype;
 				}
 				if (implementationID == null || implementationID.isEmpty()) {
-					PapyrusView configuration = prototype.getConfiguration();
+					PapyrusRepresentationKind configuration = prototype.getRepresentationKind();
 					if (configuration instanceof PapyrusTable) {
 						// we need to load the real table configuration to check the type
 						PapyrusTable papyrusTable = (PapyrusTable) configuration;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/AbstractEMFNattableEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/AbstractEMFNattableEditor.java
index 9ee5241d252..9cbebb91a6a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/AbstractEMFNattableEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/AbstractEMFNattableEditor.java
@@ -22,6 +22,7 @@ import java.io.IOException;
 import java.util.Collection;
 import java.util.Collections;
 
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notification;
@@ -37,6 +38,8 @@ import org.eclipse.papyrus.infra.internationalization.common.editor.IInternation
 import org.eclipse.papyrus.infra.internationalization.utils.utils.LabelInternationalization;
 import org.eclipse.papyrus.infra.internationalization.utils.utils.LabelInternationalizationUtils;
 import org.eclipse.papyrus.infra.nattable.common.Activator;
+import org.eclipse.papyrus.infra.nattable.common.helper.TableReconcileHelper;
+import org.eclipse.papyrus.infra.nattable.common.reconciler.TableVersioningUtils;
 import org.eclipse.papyrus.infra.nattable.common.utils.TableEditorInput;
 import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
 import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
@@ -174,6 +177,18 @@ public abstract class AbstractEMFNattableEditor extends EditorPart implements Na
 		setPartName(LabelInternationalization.getInstance().getTableLabel(this.tableManager.getTable()));
 	}
 
+	@Override
+    protected void setInput(IEditorInput input) {
+		super.setInput(input);
+		if (getTable() != null && !TableVersioningUtils.isOfCurrentPapyrusVersion(getTable())) {
+			try {
+				new TableReconcileHelper(getEditingDomain()).reconcileTable(getTable());
+			} catch (CoreException e) {
+				Activator.log.error(e);
+			}
+		}
+    }
+    
 	/**
 	 *
 	 * @see org.eclipse.emf.facet.widgets.nattable.workbench.editor.NatTableEditor#getEditingDomain()
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/CreateNatTableFromCatalogHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/CreateNatTableFromCatalogHandler.java
index 0493ad10b74..26d0fb22e4c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/CreateNatTableFromCatalogHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/CreateNatTableFromCatalogHandler.java
@@ -37,9 +37,9 @@ import org.eclipse.papyrus.infra.nattable.common.Activator;
 import org.eclipse.papyrus.infra.nattable.common.helper.TableViewPrototype;
 import org.eclipse.papyrus.infra.nattable.common.wizards.CreateNattableFromCatalogWizard;
 import org.eclipse.papyrus.infra.nattable.nattableconfiguration.NattableConfigurationRegistry;
+import org.eclipse.papyrus.infra.nattable.representation.PapyrusSyncTable;
+import org.eclipse.papyrus.infra.nattable.representation.PapyrusTable;
 import org.eclipse.papyrus.infra.ui.util.ServiceUtilsForHandlers;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusSyncTable;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusTable;
 import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IWorkbenchWindow;
@@ -193,15 +193,15 @@ public class CreateNatTableFromCatalogHandler extends AbstractHandler {
 	 * 		the {@link URI} of the nattable configuration, or <code>null</code> if not found
 	 */
 	private URI getTableConfigurationURI(final TableViewPrototype viewPrototype) {
-		if (viewPrototype.getConfiguration() instanceof PapyrusTable) {
-			PapyrusTable papyrusTable = (PapyrusTable) viewPrototype.getConfiguration();
+		if (viewPrototype.getRepresentationKind() instanceof PapyrusTable) {
+			PapyrusTable papyrusTable = (PapyrusTable) viewPrototype.getRepresentationKind();
 			String uri = papyrusTable.getConfiguration();
 			if (uri != null && uri.length() > 0) {
 				return URI.createURI(uri);
 			}
 		}
-		if (viewPrototype.getConfiguration() instanceof PapyrusSyncTable) {
-			return NattableConfigurationRegistry.INSTANCE.getConfigurationURI(((PapyrusSyncTable) viewPrototype.getConfiguration()).getImplementationID());
+		if (viewPrototype.getRepresentationKind() instanceof PapyrusSyncTable) {
+			return NattableConfigurationRegistry.INSTANCE.getConfigurationURI(((PapyrusSyncTable) viewPrototype.getRepresentationKind()).getImplementationID());
 		}
 		return null;
 	}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/DynamicTablesMenuContribution.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/DynamicTablesMenuContribution.java
index da320880dd5..dbdd0e3d5f3 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/DynamicTablesMenuContribution.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/DynamicTablesMenuContribution.java
@@ -21,8 +21,8 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.ActionContributionItem;
 import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusSyncTable;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusTable;
+import org.eclipse.papyrus.infra.nattable.representation.PapyrusSyncTable;
+import org.eclipse.papyrus.infra.nattable.representation.PapyrusTable;
 import org.eclipse.papyrus.infra.viewpoints.policy.DynamicContribution;
 import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
 import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
@@ -60,8 +60,8 @@ public class DynamicTablesMenuContribution extends DynamicContribution {
 
 		// build a list of all the available prototypes
 		List<ViewPrototype> data = new ArrayList<ViewPrototype>();
-		for (final ViewPrototype proto : PolicyChecker.getCurrent().getPrototypesFor(selection)) {
-			if (!(proto.getConfiguration() instanceof PapyrusTable || proto.getConfiguration() instanceof PapyrusSyncTable)) {
+		for (final ViewPrototype proto : PolicyChecker.getFor(selection).getPrototypesFor(selection)) {
+			if (!(proto.getRepresentationKind() instanceof PapyrusTable || proto.getRepresentationKind() instanceof PapyrusSyncTable)) {
 				continue;
 			}
 			data.add(proto);
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/PolicyDefinedTableHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/PolicyDefinedTableHandler.java
index 92e8f66b35e..19e4303a462 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/PolicyDefinedTableHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/PolicyDefinedTableHandler.java
@@ -1,80 +1,82 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.common.handlers;

-

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

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.core.utils.ServiceUtils;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;

-import org.eclipse.papyrus.infra.nattable.Activator;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;

-

-

-/**

- * Represents the handler for the creation of table defined in a viewpoint

- *

- * @author Laurent Wouters

- */

-public class PolicyDefinedTableHandler extends CreateNatTableEditorHandler {

-	private URI configuration;

-	private EObject context;

-	private String name;

-

-	public PolicyDefinedTableHandler(URI config, EObject context, String name) {

-		this.configuration = config;

-		this.context = context;

-		this.name = name;

-	}

-

-	@Override

-	protected EObject getTableContext() {

-		return context;

-	}

-

-	@Override

-	protected URI getTableEditorConfigurationURI() {

-		return configuration;

-	}

-

-	public boolean execute(final ViewPrototype prototype) {

-		final String name = this.name != null ? this.name : askName();

-		if (name == null) {

-			return false;

-		}

-		try {

-			final ServicesRegistry serviceRegistry = ServiceUtilsForEObject.getInstance().getServiceRegistry(context);

-			final TransactionalEditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(serviceRegistry);

-			domain.getCommandStack().execute(new RecordingCommand(domain) {

-				@Override

-				protected void doExecute() {

-					try {

-						Table table = PolicyDefinedTableHandler.this.doExecute(serviceRegistry, name, this.description);

-						table.setOwner(context);

-						table.setPrototype(prototype.getConfiguration());

-					} catch (Exception ex) {

-						Activator.log.error(ex);

-					}

-				}

-			});

-			return true;

-		} catch (Exception ex) {

-			Activator.log.error(ex);

-			return false;

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.common.handlers;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.infra.nattable.Activator;
+import org.eclipse.papyrus.infra.nattable.common.reconciler.TableVersioningUtils;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
+
+
+/**
+ * Represents the handler for the creation of table defined in a viewpoint
+ *
+ * @author Laurent Wouters
+ */
+public class PolicyDefinedTableHandler extends CreateNatTableEditorHandler {
+	private URI configuration;
+	private EObject context;
+	private String name;
+
+	public PolicyDefinedTableHandler(URI config, EObject context, String name) {
+		this.configuration = config;
+		this.context = context;
+		this.name = name;
+	}
+
+	@Override
+	protected EObject getTableContext() {
+		return context;
+	}
+
+	@Override
+	protected URI getTableEditorConfigurationURI() {
+		return configuration;
+	}
+
+	public boolean execute(final ViewPrototype prototype) {
+		final String name = this.name != null ? this.name : askName();
+		if (name == null) {
+			return false;
+		}
+		try {
+			final ServicesRegistry serviceRegistry = ServiceUtilsForEObject.getInstance().getServiceRegistry(context);
+			final TransactionalEditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(serviceRegistry);
+			domain.getCommandStack().execute(new RecordingCommand(domain) {
+				@Override
+				protected void doExecute() {
+					try {
+						Table table = PolicyDefinedTableHandler.this.doExecute(serviceRegistry, name, this.description);
+						TableVersioningUtils.stampCurrentVersion(table);
+						table.setOwner(context);
+						table.setPrototype(prototype.getRepresentationKind());
+					} catch (Exception ex) {
+						Activator.log.error(ex);
+					}
+				}
+			});
+			return true;
+		} catch (Exception ex) {
+			Activator.log.error(ex);
+			return false;
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/SyncTableCommandHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/SyncTableCommandHelper.java
index b6f3797e325..bbd018af7dd 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/SyncTableCommandHelper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/SyncTableCommandHelper.java
@@ -1,122 +1,130 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.common.helper;

-

-import java.util.HashMap;

-import java.util.Map;

-

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

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

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

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

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

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.nattableconfiguration.NattableConfigurationRegistry;

-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;

-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusSyncTable;

-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView;

-import org.eclipse.papyrus.infra.viewpoints.policy.IViewTypeHelper;

-import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;

-

-/**

- * Represents the command helper for the viewpoints application to synchronized tables

- *

- * @author Laurent Wouters

- */

-public class SyncTableCommandHelper implements IViewTypeHelper {

-	/**

-	 * ID of the extension point for Papyrus tables

-	 */

-	private static final String EXTENSION_PAPYRUS_SYNC_TABLE = NattableConfigurationRegistry.EXTENSION_ID;

-

-	/**

-	 * The cache of implementations

-	 */

-	private Map<String, String> implementations;

-

-	/**

-	 * The cache of prototypes

-	 */

-	private Map<PapyrusView, TableViewPrototype> cache;

-

-

-

-	@Override

-	public ViewPrototype getPrototypeFor(PapyrusView configuration) {

-		if (!(configuration instanceof PapyrusSyncTable)) {

-			return null;

-		}

-		if (implementations == null) {

-			buildImplementationCache();

-		}

-		if (cache == null) {

-			cache = new HashMap<PapyrusView, TableViewPrototype>();

-		}

-		if (cache.containsKey(configuration)) {

-			return cache.get(configuration);

-		}

-		if (!implementations.containsKey(configuration.getImplementationID())) {

-			return null;

-		}

-		TableViewPrototype proto = new TableViewPrototype((PapyrusSyncTable) configuration, implementations.get(configuration.getImplementationID()));

-		cache.put(configuration, proto);

-		return proto;

-	}

-

-	@Override

-	public boolean isSupported(EClass type) {

-		return (type == ConfigurationPackage.eINSTANCE.getPapyrusSyncTable());

-	}

-

-	@Override

-	public boolean isSupported(EObject view) {

-		if (!(view instanceof Table)) {

-			return false;

-		}

-		Table table = (Table) view;

-		return (table.getPrototype() instanceof PapyrusSyncTable);

-	}

-

-	@Override

-	public ViewPrototype getPrototypeOf(EObject view) {

-		return getPrototypeFor((PapyrusView) ((Table) view).getPrototype());

-	}

-

-	/**

-	 * Builds the cache of sync table implementations

-	 */

-	private void buildImplementationCache() {

-		implementations = new HashMap<String, String>();

-		IExtensionRegistry registry = Platform.getExtensionRegistry();

-		IExtensionPoint point = registry.getExtensionPoint(EXTENSION_PAPYRUS_SYNC_TABLE);

-		IExtension[] extensions = point.getExtensions();

-		for (int i = 0; i != extensions.length; i++) {

-			IConfigurationElement[] elements = extensions[i].getConfigurationElements();

-			for (int j = 0; j != elements.length; j++) {

-				if (elements[j].getName().equals("configuration")) {

-					String type = elements[j].getAttribute("type");

-					String file = elements[j].getAttribute("file");

-					if (!file.startsWith("platform:/")) {

-						file = "platform:/plugin/" + extensions[i].getContributor().getName() + "/" + file;

-					}

-					if (!implementations.containsKey(type)) {

-						implementations.put(type, file);

-					}

-				}

-			}

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.common.helper;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtension;
+import org.eclipse.core.runtime.IExtensionPoint;
+import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.nattableconfiguration.NattableConfigurationRegistry;
+import org.eclipse.papyrus.infra.nattable.representation.PapyrusSyncTable;
+import org.eclipse.papyrus.infra.nattable.representation.RepresentationPackage;
+import org.eclipse.papyrus.infra.viewpoints.policy.IViewTypeHelper;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
+
+/**
+ * Represents the command helper for the viewpoints application to synchronized tables
+ *
+ * @author Laurent Wouters
+ */
+public class SyncTableCommandHelper implements IViewTypeHelper {
+	/**
+	 * ID of the extension point for Papyrus tables
+	 */
+	private static final String EXTENSION_PAPYRUS_SYNC_TABLE = NattableConfigurationRegistry.EXTENSION_ID;
+
+	/**
+	 * The cache of implementations
+	 */
+	private Map<String, String> implementations;
+
+	/**
+	 * The cache of prototypes
+	 */
+	private Map<PapyrusRepresentationKind, TableViewPrototype> cache;
+
+
+
+	@Override
+	public ViewPrototype getPrototypeFor(PapyrusRepresentationKind configuration) {
+		if (!(configuration instanceof PapyrusSyncTable)) {
+			return null;
+		}
+		if (implementations == null) {
+			buildImplementationCache();
+		}
+		if (cache == null) {
+			cache = new HashMap<PapyrusRepresentationKind, TableViewPrototype>();
+		}
+		if (cache.containsKey(configuration)) {
+			return cache.get(configuration);
+		}
+		if (!implementations.containsKey(configuration.getImplementationID())) {
+			return null;
+		}
+		TableViewPrototype proto = new TableViewPrototype((PapyrusSyncTable) configuration, implementations.get(configuration.getImplementationID()));
+		cache.put(configuration, proto);
+		return proto;
+	}
+
+	@Override
+	public boolean isSupported(EClass type) {
+		return (type == RepresentationPackage.eINSTANCE.getPapyrusSyncTable());
+	}
+
+	@Override
+	public boolean isSupported(EObject view) {
+		if (!(view instanceof Table)) {
+			return false;
+		}
+		Table table = (Table) view;
+		return (table.getPrototype() instanceof PapyrusSyncTable);
+	}
+
+	@Override
+	public ViewPrototype getPrototypeOf(EObject view) {
+		if (!isSupported(view)) {
+			return null;
+		}
+		PolicyChecker checker = PolicyChecker.getFor(view);
+		PapyrusSyncTable repKind = (PapyrusSyncTable) ((Table)view).getPrototype();
+		if (checker.isInViewpoint(repKind))
+			return getPrototypeFor(repKind);
+		return ViewPrototype.UNAVAILABLE_VIEW;
+	}
+
+	/**
+	 * Builds the cache of sync table implementations
+	 */
+	private void buildImplementationCache() {
+		implementations = new HashMap<String, String>();
+		IExtensionRegistry registry = Platform.getExtensionRegistry();
+		IExtensionPoint point = registry.getExtensionPoint(EXTENSION_PAPYRUS_SYNC_TABLE);
+		IExtension[] extensions = point.getExtensions();
+		for (int i = 0; i != extensions.length; i++) {
+			IConfigurationElement[] elements = extensions[i].getConfigurationElements();
+			for (int j = 0; j != elements.length; j++) {
+				if (elements[j].getName().equals("configuration")) {
+					String type = elements[j].getAttribute("type");
+					String file = elements[j].getAttribute("file");
+					if (!file.startsWith("platform:/")) {
+						file = "platform:/plugin/" + extensions[i].getContributor().getName() + "/" + file;
+					}
+					if (!implementations.containsKey(type)) {
+						implementations.put(type, file);
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/TableCommandHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/TableCommandHelper.java
index 0dad32232c4..63e02940f41 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/TableCommandHelper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/TableCommandHelper.java
@@ -1,74 +1,82 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.common.helper;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;

-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusTable;

-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView;

-import org.eclipse.papyrus.infra.viewpoints.policy.IViewTypeHelper;

-import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;

-

-/**

- * Represents the command helper for viewpoints-based generic tables

- *

- * @author Laurent Wouters

- */

-public class TableCommandHelper implements IViewTypeHelper {

-

-	/**

-	 * The cache of prototypes

-	 */

-	private Map<PapyrusView, TableViewPrototype> cache;

-

-	@Override

-	public ViewPrototype getPrototypeFor(PapyrusView configuration) {

-		if (!(configuration instanceof PapyrusTable)) {

-			return null;

-		}

-		if (cache == null) {

-			cache = new HashMap<PapyrusView, TableViewPrototype>();

-		}

-		if (cache.containsKey(configuration)) {

-			return cache.get(configuration);

-		}

-		TableViewPrototype proto = new TableViewPrototype((PapyrusTable) configuration);

-		cache.put(configuration, proto);

-		return proto;

-	}

-

-	@Override

-	public boolean isSupported(EClass type) {

-		return (type == ConfigurationPackage.eINSTANCE.getPapyrusTable());

-	}

-

-	@Override

-	public boolean isSupported(EObject view) {

-		if (!(view instanceof Table)) {

-			return false;

-		}

-		Table table = (Table) view;

-		return (table.getPrototype() instanceof PapyrusTable);

-	}

-

-	@Override

-	public ViewPrototype getPrototypeOf(EObject view) {

-		return getPrototypeFor((PapyrusView) ((Table) view).getPrototype());

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.common.helper;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.representation.PapyrusTable;
+import org.eclipse.papyrus.infra.nattable.representation.RepresentationPackage;
+import org.eclipse.papyrus.infra.viewpoints.policy.IViewTypeHelper;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
+
+/**
+ * Represents the command helper for viewpoints-based generic tables
+ *
+ * @author Laurent Wouters
+ */
+public class TableCommandHelper implements IViewTypeHelper {
+
+	/**
+	 * The cache of prototypes
+	 */
+	private Map<PapyrusRepresentationKind, TableViewPrototype> cache;
+
+	@Override
+	public ViewPrototype getPrototypeFor(PapyrusRepresentationKind configuration) {
+		if (!(configuration instanceof PapyrusTable)) {
+			return null;
+		}
+		if (cache == null) {
+			cache = new HashMap<PapyrusRepresentationKind, TableViewPrototype>();
+		}
+		if (cache.containsKey(configuration)) {
+			return cache.get(configuration);
+		}
+		TableViewPrototype proto = new TableViewPrototype((PapyrusTable) configuration);
+		cache.put(configuration, proto);
+		return proto;
+	}
+
+	@Override
+	public boolean isSupported(EClass type) {
+		return (type == RepresentationPackage.eINSTANCE.getPapyrusTable());
+	}
+
+	@Override
+	public boolean isSupported(EObject view) {
+		if (!(view instanceof Table)) {
+			return false;
+		}
+		Table table = (Table) view;
+		return (table.getPrototype() instanceof PapyrusTable);
+	}
+
+	@Override
+	public ViewPrototype getPrototypeOf(EObject view) {
+		if (!isSupported(view)) {
+			return null;
+		}
+		PolicyChecker checker = PolicyChecker.getFor(view);
+		PapyrusTable repKind = (PapyrusTable) ((Table)view).getPrototype();
+		if (checker.isInViewpoint(repKind))
+			return getPrototypeFor(repKind);
+		return ViewPrototype.UNAVAILABLE_VIEW;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/TableReconcileHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/TableReconcileHelper.java
new file mode 100644
index 00000000000..4c515ac9370
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/TableReconcileHelper.java
@@ -0,0 +1,135 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.common.helper;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.emf.transaction.RollbackException;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.papyrus.infra.emf.gmf.util.GMFUnsafe;
+import org.eclipse.papyrus.infra.nattable.common.Activator;
+import org.eclipse.papyrus.infra.nattable.common.reconciler.TableReconciler;
+import org.eclipse.papyrus.infra.nattable.common.reconciler.TableReconcilersReader;
+import org.eclipse.papyrus.infra.nattable.common.reconciler.TableVersioningUtils;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+
+/**
+ * Table migration between version of Papyrus.
+ */
+public class TableReconcileHelper {
+	
+	private final TransactionalEditingDomain domain;
+
+	/**
+	 * Instantiates helper that will work with given {@link TransactionalEditingDomain}.
+	 * Note that reconcile operations are performed outside the table command stack using {@link GMFUnsafe}
+	 */
+	public TableReconcileHelper(TransactionalEditingDomain domain) {
+		this.domain = domain;
+	}
+
+	/**
+	 * Process table reconcilers to migrate models. Does nothing if the table is already of the current Papyrus version based on {@link TableVersioningUtils#isOfCurrentPapyrusVersion(Table)} check.
+	 * <p/>
+	 * This method needs configured {@link TableEditDomain} to execute collected {@link ICommand} when needed, so it can't be called from constructor
+	 *
+	 * @param table
+	 *            the table to reconcile
+	 * @throws CoreException
+	 *             subclass may throw wrapping any problem thrown from execution of reconcile using {@link GMFUnsafe}. Default implementation does not
+	 *             throw it however
+	 */
+	public void reconcileTable(Table table) throws CoreException {
+		CompositeCommand migration = buildReconcileCommand(table);
+		if (migration == null) {
+			return;
+		}
+		migration.add(TableVersioningUtils.createStampCurrentVersionCommand(table));
+		try {
+			GMFUnsafe.write(domain, migration);
+		} catch (ExecutionException e) {
+			handleReconcileException(table, e);
+		} catch (InterruptedException e) {
+			handleReconcileException(table, e);
+		} catch (RollbackException e) {
+			handleReconcileException(table, e);
+		}
+	}
+
+	/**
+	 * Process table reconcilers to migrate models.
+	 *
+	 * Returns <code>null</code> if the table is already of the current Papyrus version based on {@link TableVersioningUtils#isOfCurrentPapyrusVersion(Table)} check.
+	 * <p/>
+	 * If one of the reconcilers returns un-executable command, this method logs the problem and returns <code>null</code>
+	 *
+	 * @param table
+	 *            the table to reconcile
+	 */
+	protected CompositeCommand buildReconcileCommand(Table table) {
+
+		CompositeCommand reconcileCommand = new CompositeCommand("Reconciling");
+
+		if (!TableVersioningUtils.isOfCurrentPapyrusVersion(table)) {
+
+			String sourceVersion = TableVersioningUtils.getCompatibilityVersion(table);
+			List <TableReconciler> reconcilers = TableReconcilersReader.getInstance().load();
+
+			boolean someFailed = false;
+			Iterator<TableReconciler> reconciler = reconcilers.iterator();
+			while (reconciler.hasNext() && !someFailed) {
+				TableReconciler next = reconciler.next();
+
+				if (!next.canReconcileFrom(table, sourceVersion)) {
+					// asked for ignore it for this instance, all fine
+					continue;
+				}
+				ICommand nextCommand = next.getReconcileCommand(table);
+				if (nextCommand == null) {
+					// legitimate no-op response, all fine
+					continue;
+				}
+				if (nextCommand.canExecute()) {
+					reconcileCommand.add(nextCommand);
+				} else {
+					Activator.log.error("Table reconciler " + next + " failed to reconcile table : " + table, null); //$NON-NLS-1$ //$NON-NLS-2$
+					someFailed = true;
+				}
+			}
+
+			if (someFailed) {
+				// probably better to fail the whole reconcile process as user will have a chance to reconcile later when we fix the problem with one of the reconcilers
+				// executing partial reconciliation will leave the table in the state with partially current and partially outdated versions
+				reconcileCommand = null;
+			}
+
+		}
+
+		return reconcileCommand;
+	}
+
+	/**
+	 * Handles exception from running the table reconciler under {@link GMFUnsafe}.
+	 * At the time method is called the table is probably broken, but default implementation just logs error.
+	 * <p/>
+	 * This is to allow subclass to decide whether it is worth opening the problem table.
+	 */
+	protected void handleReconcileException(Table table, Exception e) throws CoreException {
+		Activator.log.error("Reconciling the table: " + table, e); //$NON-NLS-1$
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/TableViewPrototype.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/TableViewPrototype.java
index c61113c9f9b..d89572d47d1 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/TableViewPrototype.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/TableViewPrototype.java
@@ -1,127 +1,127 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.common.helper;

-

-import org.eclipse.emf.common.command.AbstractCommand;

-import org.eclipse.emf.common.command.Command;

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

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.nattable.common.handlers.PolicyDefinedTableHandler;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusSyncTable;

-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusTable;

-import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;

-

-

-/**

- * Represents the prototype of a table defined in a viewpoint

- *

- * @author Laurent Wouters

- */

-public class TableViewPrototype extends ViewPrototype {

-	private URI configFile;

-

-	public TableViewPrototype(PapyrusTable configuration) {

-		super(configuration);

-		configFile = URI.createURI(configuration.getConfiguration());

-	}

-

-	public TableViewPrototype(PapyrusSyncTable configuration, String file) {

-		super(configuration);

-		configFile = URI.createURI(file);

-	}

-

-	@Override

-	public boolean isOwnerReassignable() {

-		return true;

-	}

-

-	@Override

-	public boolean instantiateOn(EObject owner) {

-		return instantiateOn(owner, null);

-	}

-

-	@Override

-	public boolean instantiateOn(EObject owner, String name) {

-		if (configFile == null) {

-			return false;

-		}

-		PolicyDefinedTableHandler handler = new PolicyDefinedTableHandler(configFile, owner, name);

-		return handler.execute(this);

-	}

-

-	@Override

-	public Command getCommandChangeOwner(EObject view, final EObject target) {

-		final Table table = (Table) view;

-		final EObject previous = table.getOwner();

-		return new AbstractCommand("Change table owner") {

-			@Override

-			public void execute() {

-				table.setOwner(target);

-			}

-

-			@Override

-			public void undo() {

-				table.setOwner(previous);

-			}

-

-			@Override

-			public void redo() {

-				table.setOwner(target);

-			}

-

-			@Override

-			protected boolean prepare() {

-				return true;

-			}

-		};

-	}

-

-	@Override

-	public Command getCommandChangeRoot(EObject view, final EObject target) {

-		final Table table = (Table) view;

-		final EObject previous = table.getContext();

-		return new AbstractCommand("Change table root element") {

-			@Override

-			public void execute() {

-				table.setContext(target);

-			}

-

-			@Override

-			public void undo() {

-				table.setContext(previous);

-			}

-

-			@Override

-			public void redo() {

-				table.setContext(target);

-			}

-

-			@Override

-			protected boolean prepare() {

-				return true;

-			}

-		};

-	}

-

-	@Override

-	public EObject getOwnerOf(EObject view) {

-		return ((Table) view).getOwner();

-	}

-

-	@Override

-	public EObject getRootOf(EObject view) {

-		return ((Table) view).getContext();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.common.helper;
+
+import org.eclipse.emf.common.command.AbstractCommand;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.nattable.common.handlers.PolicyDefinedTableHandler;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.representation.PapyrusSyncTable;
+import org.eclipse.papyrus.infra.nattable.representation.PapyrusTable;
+import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
+
+
+/**
+ * Represents the prototype of a table defined in a viewpoint
+ *
+ * @author Laurent Wouters
+ */
+public class TableViewPrototype extends ViewPrototype {
+	private URI configFile;
+
+	public TableViewPrototype(PapyrusTable configuration) {
+		super(configuration);
+		configFile = URI.createURI(configuration.getConfiguration());
+	}
+
+	public TableViewPrototype(PapyrusSyncTable configuration, String file) {
+		super(configuration);
+		configFile = URI.createURI(file);
+	}
+
+	@Override
+	public boolean isOwnerReassignable() {
+		return true;
+	}
+
+	@Override
+	public boolean instantiateOn(EObject owner) {
+		return instantiateOn(owner, null);
+	}
+
+	@Override
+	public boolean instantiateOn(EObject owner, String name) {
+		if (configFile == null) {
+			return false;
+		}
+		PolicyDefinedTableHandler handler = new PolicyDefinedTableHandler(configFile, owner, name);
+		return handler.execute(this);
+	}
+
+	@Override
+	public Command getCommandChangeOwner(EObject view, final EObject target) {
+		final Table table = (Table) view;
+		final EObject previous = table.getOwner();
+		return new AbstractCommand("Change table owner") {
+			@Override
+			public void execute() {
+				table.setOwner(target);
+			}
+
+			@Override
+			public void undo() {
+				table.setOwner(previous);
+			}
+
+			@Override
+			public void redo() {
+				table.setOwner(target);
+			}
+
+			@Override
+			protected boolean prepare() {
+				return true;
+			}
+		};
+	}
+
+	@Override
+	public Command getCommandChangeRoot(EObject view, final EObject target) {
+		final Table table = (Table) view;
+		final EObject previous = table.getContext();
+		return new AbstractCommand("Change table root element") {
+			@Override
+			public void execute() {
+				table.setContext(target);
+			}
+
+			@Override
+			public void undo() {
+				table.setContext(previous);
+			}
+
+			@Override
+			public void redo() {
+				table.setContext(target);
+			}
+
+			@Override
+			protected boolean prepare() {
+				return true;
+			}
+		};
+	}
+
+	@Override
+	public EObject getOwnerOf(EObject view) {
+		return ((Table) view).getOwner();
+	}
+
+	@Override
+	public EObject getRootOf(EObject view) {
+		return ((Table) view).getContext();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/reconciler/TableReconciler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/reconciler/TableReconciler.java
new file mode 100644
index 00000000000..fbd5a249dad
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/reconciler/TableReconciler.java
@@ -0,0 +1,131 @@
+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		Maged Elaasar - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.common.reconciler;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExecutableExtension;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.notation.StringValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+
+/**
+ * Instances of this base class are provided via "org.eclipse.papyrus.infra.gmfdiag.common.tableReconciler" extension point and provide migration of
+ * the table instances from "previous" version to the "current" Papyrus version. The version is stored as a {@link StringValueStyle} with name {@link TableVersioningUtils#COMPATIBILITY_VERSION}.
+ * <p/>
+ * Every {@link TableReconciler} subclass provides statical descriptor of its capabilities (that is, the supported table type, outdated "previous" version and the expected "current" version). For some possible advanced cases it also gets a chance to
+ * decline the reconciliation for some particular instance based on runtime data, via {@link TableReconciler#canReconcileFrom(Table, String)}.
+ * <p/>
+ * If the suitable reconcilers are found, all of them are asked to update table instance before the first table opening. Planned modifications are provided as an {@link ICommand} instance that allows user to roll-back them all at once.
+ * <p/>
+ */
+public abstract class TableReconciler implements IExecutableExtension {
+
+	/**
+	 * Extension point attribute passed to {@link IConfigurationElement#createExecutableExtension(String)}, so value should be FQN of reconciler to
+	 * instantiate.
+	 * <p/>
+	 * Note that the value of this class will be used to search the instance to un-register, so it should be unique among all the reconcilers for given table type. It is however safe to define same reconciler class for different table types.
+	 * <p/>
+	 * Value of this constant is "reconcilerClass"
+	 */
+	public static final String ATTR_RECONCILER_CLASS = "reconcilerClass"; //$NON-NLS-1$
+
+	/**
+	 * Mandatory extension attribute to define applicable outdated table version this reconciler can handle.
+	 * Reconciler's that wants to update tables created before the Papyrus 1.0.0 release may be registered to "undefined" source version.
+	 * <p/>
+	 * Value of this constant is "source"
+	 */
+	public static final String ATTR_SOURCE_VERSION = "source"; //$NON-NLS-1$
+
+	/**
+	 * Mandatory extension attribute to define applicable "current" table version this reconciler will update the instance to.
+	 * <p/>
+	 * This value should pass the {@link TableVersioningUtils#isCurrentPapyrusVersion(String)} check for reconciler to be considered.
+	 * <p/>
+	 * Value of this constant is "target"
+	 */
+	public static final String ATTR_TARGET_VERSION = "target"; //$NON-NLS-1$
+
+	private String mySourceVersion;
+
+	private String myTargetVersion;
+
+	/**
+	 * The value of this to be used when searching
+	 */
+	private String myClassFqn;
+
+	/**
+	 * Instance of reconciler gets a chance to deny reconciliation based on some custom run-time properties.
+	 * The <code>false</code> value returned from this method means that the table is unsuitable for this reconciler, and does not assume any error.
+	 * <p>
+	 * Subclass can override tgis method, default implementation always return true, because all the dfeault filtering is done based on static extension declarations.
+	 *
+	 * @param table
+	 *            the runtime instance to reconcile
+	 * @param currentTableVersion
+	 * @return <code>false</code> if this reconciler wants to be ignored for some particular table instance
+	 */
+	public boolean canReconcileFrom(Table table, String currentTableVersion) {
+		return true;
+	}
+
+	/**
+	 * Creates command that will fix the given table and update it to the statically known "current" version.
+	 * It is considered an error to return the command with {@link ICommand#canExecute()} of <code>false</code>, and editor implementation will log an
+	 * erroneous reconcile attempt.
+	 * <p/>
+	 * If the reconciler wants to ignore the instance it can either return <code>false</code> from {@link TableReconciler#canReconcileFrom(Table, String)} or return <code>null</code> from this method
+	 *
+	 * @param table
+	 * @return the command or <code>null</code> if nothing to do with this instance
+	 */
+	public abstract ICommand getReconcileCommand(Table table);
+
+	@Override
+	public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {
+		mySourceVersion = config.getAttribute(ATTR_SOURCE_VERSION);
+		myTargetVersion = config.getAttribute(ATTR_TARGET_VERSION);
+		myClassFqn = config.getAttribute(propertyName);
+	}
+
+	public String getSourceVersion() {
+		return mySourceVersion;
+	}
+
+	public String getTargetVersion() {
+		return myTargetVersion;
+	}
+
+	public String getClassFqn() {
+		return myClassFqn;
+	}
+
+	protected static boolean safeEquals(String s1, String s2) {
+		if (s1 == s2) {
+			return true;
+		}
+		return s1 != null && s1.equals(s2);
+	}
+
+	/**
+	 * For debug purpose only
+	 */
+	@Override
+	public String toString() {
+		return "TableReconciler:" + myClassFqn + "[" + mySourceVersion + " -> " + myTargetVersion + "]";
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/reconciler/TableReconcilersReader.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/reconciler/TableReconcilersReader.java
new file mode 100644
index 00000000000..6b5fcb1eef7
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/reconciler/TableReconcilersReader.java
@@ -0,0 +1,164 @@
+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		Maged Elaasar - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.common.reconciler;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.ecore.plugin.RegistryReader;
+import org.eclipse.papyrus.infra.nattable.common.Activator;
+
+/**
+ * A reader of table reconcilers from the extensions
+ */
+public class TableReconcilersReader extends RegistryReader {
+
+	private static volatile TableReconcilersReader ourInstance = null;
+
+	private static final String EXT_PT = "tableReconciler"; //$NON-NLS-1$
+
+	private static final String TAG_TABLE_RECONCILER = "tableReconciler"; //$NON-NLS-1$
+
+	private List<TableReconciler> myReconcilers;
+
+	public final static TableReconcilersReader getInstance() {
+		if (ourInstance == null) {
+			synchronized (TableReconcilersReader.class) {
+				if (ourInstance == null) {
+					ourInstance = new TableReconcilersReader();
+				}
+			}
+		}
+		return ourInstance;
+	}
+
+	TableReconcilersReader() {
+		super(Platform.getExtensionRegistry(), Activator.PLUGIN_ID, EXT_PT);
+	}
+
+	/**
+	 * @return unmodifiable map of loaded reconcilers
+	 */
+	public synchronized List<TableReconciler> load() {
+		if (myReconcilers == null) {
+			myReconcilers = new ArrayList<TableReconciler>();
+			readRegistry();
+		}
+		return myReconcilers;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.emf.ecore.plugin.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement, boolean)
+	 */
+	@Override
+	protected boolean readElement(IConfigurationElement element, boolean add) {
+		if (!TAG_TABLE_RECONCILER.equals(element.getName())) {
+			return false;
+		}
+
+		String className = element.getAttribute(TableReconciler.ATTR_RECONCILER_CLASS);
+		String sourceVersion = element.getAttribute(TableReconciler.ATTR_SOURCE_VERSION);
+		String targetVersion = element.getAttribute(TableReconciler.ATTR_TARGET_VERSION);
+
+		if (!checkNotEmpty(className)) {
+			logMissingAttribute(element, TableReconciler.ATTR_RECONCILER_CLASS);
+			return false;
+		}
+		if (!checkNotEmpty(sourceVersion)) {
+			logMissingAttribute(element, TableReconciler.ATTR_SOURCE_VERSION);
+			return false;
+		}
+
+		if (!checkNotEmpty(targetVersion)) {
+			logMissingAttribute(element, TableReconciler.ATTR_TARGET_VERSION);
+			return false;
+		}
+		if (!TableVersioningUtils.isCurrentPapyrusVersion(targetVersion)) {
+			Activator.log.debug("Reconciler for outdated version is still registered but will never be executed: " + className); //$NON-NLS-1$
+			return false;
+		}
+
+
+		if (add) {
+			addTableReconciler(element);
+		} else {
+			removeTableReconciler(element);
+		}
+
+		return true;
+	}
+
+	private static boolean checkNotEmpty(String attr) {
+		return (attr != null) && (attr.length() != 0);
+	}
+
+	protected void addTableReconciler(IConfigurationElement element) {
+		TableReconciler reconciler = createReconciler(element);
+		if (reconciler != null) {
+			synchronized (myReconcilers) {
+				myReconcilers.add(reconciler);
+			}
+		}
+	}
+
+	/**
+	 * Unregisters reconciler defined by given extension element.
+	 * <p/>
+	 * Only table type and fully qualified class name will be used to find the one instance to remove.
+	 */
+	protected void removeTableReconciler(IConfigurationElement element) {
+		String fqn = element.getAttribute(TableReconciler.ATTR_RECONCILER_CLASS);
+		if (fqn == null) {
+			// we already have skipped this config at the time of addition
+			return;
+		}
+
+		synchronized (myReconcilers) {
+			for (Iterator<TableReconciler> it = myReconcilers.iterator(); it.hasNext();) {
+				TableReconciler next = it.next();
+				if (fqn.equals(next.getClassFqn())) {
+					it.remove();
+					break;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Instantiates the reconciler defined by given extension
+	 *
+	 * @param element
+	 * @return configured reconciler instance or <code>null</code> if something bad happens (error is logged in this case)
+	 */
+	private TableReconciler createReconciler(IConfigurationElement element) {
+		try {
+			Object reconcilerObject = element.createExecutableExtension(TableReconciler.ATTR_RECONCILER_CLASS);
+			if (reconcilerObject instanceof TableReconciler) {
+				return (TableReconciler) reconcilerObject;
+			} else {
+				Activator.log.error("Table reconciler extension does not extend mandatory TableReconciler base class: " + element.getAttribute(TableReconciler.ATTR_RECONCILER_CLASS), null); //$NON-NLS-1$
+			}
+		} catch (CoreException e) {
+			Activator.log.error(e);
+		}
+		return null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/reconciler/TableVersioningUtils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/reconciler/TableVersioningUtils.java
new file mode 100644
index 00000000000..07098672b9a
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/reconciler/TableVersioningUtils.java
@@ -0,0 +1,204 @@
+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		Maged Elaasar - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.common.reconciler;
+
+import java.util.AbstractMap;
+import java.util.StringTokenizer;
+
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EcoreFactory;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.papyrus.infra.nattable.common.Activator;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+
+/**
+ * This class provide several convenience methods to tag a table with a version number 
+ * or retrieve this version number.
+ */
+public class TableVersioningUtils {
+
+	/**
+	 * Returns the "current" table version. Tables with this version don't require the reconciliation until the Papyrus version updates in such a
+	 * way that some tables needs reconciliation.
+	 * <p/>
+	 * The current value returned by this method is "1.3.0".
+	 * <p/>
+	 * The value itself, howewer, should NOT be used outside of this package to avoid weird dependency issues. Instead, external code should 
+	 * use {@link TableVersioningUtils#stampCurrentVersion(Table)} and
+	 * {@link TableVersioningUtils#createStampCurrentVersionCommand(Table)}.
+	 * <p/>
+	 * This method is intentinally NOT a constant but indeed the method. This method is intentionally private and should NOT be made public.
+	 */
+	private static String CURRENT_TABLE_VERSION() {
+		return "1.3.0"; //$NON-NLS-1$
+	}
+
+	/**
+	 * Directly marks the given table as either created with "current" Papyrus version or already reconciled to the "current" Papyrus version.
+	 * <p/>
+	 * It is guaranteed that {@link TableVersioningUtils#isOfCurrentPapyrusVersion(Table)} returns true immediately after the call to this method.
+	 *
+	 * @param table
+	 *            table to stamp as "current"
+	 */
+	public static void stampCurrentVersion(Table table) {
+		setCompatibilityVersion(table, CURRENT_TABLE_VERSION());
+	}
+
+	/**
+	 * Returns the command that will mark the given table as either created with "current" Papyrus version or already reconciled to the "current"
+	 * Papyrus version.
+	 * <p/>
+	 * It is guaranteed that {@link TableVersioningUtils#isOfCurrentPapyrusVersion(Table)} will returns true immediately after the execution of the command.
+	 *
+	 * @param table
+	 * @return the command that is guaranteed to be not null and executable
+	 */
+	public static ICommand createStampCurrentVersionCommand(Table table) {
+		EAnnotation annot = findOrCreateCompatibilityAnnotation(table);
+		if (annot.eContainer() == null) {
+			annot.getDetails().put(COMPATIBILITY_VERSION, CURRENT_TABLE_VERSION());
+			return new SetValueCommand(new SetRequest(table, EcorePackage.eINSTANCE.getEModelElement_EAnnotations(), annot));
+		} else {
+			return new SetValueCommand(new SetRequest(annot, EcorePackage.eINSTANCE.getEAnnotation_Details(), new AbstractMap.SimpleEntry<String, String>(COMPATIBILITY_VERSION, CURRENT_TABLE_VERSION())));
+		}
+	}
+
+	/**
+	 * The name of the {@link EAnnotation} that defines actual table version.
+	 */
+	public static final String VERSION_ANNOTATION = "http://www.eclipse.org/papyrus/infra/nattable/version";//$NON-NLS-1$
+
+	/**
+	 * The name of the {@link EAnnotation} that defines actual table version.
+	 * <p/>
+	 * The value for this constant is "version", it is intentionally the same as been used for SysML tables versioning.
+	 */
+	public static final String COMPATIBILITY_VERSION = "version";//$NON-NLS-1$
+
+	/**
+	 * The version constant for the tables that does not have a {@link TableVersioningUtils#COMPATIBILITY_VERSION} annotation.
+	 * It may be assumed that these tables had been created on or before Papyrus 1.0.
+	 */
+	public static final String UNDEFINED_VERSION = "undefined";//$NON-NLS-1$
+
+	private static final String DELIM_VERSION = ".";//$NON-NLS-1$
+
+	/**
+	 * Get the table compatibility version.
+	 *
+	 * @param view
+	 *            the table
+	 * @return the compatibility version or {@link TableVersioningUtils#UNDEFINED_VERSION} if none stored. Never returns <code>null</code>.
+	 */
+	public static String getCompatibilityVersion(Table table) {
+		EAnnotation annot = findOrCreateCompatibilityAnnotation(table);
+		return annot.eContainer() == null ? UNDEFINED_VERSION : annot.getDetails().get(COMPATIBILITY_VERSION);
+	}
+
+	/**
+	 * Set the table compatibility version.
+	 *
+	 * @param table
+	 *            the table
+	 * @param version
+	 *            the compatibility version
+	 */
+	public static void setCompatibilityVersion(Table table, String version) {
+		EAnnotation annot = findOrCreateCompatibilityAnnotation(table);
+		annot.getDetails().put(COMPATIBILITY_VERSION, version);
+		if (annot.eContainer() == null) {
+			table.getEAnnotations().add(annot);
+		}
+	}
+
+	/**
+	 * Finds the existing annotation with {@link TableVersioningUtils#VERSION_ANNOTATION} name or creates a new one if none existing found.
+	 * If a new annotation is created, it's not attached to the table
+	 * 
+	 * @param table
+	 * @return the existing or a new annotation with {@link TableVersioningUtils#VERSION_ANNOTATION} name.
+	 */
+	private static EAnnotation findOrCreateCompatibilityAnnotation(Table table) {
+		EAnnotation annot = table.getEAnnotation(VERSION_ANNOTATION);
+		if (annot == null) {
+			annot = EcoreFactory.eINSTANCE.createEAnnotation();
+			annot.setSource(VERSION_ANNOTATION);
+			annot.getDetails().put(COMPATIBILITY_VERSION, CURRENT_TABLE_VERSION());
+		}
+		return annot;
+	}
+
+	/**
+	 * Checks whether the table is of "current", last released type.
+	 */
+	public static boolean isOfCurrentPapyrusVersion(Table table) {
+		return isCurrentPapyrusVersion(getCompatibilityVersion(table));
+	}
+
+	/**
+	 * Checks whether the given string represent the current papyrus version without telling explicitly what the current version is.
+	 *
+	 * @param version
+	 *            version to check
+	 * @return
+	 */
+	public static boolean isCurrentPapyrusVersion(String version) {
+		return CURRENT_TABLE_VERSION().equals(version);
+	}
+
+	/**
+	 * Compare to version number.
+	 * The test is done only on the first 2 segments of a version.
+	 * The two String should have the same number of segments (i.e: 0.9.2 and 1.1.0).
+	 * 
+	 * @param referenceVersion
+	 *            Version that is the reference for the test
+	 * @param testedVersion
+	 *            the version that is compare to the reference.
+	 * @return true if the tested Version is before the reference Version .
+	 *         false by default.
+	 */
+	public static boolean isBeforeVersion(String referenceVersion, String testedVersion) {
+		boolean before = false;
+
+		StringTokenizer targetVersionTokenizer = new StringTokenizer(referenceVersion, DELIM_VERSION);
+		StringTokenizer sourceVersionTokenizer = new StringTokenizer(testedVersion, DELIM_VERSION);
+		try {
+			if (targetVersionTokenizer.countTokens() == sourceVersionTokenizer.countTokens()) {// Check if the format is the same for the 2 Strings
+				int targetMainVersion = Integer.parseInt(targetVersionTokenizer.nextToken());// get the first number
+				int sourceMainVersion = Integer.parseInt(sourceVersionTokenizer.nextToken());
+				if (targetMainVersion == sourceMainVersion) {// if main versions are the same check the intermediate version
+					int targetIntermediateVersion = Integer.parseInt(targetVersionTokenizer.nextToken());// get the second number
+					int sourceIntermediateVersion = Integer.parseInt(sourceVersionTokenizer.nextToken());
+					before = (targetIntermediateVersion > sourceIntermediateVersion);
+
+
+				} else {
+					before = (targetMainVersion > sourceMainVersion);
+				}
+			}
+
+		} catch (NumberFormatException e) {
+			Activator.log.error(e);
+		}
+
+		return before;
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/wizards/ChooseNattableConfigWizardPage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/wizards/ChooseNattableConfigWizardPage.java
index 95a66bfa848..46361c106a9 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/wizards/ChooseNattableConfigWizardPage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/wizards/ChooseNattableConfigWizardPage.java
@@ -42,8 +42,8 @@ import org.eclipse.papyrus.infra.nattable.common.helper.TableViewPrototype;
 import org.eclipse.papyrus.infra.nattable.common.messages.Messages;
 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;
 import org.eclipse.papyrus.infra.nattable.nattableconfiguration.NattableConfigurationRegistry;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusSyncTable;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusTable;
+import org.eclipse.papyrus.infra.nattable.representation.PapyrusSyncTable;
+import org.eclipse.papyrus.infra.nattable.representation.PapyrusTable;
 import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
 import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
 import org.eclipse.swt.SWT;
@@ -73,7 +73,7 @@ public class ChooseNattableConfigWizardPage extends WizardPage {
 	/**
 	 * The context of the future table.
 	 */
-	private Object context;
+	private EObject context;
 
 	/**
 	 * The checked image for the table to select the view prototypes.
@@ -191,7 +191,7 @@ public class ChooseNattableConfigWizardPage extends WizardPage {
 			@Override
 			public String getText(final Object element) {
 				ViewPrototype viewPrototype = (ViewPrototype) element;
-				return viewPrototype.getConfiguration().getImplementationID();
+				return viewPrototype.getRepresentationKind().getImplementationID();
 			}
 
 			@Override
@@ -356,8 +356,8 @@ public class ChooseNattableConfigWizardPage extends WizardPage {
 		final List<ViewPrototype> viewPrototypes = new ArrayList<ViewPrototype>();
 
 		// build a list of all the available prototypes corresponding to the context
-		for (final ViewPrototype proto : PolicyChecker.getCurrent().getAllPrototypes()) {
-			if ((proto.getConfiguration() instanceof PapyrusTable || proto.getConfiguration() instanceof PapyrusSyncTable)) {
+		for (final ViewPrototype proto : PolicyChecker.getFor(context).getAllPrototypes()) {
+			if ((proto.getRepresentationKind() instanceof PapyrusTable || proto.getRepresentationKind() instanceof PapyrusSyncTable)) {
 				if (NattableConfigurationRegistry.INSTANCE.canCreateTable(proto.getImplementation(), context).isOK()) {
 					viewPrototypes.add(proto);
 				}
@@ -379,15 +379,15 @@ public class ChooseNattableConfigWizardPage extends WizardPage {
 	 * 		the {@link URI} of the nattable configuration, or <code>null</code> if not found
 	 */
 	private URI getTableConfigurationURI(final TableViewPrototype viewPrototype) {
-		if (viewPrototype.getConfiguration() instanceof PapyrusTable) {
-			PapyrusTable papyrusTable = (PapyrusTable) viewPrototype.getConfiguration();
+		if (viewPrototype.getRepresentationKind() instanceof PapyrusTable) {
+			PapyrusTable papyrusTable = (PapyrusTable) viewPrototype.getRepresentationKind();
 			String uri = papyrusTable.getConfiguration();
 			if (uri != null && uri.length() > 0) {
 				return URI.createURI(uri);
 			}
 		}
-		if (viewPrototype.getConfiguration() instanceof PapyrusSyncTable) {
-			return NattableConfigurationRegistry.INSTANCE.getConfigurationURI(((PapyrusSyncTable) viewPrototype.getConfiguration()).getImplementationID());
+		if (viewPrototype.getRepresentationKind() instanceof PapyrusSyncTable) {
+			return NattableConfigurationRegistry.INSTANCE.getConfigurationURI(((PapyrusSyncTable) viewPrototype.getRepresentationKind()).getImplementationID());
 		}
 		return null;
 	}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/internal/common/commands/CreateAndOpenTableEditorCommand.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/internal/common/commands/CreateAndOpenTableEditorCommand.java
index 8609b0e7575..182dd99ec1e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/internal/common/commands/CreateAndOpenTableEditorCommand.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/internal/common/commands/CreateAndOpenTableEditorCommand.java
@@ -23,6 +23,7 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
 import org.eclipse.papyrus.infra.nattable.common.helper.TableViewPrototype;
 import org.eclipse.papyrus.infra.nattable.common.modelresource.PapyrusNattableModel;
+import org.eclipse.papyrus.infra.nattable.common.reconciler.TableVersioningUtils;
 import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;
 import org.eclipse.papyrus.infra.nattable.utils.TableHelper;
@@ -215,7 +216,7 @@ public   class CreateAndOpenTableEditorCommand extends RecordingCommand {
 	@Override
 	protected void doExecute() {
 		final Table table = TableHelper.createTable(configuration, null, this.name, this.description); // context null here, see bug 410357
-
+		TableVersioningUtils.stampCurrentVersion(table);
 		
 		table.setContext(this.context);
 		// Save the model in the associated resource
@@ -226,7 +227,7 @@ public   class CreateAndOpenTableEditorCommand extends RecordingCommand {
 		} else {
 			table.setOwner(this.owner);
 		}
-		table.setPrototype(tableViewPrototype.getConfiguration());
+		table.setPrototype(tableViewPrototype.getRepresentationKind());
 		if (this.pageManager != null) {
 			this.pageManager.openPage(table);
 		}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/GetTableIcon.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/GetTableIcon.java
index 3341bf0d2af..77654b22492 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/GetTableIcon.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/GetTableIcon.java
@@ -11,15 +11,16 @@
  *****************************************************************************/
 package org.eclipse.papyrus.infra.nattable.modelexplorer.queries;
 
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.papyrus.emf.facet.custom.metamodel.custompt.IImage;
 import org.eclipse.papyrus.emf.facet.custom.ui.ImageUtils;
 import org.eclipse.papyrus.emf.facet.efacet.core.IFacetManager;
 import org.eclipse.papyrus.emf.facet.efacet.core.exception.DerivedTypedElementException;
 import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2;
 import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2;
+import org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind;
 import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
 import org.eclipse.papyrus.infra.ui.editorsfactory.AbstractGetEditorIconQuery;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView;
 import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
 
 /** Return the path to the icon of the corresponding table */
@@ -27,7 +28,7 @@ public class GetTableIcon extends AbstractGetEditorIconQuery implements IJavaQue
 
 	@Override
 	public IImage evaluate(Table source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException {
-		ViewPrototype prototype = ViewPrototype.get((PapyrusView) source.getPrototype());
-		return ImageUtils.wrap(prototype.getIconURI());
+		ViewPrototype prototype = ViewPrototype.get(source);
+		return (prototype != null) ? ImageUtils.wrap(prototype.getIconURI()) : null;
 	}
 }
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/EObjectInFlatTable.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/EObjectInFlatTable.xwt
index 0fc1e2013dd..f3fe1a6a088 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/EObjectInFlatTable.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/EObjectInFlatTable.xwt
@@ -21,7 +21,7 @@
 		</Composite.layout>
 		<ppe:ReferenceLabel input="{Binding}"
 			property="EObjectInTable:Table:prototype" readOnly="true"
-			customLabel="View Type"></ppe:ReferenceLabel>
+			customLabel="Table Kind"></ppe:ReferenceLabel>
 		<ppe:ReferenceDialog input="{Binding}"
 			property="EObjectInTable:Table:owner" customLabel="Owner"></ppe:ReferenceDialog>
 		<ppe:ReferenceLabel input="{Binding}"
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/EObjectInTreeTable.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/EObjectInTreeTable.xwt
index 1e2d8ba91ed..1d6f7d971bc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/EObjectInTreeTable.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/EObjectInTreeTable.xwt
@@ -21,7 +21,7 @@
 		</Composite.layout>
 		<ppe:ReferenceLabel input="{Binding}"
 			property="EObjectInTable:Table:prototype" readOnly="true"
-			customLabel="View Type"></ppe:ReferenceLabel>
+			customLabel="Table Kind"></ppe:ReferenceLabel>
 		<ppe:ReferenceDialog input="{Binding}"
 			property="EObjectInTable:Table:owner" customLabel="Owner"></ppe:ReferenceDialog>
 		<ppe:ReferenceLabel input="{Binding}"
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleTable.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleTable.xwt
index 034fdb13d6f..e4aeae38110 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleTable.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleTable.xwt
@@ -20,7 +20,7 @@
 			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
 		</Composite.layout>
 		<ppe:ReferenceLabel input="{Binding}"
-			property="nattable:Table:prototype" readOnly="true" customLabel="View Type"></ppe:ReferenceLabel>
+			property="nattable:Table:prototype" readOnly="true" customLabel="Table Kind"></ppe:ReferenceLabel>
 		<ppe:ReferenceDialog input="{Binding}" property="nattable:Table:owner"
 			customLabel="Owner"></ppe:ReferenceDialog>
 		<ppe:ReferenceLabel input="{Binding}" property="nattable:Table:context"
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleTreeTable.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleTreeTable.xwt
index a2e58450cb6..febd67e8609 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleTreeTable.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleTreeTable.xwt
@@ -20,7 +20,7 @@
 			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
 		</Composite.layout>
 		<ppe:ReferenceLabel input="{Binding}"
-			property="nattable:Table:prototype" readOnly="true" customLabel="View Type"></ppe:ReferenceLabel>
+			property="nattable:Table:prototype" readOnly="true" customLabel="Table Kind"></ppe:ReferenceLabel>
 		<ppe:ReferenceDialog input="{Binding}" property="nattable:Table:owner"
 			customLabel="Owner"></ppe:ReferenceDialog>
 		<ppe:ReferenceLabel input="{Binding}"
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/modelelement/NatTableModelElement.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/modelelement/NatTableModelElement.java
index acce95f2b98..e759b7a95ae 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/modelelement/NatTableModelElement.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/modelelement/NatTableModelElement.java
@@ -28,6 +28,7 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind;
 import org.eclipse.papyrus.infra.emf.nattable.selection.EObjectSelectionExtractor;
 import org.eclipse.papyrus.infra.nattable.contentprovider.ColumnAxisIdentifierContentProvider;
 import org.eclipse.papyrus.infra.nattable.contentprovider.ColumnContainmentFeatureContentProvider;
@@ -84,7 +85,6 @@ import org.eclipse.papyrus.infra.nattable.properties.utils.Constants;
 import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
 import org.eclipse.papyrus.infra.nattable.utils.NattableModelManagerFactory;
 import org.eclipse.papyrus.infra.properties.ui.modelelement.EMFModelElement;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView;
 import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
 import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
 import org.eclipse.swt.graphics.Image;
@@ -629,19 +629,19 @@ public class NatTableModelElement extends EMFModelElement {
 
 				@Override
 				public Image getImage(Object element) {
-					if (element == null) {
+					if (!(element instanceof PapyrusRepresentationKind)) {
 						return null;
 					}
-					ViewPrototype proto = ViewPrototype.get((PapyrusView) element);
+					ViewPrototype proto = ViewPrototype.get((PapyrusRepresentationKind) element);
 					return proto.getIcon();
 				}
 
 				@Override
 				public String getText(Object element) {
-					if (element == null) {
+					if (!(element instanceof PapyrusRepresentationKind)) {
 						return null;
 					}
-					ViewPrototype proto = ViewPrototype.get((PapyrusView) element);
+					ViewPrototype proto = ViewPrototype.get((PapyrusRepresentationKind) element);
 					return proto.getQualifiedName();
 				}
 			};
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/.classpath b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/.classpath
new file mode 100644
index 00000000000..858bac421b8
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src-gen"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/.project b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/.project
new file mode 100644
index 00000000000..b0754473f28
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.nattable.representation.edit</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.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..1906c92b546
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/META-INF/MANIFEST.MF
@@ -0,0 +1,23 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.representation.edit;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Activator: org.eclipse.papyrus.infra.nattable.representation.provider.RepresentationEditPlugin$Implementation
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.papyrus.infra.nattable.representation.provider
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.nattable.representation;visibility:=reexport,
+ org.eclipse.emf.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.core.architecture;visibility:=reexport,
+ org.eclipse.papyrus.infra.core.architecture.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.constraints;visibility:=reexport,
+ org.eclipse.papyrus.infra.constraints.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.types;visibility:=reexport,
+ org.eclipse.papyrus.infra.types.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.architecture.representation;visibility:=reexport,
+ org.eclipse.papyrus.infra.architecture.representation.edit;visibility:=reexport
+Bundle-ActivationPolicy: lazy
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/about.html b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/about.html
new file mode 100644
index 00000000000..57d6d18a634
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/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>June 1, 2017</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/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/build.properties
new file mode 100644
index 00000000000..62b77b9612e
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/build.properties
@@ -0,0 +1,20 @@
+# Copyright (c) 2017 CEA LIST.
+# 
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#  
+#  Contributors:
+#  Maged Elaasar - Initial API and implementation
+#  
+# 
+
+bin.includes = .,\
+               icons/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties
+jars.compile.order = .
+source.. = src-gen/
+output.. = bin/
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/icons/full/ctool16/CreateArchitectureDescriptionLanguage_representationKinds_PapyrusSyncTable.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/icons/full/ctool16/CreateArchitectureDescriptionLanguage_representationKinds_PapyrusSyncTable.gif
new file mode 100644
index 00000000000..bad30bb8e3d
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/icons/full/ctool16/CreateArchitectureDescriptionLanguage_representationKinds_PapyrusSyncTable.gif
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/icons/full/ctool16/CreateArchitectureDescriptionLanguage_representationKinds_PapyrusTable.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/icons/full/ctool16/CreateArchitectureDescriptionLanguage_representationKinds_PapyrusTable.gif
new file mode 100644
index 00000000000..304981bb112
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/icons/full/ctool16/CreateArchitectureDescriptionLanguage_representationKinds_PapyrusTable.gif
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/obj16/PapyrusSyncTable.png b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/icons/full/obj16/PapyrusSyncTable.gif
index 6ae6ab02668..6ae6ab02668 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/obj16/PapyrusSyncTable.png
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/icons/full/obj16/PapyrusSyncTable.gif
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/obj16/PapyrusTable.png b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/icons/full/obj16/PapyrusTable.gif
index 6d5c9c4de9e..6d5c9c4de9e 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/obj16/PapyrusTable.png
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/icons/full/obj16/PapyrusTable.gif
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/plugin.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/plugin.properties
new file mode 100644
index 00000000000..37a6bb06d8e
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/plugin.properties
@@ -0,0 +1,33 @@
+# Copyright (c) 2017 CEA LIST.
+# 
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#  
+#  Contributors:
+#  Maged Elaasar - Initial API and implementation
+#  
+# 
+
+pluginName = Nattable Representation Edit Support
+providerName = Eclipse Modeling Project
+
+_UI_CreateChild_text = {0}
+_UI_CreateChild_text2 = {1} {0}
+_UI_CreateChild_text3 = {1}
+_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
+_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
+_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
+
+_UI_PropertyDescriptor_description = The {0} of the {1}
+
+_UI_PapyrusSyncTable_type = Papyrus Sync Table
+_UI_PapyrusTable_type = Papyrus Table
+_UI_Unknown_type = Object
+
+_UI_Unknown_datatype= Value
+
+_UI_PapyrusTable_configuration_feature = Configuration
+_UI_Unknown_feature = Unspecified
+
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/plugin.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/plugin.xml
new file mode 100644
index 00000000000..ce067bce48d
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/plugin.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+ Copyright (c) 2017 CEA LIST.
+ 
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/legal/epl-v10.html
+  
+  Contributors:
+  Maged Elaasar - Initial API and implementation
+  
+ 
+-->
+
+<plugin>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated Representation -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/infra/nattable/representation"
+            class="org.eclipse.papyrus.infra.nattable.representation.provider.RepresentationItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.edit.childCreationExtenders">
+      <!-- @generated Representation -->
+      <extender
+            uri="http://www.eclipse.org/papyrus/infra/core/architecture"
+            class="org.eclipse.papyrus.infra.nattable.representation.provider.RepresentationItemProviderAdapterFactory$ArchitectureChildCreationExtender"/>
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/pom.xml
new file mode 100644
index 00000000000..973ffa17d99
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/pom.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.nattable.representation.edit</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
\ No newline at end of file
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/PapyrusSyncTableItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/src-gen/org/eclipse/papyrus/infra/nattable/representation/provider/PapyrusSyncTableItemProvider.java
index 1cbfa2223d2..95da8d823e7 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/PapyrusSyncTableItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/src-gen/org/eclipse/papyrus/infra/nattable/representation/provider/PapyrusSyncTableItemProvider.java
@@ -1,18 +1,17 @@
 /**
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
+ * Copyright (c) 2017 CEA LIST.
+ * 
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
  *  which accompanies this distribution, and is available at
  *  http://www.eclipse.org/legal/epl-v10.html
- *
+ *  
  *  Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
  */
-package org.eclipse.papyrus.infra.viewpoints.configuration.provider;
+package org.eclipse.papyrus.infra.nattable.representation.provider;
 
 
 import java.util.Collection;
@@ -20,17 +19,19 @@ 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.IItemPropertyDescriptor;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusSyncTable;
+import org.eclipse.papyrus.infra.architecture.representation.provider.PapyrusRepresentationKindItemProvider;
+import org.eclipse.papyrus.infra.nattable.representation.PapyrusSyncTable;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusSyncTable} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.representation.PapyrusSyncTable} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
 public class PapyrusSyncTableItemProvider
-		extends PapyrusViewItemProvider {
+		extends PapyrusRepresentationKindItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
@@ -60,28 +61,18 @@ public class PapyrusSyncTableItemProvider
 	 * This returns PapyrusSyncTable.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @generated NOT - Custom Image
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/PapyrusSyncTable.png"));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
-	protected boolean shouldComposeCreationImage() {
-		return true;
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/PapyrusSyncTable"));
 	}
 
 	/**
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @generated NOT
 	 */
 	@Override
 	public String getText(Object object) {
@@ -113,4 +104,15 @@ public class PapyrusSyncTableItemProvider
 		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 RepresentationEditPlugin.INSTANCE;
+	}
+
 }
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/PapyrusTableItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/src-gen/org/eclipse/papyrus/infra/nattable/representation/provider/PapyrusTableItemProvider.java
index 47a2387c060..049ec0ae6d7 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/PapyrusTableItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/src-gen/org/eclipse/papyrus/infra/nattable/representation/provider/PapyrusTableItemProvider.java
@@ -1,18 +1,17 @@
 /**
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
+ * Copyright (c) 2017 CEA LIST.
+ * 
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
  *  which accompanies this distribution, and is available at
  *  http://www.eclipse.org/legal/epl-v10.html
- *
+ *  
  *  Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
  */
-package org.eclipse.papyrus.infra.viewpoints.configuration.provider;
+package org.eclipse.papyrus.infra.nattable.representation.provider;
 
 
 import java.util.Collection;
@@ -20,21 +19,22 @@ 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.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusTable;
+import org.eclipse.papyrus.infra.architecture.representation.provider.PapyrusRepresentationKindItemProvider;
+import org.eclipse.papyrus.infra.nattable.representation.PapyrusTable;
+import org.eclipse.papyrus.infra.nattable.representation.RepresentationPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusTable} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.representation.PapyrusTable} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class PapyrusTableItemProvider
-		extends PapyrusViewItemProvider {
+public class PapyrusTableItemProvider extends PapyrusRepresentationKindItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
@@ -68,45 +68,37 @@ public class PapyrusTableItemProvider
 	 * @generated
 	 */
 	protected void addConfigurationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_PapyrusTable_configuration_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_PapyrusTable_configuration_feature", "_UI_PapyrusTable_type"),
-				ConfigurationPackage.Literals.PAPYRUS_TABLE__CONFIGURATION,
-				true,
-				false,
-				false,
-				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				null,
-				null));
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_PapyrusTable_configuration_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_PapyrusTable_configuration_feature", "_UI_PapyrusTable_type"),
+				 RepresentationPackage.Literals.PAPYRUS_TABLE__CONFIGURATION,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
 	}
 
 	/**
 	 * This returns PapyrusTable.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @generated NOT - Custom Image
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/PapyrusTable.png"));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
-	protected boolean shouldComposeCreationImage() {
-		return true;
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/PapyrusTable"));
 	}
 
 	/**
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @generated NOT
 	 */
 	@Override
 	public String getText(Object object) {
@@ -125,9 +117,9 @@ public class PapyrusTableItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(PapyrusTable.class)) {
-		case ConfigurationPackage.PAPYRUS_TABLE__CONFIGURATION:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
+			case RepresentationPackage.PAPYRUS_TABLE__CONFIGURATION:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -144,4 +136,15 @@ public class PapyrusTableItemProvider
 		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 RepresentationEditPlugin.INSTANCE;
+	}
+
 }
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/presentation/ConfigurationEditorPlugin.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/src-gen/org/eclipse/papyrus/infra/nattable/representation/provider/RepresentationEditPlugin.java
index 7c3d6630f2c..5172eb2f3d0 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/presentation/ConfigurationEditorPlugin.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/src-gen/org/eclipse/papyrus/infra/nattable/representation/provider/RepresentationEditPlugin.java
@@ -1,38 +1,42 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.viewpoints.configuration.presentation;
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.nattable.representation.provider;
 
 import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.emf.common.ui.EclipseUIPlugin;
+
 import org.eclipse.emf.common.util.ResourceLocator;
+
 import org.eclipse.papyrus.infra.constraints.provider.ConstraintsEditPlugin;
-import org.eclipse.papyrus.infra.viewpoints.iso42010.provider.Iso42010EditPlugin;
+
+import org.eclipse.papyrus.infra.core.architecture.provider.ArchitectureEditPlugin;
+
+import org.eclipse.papyrus.infra.types.provider.TypesConfigurationsEditPlugin;
 
 /**
- * This is the central singleton for the Configuration editor plugin.
+ * This is the central singleton for the Representation edit plugin.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public final class ConfigurationEditorPlugin extends EMFPlugin {
+public final class RepresentationEditPlugin extends EMFPlugin {
 	/**
 	 * Keep track of the singleton.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final ConfigurationEditorPlugin INSTANCE = new ConfigurationEditorPlugin();
+	public static final RepresentationEditPlugin INSTANCE = new RepresentationEditPlugin();
 
 	/**
 	 * Keep track of the singleton.
@@ -48,12 +52,14 @@ public final class ConfigurationEditorPlugin extends EMFPlugin {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ConfigurationEditorPlugin() {
+	public RepresentationEditPlugin() {
 		super
-			(new ResourceLocator [] {
-				ConstraintsEditPlugin.INSTANCE,
-				Iso42010EditPlugin.INSTANCE,
-			});
+		  (new ResourceLocator [] {
+		     ArchitectureEditPlugin.INSTANCE,
+		     ConstraintsEditPlugin.INSTANCE,
+		     TypesConfigurationsEditPlugin.INSTANCE,
+		     org.eclipse.papyrus.infra.architecture.representation.provider.RepresentationEditPlugin.INSTANCE,
+		   });
 	}
 
 	/**
@@ -85,7 +91,7 @@ public final class ConfigurationEditorPlugin extends EMFPlugin {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static class Implementation extends EclipseUIPlugin {
+	public static class Implementation extends EclipsePlugin {
 		/**
 		 * Creates an instance.
 		 * <!-- begin-user-doc -->
@@ -94,7 +100,7 @@ public final class ConfigurationEditorPlugin extends EMFPlugin {
 		 */
 		public Implementation() {
 			super();
-	
+
 			// Remember the static instance.
 			//
 			plugin = this;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/src-gen/org/eclipse/papyrus/infra/nattable/representation/provider/RepresentationItemProviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/src-gen/org/eclipse/papyrus/infra/nattable/representation/provider/RepresentationItemProviderAdapterFactory.java
new file mode 100644
index 00000000000..fbdf25afc00
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/src-gen/org/eclipse/papyrus/infra/nattable/representation/provider/RepresentationItemProviderAdapterFactory.java
@@ -0,0 +1,343 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.nattable.representation.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+
+import org.eclipse.emf.common.util.ResourceLocator;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.emf.edit.command.CommandParameter;
+
+import org.eclipse.emf.edit.domain.EditingDomain;
+
+import org.eclipse.emf.edit.provider.ChangeNotifier;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IChangeNotifier;
+import org.eclipse.emf.edit.provider.IChildCreationExtender;
+import org.eclipse.emf.edit.provider.IDisposable;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.INotifyChangedListener;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage;
+import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
+
+import org.eclipse.papyrus.infra.core.architecture.util.ArchitectureSwitch;
+
+import org.eclipse.papyrus.infra.nattable.representation.RepresentationFactory;
+
+import org.eclipse.papyrus.infra.nattable.representation.util.RepresentationAdapterFactory;
+
+/**
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * Note that most of the adapters are shared among multiple instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class RepresentationItemProviderAdapterFactory extends RepresentationAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+	/**
+	 * This keeps track of the root adapter factory that delegates to this adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory parentAdapterFactory;
+
+	/**
+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IChangeNotifier changeNotifier = new ChangeNotifier();
+
+	/**
+	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Object> supportedTypes = new ArrayList<Object>();
+
+	/**
+	 * This constructs an instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RepresentationItemProviderAdapterFactory() {
+		supportedTypes.add(IEditingDomainItemProvider.class);
+		supportedTypes.add(IStructuredItemContentProvider.class);
+		supportedTypes.add(ITreeItemContentProvider.class);
+		supportedTypes.add(IItemLabelProvider.class);
+		supportedTypes.add(IItemPropertySource.class);
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.representation.PapyrusSyncTable} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected PapyrusSyncTableItemProvider papyrusSyncTableItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.representation.PapyrusSyncTable}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createPapyrusSyncTableAdapter() {
+		if (papyrusSyncTableItemProvider == null) {
+			papyrusSyncTableItemProvider = new PapyrusSyncTableItemProvider(this);
+		}
+
+		return papyrusSyncTableItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.representation.PapyrusTable} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected PapyrusTableItemProvider papyrusTableItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.representation.PapyrusTable}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createPapyrusTableAdapter() {
+		if (papyrusTableItemProvider == null) {
+			papyrusTableItemProvider = new PapyrusTableItemProvider(this);
+		}
+
+		return papyrusTableItemProvider;
+	}
+
+	/**
+	 * This returns the root adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ComposeableAdapterFactory getRootAdapterFactory() {
+		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
+	}
+
+	/**
+	 * This sets the composed adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
+		this.parentAdapterFactory = parentAdapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object type) {
+		return supportedTypes.contains(type) || super.isFactoryForType(type);
+	}
+
+	/**
+	 * This implementation substitutes the factory itself as the key for the adapter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter adapt(Notifier notifier, Object type) {
+		return super.adapt(notifier, this);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object adapt(Object object, Object type) {
+		if (isFactoryForType(type)) {
+			Object adapter = super.adapt(object, type);
+			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
+				return adapter;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * This adds a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void addListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.addListener(notifyChangedListener);
+	}
+
+	/**
+	 * This removes a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void removeListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.removeListener(notifyChangedListener);
+	}
+
+	/**
+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void fireNotifyChanged(Notification notification) {
+		changeNotifier.fireNotifyChanged(notification);
+
+		if (parentAdapterFactory != null) {
+			parentAdapterFactory.fireNotifyChanged(notification);
+		}
+	}
+
+	/**
+	 * This disposes all of the item providers created by this factory. 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void dispose() {
+		if (papyrusSyncTableItemProvider != null) papyrusSyncTableItemProvider.dispose();
+		if (papyrusTableItemProvider != null) papyrusTableItemProvider.dispose();
+	}
+
+	/**
+	 * A child creation extender for the {@link ArchitecturePackage}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static class ArchitectureChildCreationExtender implements IChildCreationExtender {
+		/**
+		 * The switch for creating child descriptors specific to each extended class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected static class CreationSwitch extends ArchitectureSwitch<Object> {
+			/**
+			 * The child descriptors being populated.
+			 * <!-- begin-user-doc -->
+			 * <!-- end-user-doc -->
+			 * @generated
+			 */
+			protected List<Object> newChildDescriptors;
+
+			/**
+			 * The domain in which to create the children.
+			 * <!-- begin-user-doc -->
+			 * <!-- end-user-doc -->
+			 * @generated
+			 */
+			protected EditingDomain editingDomain;
+
+			/**
+			 * Creates the a switch for populating child descriptors in the given domain.
+			 * <!-- begin-user-doc -->
+			 * <!-- end-user-doc -->
+			 * @generated
+			 */
+			CreationSwitch(List<Object> newChildDescriptors, EditingDomain editingDomain) {
+				this.newChildDescriptors = newChildDescriptors;
+				this.editingDomain = editingDomain;
+			}
+			/**
+			 * <!-- begin-user-doc -->
+			 * <!-- end-user-doc -->
+			 * @generated
+			 */
+			@Override
+			public Object caseArchitectureDescriptionLanguage(ArchitectureDescriptionLanguage object) {
+				newChildDescriptors.add
+					(createChildParameter
+						(ArchitecturePackage.Literals.ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS,
+						 RepresentationFactory.eINSTANCE.createPapyrusSyncTable()));
+
+				newChildDescriptors.add
+					(createChildParameter
+						(ArchitecturePackage.Literals.ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS,
+						 RepresentationFactory.eINSTANCE.createPapyrusTable()));
+
+				return null;
+			}
+ 
+			/**
+			 * <!-- begin-user-doc -->
+			 * <!-- end-user-doc -->
+			 * @generated
+			 */
+			protected CommandParameter createChildParameter(Object feature, Object child) {
+				return new CommandParameter(null, feature, child);
+			}
+
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public Collection<Object> getNewChildDescriptors(Object object, EditingDomain editingDomain) {
+			ArrayList<Object> result = new ArrayList<Object>();
+			new CreationSwitch(result, editingDomain).doSwitch((EObject)object);
+			return result;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public ResourceLocator getResourceLocator() {
+			return RepresentationEditPlugin.INSTANCE;
+		}
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/.classpath b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/.classpath
new file mode 100644
index 00000000000..858bac421b8
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src-gen"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/.project b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/.project
new file mode 100644
index 00000000000..c9b22dc0be3
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.nattable.representation</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.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..9043b65bcfb
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/META-INF/MANIFEST.MF
@@ -0,0 +1,19 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.representation;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.papyrus.infra.nattable.representation,
+ org.eclipse.papyrus.infra.nattable.representation.impl,
+ org.eclipse.papyrus.infra.nattable.representation.util
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.papyrus.infra.core.architecture;visibility:=reexport,
+ org.eclipse.papyrus.infra.constraints;visibility:=reexport,
+ org.eclipse.papyrus.infra.types;visibility:=reexport,
+ org.eclipse.papyrus.infra.architecture.representation;visibility:=reexport
+Bundle-ActivationPolicy: lazy
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/about.html b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/about.html
new file mode 100644
index 00000000000..57d6d18a634
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/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>June 1, 2017</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/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/build.properties
new file mode 100644
index 00000000000..81ffbe2379a
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/build.properties
@@ -0,0 +1,20 @@
+# Copyright (c) 2017 CEA LIST.
+# 
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#  
+#  Contributors:
+#  Maged Elaasar - Initial API and implementation
+#  
+# 
+
+bin.includes = .,\
+               model/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties
+jars.compile.order = .
+source.. = src-gen/
+output.. = bin/
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/model/NattableRepresentation.ecore b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/model/NattableRepresentation.ecore
new file mode 100755
index 00000000000..629def092b4
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/model/NattableRepresentation.ecore
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="representation" nsURI="http://www.eclipse.org/papyrus/infra/nattable/representation"
+    nsPrefix="nattablerepresentation">
+  <eClassifiers xsi:type="ecore:EClass" name="PapyrusSyncTable" eSuperTypes="../../org.eclipse.papyrus.infra.architecture.representation/model/Representation.ecore#//PapyrusRepresentationKind"/>
+  <eClassifiers xsi:type="ecore:EClass" name="PapyrusTable" eSuperTypes="../../org.eclipse.papyrus.infra.architecture.representation/model/Representation.ecore#//PapyrusRepresentationKind">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="configuration" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/model/NattableRepresentation.genmodel b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/model/NattableRepresentation.genmodel
new file mode 100644
index 00000000000..5b1f3d033b9
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/model/NattableRepresentation.genmodel
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2017 CEA LIST.&#xD;&#xA;&#xD;&#xA; All rights reserved. This program and the accompanying materials&#xD;&#xA; are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA; which accompanies this distribution, and is available at&#xD;&#xA; http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA; &#xD;&#xA; Contributors:&#xD;&#xA; Maged Elaasar - Initial API and implementation&#xD;&#xA; &#xD;&#xA;"
+    modelDirectory="/org.eclipse.papyrus.infra.nattable.representation/src-gen" editDirectory="/org.eclipse.papyrus.infra.nattable.representation.edit/src-gen"
+    editorDirectory="/org.eclipse.papyrus.infra.nattable.representation.editor/src-gen"
+    modelPluginID="org.eclipse.papyrus.infra.nattable.representation" modelName="Representation"
+    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory="/org.eclipse.papyrus.infra.nattable.representation.tests/src-gen"
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
+    editPluginID="org.eclipse.papyrus.infra.nattable.representation.edit" editorPluginID="org.eclipse.papyrus.infra.nattable.representation.editor"
+    usedGenPackages="../../org.eclipse.papyrus.infra.core.architecture/model/Architecture.genmodel#//architecture ../../org.eclipse.papyrus.infra.constraints/Model/Constraints.genmodel#//constraints ../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel#//types ../../org.eclipse.papyrus.infra.architecture.representation/model/Representation.genmodel#//representation"
+    operationReflection="true" importOrganizing="true">
+  <foreignModel>NattableRepresentation.ecore</foreignModel>
+  <genPackages prefix="Representation" basePackage="org.eclipse.papyrus.infra.nattable"
+      disposableProviderFactory="true" childCreationExtenders="true" ecorePackage="NattableRepresentation.ecore#/">
+    <genClasses ecoreClass="NattableRepresentation.ecore#//PapyrusSyncTable"/>
+    <genClasses ecoreClass="NattableRepresentation.ecore#//PapyrusTable">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute NattableRepresentation.ecore#//PapyrusTable/configuration"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/plugin.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/plugin.properties
new file mode 100644
index 00000000000..e57d9090ae4
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/plugin.properties
@@ -0,0 +1,14 @@
+# Copyright (c) 2017 CEA LIST.
+# 
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#  
+#  Contributors:
+#  Maged Elaasar - Initial API and implementation
+#  
+# 
+
+pluginName = Nattable Representation Model
+providerName = Eclipse Modeling Project
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/plugin.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/plugin.xml
new file mode 100644
index 00000000000..d465c91be47
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/plugin.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+ Copyright (c) 2017 CEA LIST.
+ 
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/legal/epl-v10.html
+  
+  Contributors:
+  Maged Elaasar - Initial API and implementation
+  
+ 
+-->
+
+<plugin>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated Representation -->
+      <package
+            uri="http://www.eclipse.org/papyrus/infra/nattable/representation"
+            class="org.eclipse.papyrus.infra.nattable.representation.RepresentationPackage"
+            genModel="model/NattableRepresentation.genmodel"/>
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/pom.xml
new file mode 100644
index 00000000000..888c774a38a
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/pom.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.nattable.representation</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/PapyrusSyncTable.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/PapyrusSyncTable.java
new file mode 100644
index 00000000000..ef48048cc97
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/PapyrusSyncTable.java
@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.nattable.representation;
+
+import org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Papyrus Sync Table</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.representation.RepresentationPackage#getPapyrusSyncTable()
+ * @model
+ * @generated
+ */
+public interface PapyrusSyncTable extends PapyrusRepresentationKind {
+} // PapyrusSyncTable
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/PapyrusTable.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/PapyrusTable.java
index 7e14039d12f..087a6804b03 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/PapyrusTable.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/PapyrusTable.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 CEA LIST.
+ * Copyright (c) 2017 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
@@ -7,12 +7,13 @@
  *  http://www.eclipse.org/legal/epl-v10.html
  *  
  *  Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *  Maged Elaasar - Initial API and implementation
  *  
  * 
  */
-package org.eclipse.papyrus.infra.viewpoints.configuration;
+package org.eclipse.papyrus.infra.nattable.representation;
 
+import org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind;
 
 /**
  * <!-- begin-user-doc -->
@@ -23,14 +24,14 @@ package org.eclipse.papyrus.infra.viewpoints.configuration;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusTable#getConfiguration <em>Configuration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.representation.PapyrusTable#getConfiguration <em>Configuration</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getPapyrusTable()
+ * @see org.eclipse.papyrus.infra.nattable.representation.RepresentationPackage#getPapyrusTable()
  * @model
  * @generated
  */
-public interface PapyrusTable extends PapyrusView {
+public interface PapyrusTable extends PapyrusRepresentationKind {
 	/**
 	 * Returns the value of the '<em><b>Configuration</b></em>' attribute.
 	 * <!-- begin-user-doc -->
@@ -41,14 +42,14 @@ public interface PapyrusTable extends PapyrusView {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Configuration</em>' attribute.
 	 * @see #setConfiguration(String)
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getPapyrusTable_Configuration()
+	 * @see org.eclipse.papyrus.infra.nattable.representation.RepresentationPackage#getPapyrusTable_Configuration()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getConfiguration();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusTable#getConfiguration <em>Configuration</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.representation.PapyrusTable#getConfiguration <em>Configuration</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Configuration</em>' attribute.
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/RepresentationFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/RepresentationFactory.java
new file mode 100644
index 00000000000..bc030866f65
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/RepresentationFactory.java
@@ -0,0 +1,62 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.nattable.representation;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.representation.RepresentationPackage
+ * @generated
+ */
+public interface RepresentationFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	RepresentationFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.representation.impl.RepresentationFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Papyrus Sync Table</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Papyrus Sync Table</em>'.
+	 * @generated
+	 */
+	PapyrusSyncTable createPapyrusSyncTable();
+
+	/**
+	 * Returns a new object of class '<em>Papyrus Table</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Papyrus Table</em>'.
+	 * @generated
+	 */
+	PapyrusTable createPapyrusTable();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	RepresentationPackage getRepresentationPackage();
+
+} //RepresentationFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/RepresentationPackage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/RepresentationPackage.java
new file mode 100644
index 00000000000..112d9d594c6
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/RepresentationPackage.java
@@ -0,0 +1,399 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.nattable.representation;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ *   <li>each class,</li>
+ *   <li>each feature of each class,</li>
+ *   <li>each operation of each class,</li>
+ *   <li>each enum,</li>
+ *   <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.representation.RepresentationFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface RepresentationPackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "representation";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/infra/nattable/representation";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "nattablerepresentation";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	RepresentationPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.representation.impl.RepresentationPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.representation.impl.PapyrusSyncTableImpl <em>Papyrus Sync Table</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.representation.impl.PapyrusSyncTableImpl
+	 * @see org.eclipse.papyrus.infra.nattable.representation.impl.RepresentationPackageImpl#getPapyrusSyncTable()
+	 * @generated
+	 */
+	int PAPYRUS_SYNC_TABLE = 0;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_SYNC_TABLE__NAME = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Desciption</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_SYNC_TABLE__DESCIPTION = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__DESCIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_SYNC_TABLE__QUALIFIED_NAME = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Language</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_SYNC_TABLE__LANGUAGE = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__LANGUAGE;
+
+	/**
+	 * The feature id for the '<em><b>Concerns</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_SYNC_TABLE__CONCERNS = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__CONCERNS;
+
+	/**
+	 * The feature id for the '<em><b>Icon</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_SYNC_TABLE__ICON = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__ICON;
+
+	/**
+	 * The feature id for the '<em><b>Parent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_SYNC_TABLE__PARENT = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__PARENT;
+
+	/**
+	 * The feature id for the '<em><b>Model Rules</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_SYNC_TABLE__MODEL_RULES = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__MODEL_RULES;
+
+	/**
+	 * The feature id for the '<em><b>Owning Rules</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_SYNC_TABLE__OWNING_RULES = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__OWNING_RULES;
+
+	/**
+	 * The feature id for the '<em><b>Implementation ID</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_SYNC_TABLE__IMPLEMENTATION_ID = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__IMPLEMENTATION_ID;
+
+	/**
+	 * The number of structural features of the '<em>Papyrus Sync Table</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_SYNC_TABLE_FEATURE_COUNT = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Papyrus Sync Table</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_SYNC_TABLE_OPERATION_COUNT = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.representation.impl.PapyrusTableImpl <em>Papyrus Table</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.representation.impl.PapyrusTableImpl
+	 * @see org.eclipse.papyrus.infra.nattable.representation.impl.RepresentationPackageImpl#getPapyrusTable()
+	 * @generated
+	 */
+	int PAPYRUS_TABLE = 1;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_TABLE__NAME = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Desciption</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_TABLE__DESCIPTION = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__DESCIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_TABLE__QUALIFIED_NAME = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Language</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_TABLE__LANGUAGE = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__LANGUAGE;
+
+	/**
+	 * The feature id for the '<em><b>Concerns</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_TABLE__CONCERNS = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__CONCERNS;
+
+	/**
+	 * The feature id for the '<em><b>Icon</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_TABLE__ICON = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__ICON;
+
+	/**
+	 * The feature id for the '<em><b>Parent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_TABLE__PARENT = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__PARENT;
+
+	/**
+	 * The feature id for the '<em><b>Model Rules</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_TABLE__MODEL_RULES = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__MODEL_RULES;
+
+	/**
+	 * The feature id for the '<em><b>Owning Rules</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_TABLE__OWNING_RULES = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__OWNING_RULES;
+
+	/**
+	 * The feature id for the '<em><b>Implementation ID</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_TABLE__IMPLEMENTATION_ID = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__IMPLEMENTATION_ID;
+
+	/**
+	 * The feature id for the '<em><b>Configuration</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_TABLE__CONFIGURATION = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Papyrus Table</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_TABLE_FEATURE_COUNT = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Papyrus Table</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_TABLE_OPERATION_COUNT = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND_OPERATION_COUNT + 0;
+
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.representation.PapyrusSyncTable <em>Papyrus Sync Table</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Papyrus Sync Table</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.representation.PapyrusSyncTable
+	 * @generated
+	 */
+	EClass getPapyrusSyncTable();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.representation.PapyrusTable <em>Papyrus Table</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Papyrus Table</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.representation.PapyrusTable
+	 * @generated
+	 */
+	EClass getPapyrusTable();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.representation.PapyrusTable#getConfiguration <em>Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.representation.PapyrusTable#getConfiguration()
+	 * @see #getPapyrusTable()
+	 * @generated
+	 */
+	EAttribute getPapyrusTable_Configuration();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	RepresentationFactory getRepresentationFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 *   <li>each class,</li>
+	 *   <li>each feature of each class,</li>
+	 *   <li>each operation of each class,</li>
+	 *   <li>each enum,</li>
+	 *   <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.representation.impl.PapyrusSyncTableImpl <em>Papyrus Sync Table</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.representation.impl.PapyrusSyncTableImpl
+		 * @see org.eclipse.papyrus.infra.nattable.representation.impl.RepresentationPackageImpl#getPapyrusSyncTable()
+		 * @generated
+		 */
+		EClass PAPYRUS_SYNC_TABLE = eINSTANCE.getPapyrusSyncTable();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.representation.impl.PapyrusTableImpl <em>Papyrus Table</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.representation.impl.PapyrusTableImpl
+		 * @see org.eclipse.papyrus.infra.nattable.representation.impl.RepresentationPackageImpl#getPapyrusTable()
+		 * @generated
+		 */
+		EClass PAPYRUS_TABLE = eINSTANCE.getPapyrusTable();
+
+		/**
+		 * The meta object literal for the '<em><b>Configuration</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PAPYRUS_TABLE__CONFIGURATION = eINSTANCE.getPapyrusTable_Configuration();
+
+	}
+
+} //RepresentationPackage
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/impl/PapyrusSyncTableImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/impl/PapyrusSyncTableImpl.java
new file mode 100644
index 00000000000..34cb0fa3b34
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/impl/PapyrusSyncTableImpl.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.nattable.representation.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.papyrus.infra.architecture.representation.impl.PapyrusRepresentationKindImpl;
+
+import org.eclipse.papyrus.infra.nattable.representation.PapyrusSyncTable;
+import org.eclipse.papyrus.infra.nattable.representation.RepresentationPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Papyrus Sync Table</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class PapyrusSyncTableImpl extends PapyrusRepresentationKindImpl implements PapyrusSyncTable {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected PapyrusSyncTableImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return RepresentationPackage.Literals.PAPYRUS_SYNC_TABLE;
+	}
+
+} //PapyrusSyncTableImpl
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/PapyrusTableImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/impl/PapyrusTableImpl.java
index 0d72303481e..86ed00363a5 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/PapyrusTableImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/impl/PapyrusTableImpl.java
@@ -1,18 +1,17 @@
 /**
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
+ * Copyright (c) 2017 CEA LIST.
+ * 
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
  *  which accompanies this distribution, and is available at
  *  http://www.eclipse.org/legal/epl-v10.html
- *
+ *  
  *  Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
  */
-package org.eclipse.papyrus.infra.viewpoints.configuration.impl;
+package org.eclipse.papyrus.infra.nattable.representation.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -20,8 +19,10 @@ import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusTable;
+import org.eclipse.papyrus.infra.architecture.representation.impl.PapyrusRepresentationKindImpl;
+
+import org.eclipse.papyrus.infra.nattable.representation.PapyrusTable;
+import org.eclipse.papyrus.infra.nattable.representation.RepresentationPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,12 +32,12 @@ import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusTable;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusTableImpl#getConfiguration <em>Configuration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.representation.impl.PapyrusTableImpl#getConfiguration <em>Configuration</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class PapyrusTableImpl extends PapyrusViewImpl implements PapyrusTable {
+public class PapyrusTableImpl extends PapyrusRepresentationKindImpl implements PapyrusTable {
 	/**
 	 * The default value of the '{@link #getConfiguration() <em>Configuration</em>}' attribute.
 	 * <!-- begin-user-doc -->
@@ -73,7 +74,7 @@ public class PapyrusTableImpl extends PapyrusViewImpl implements PapyrusTable {
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return ConfigurationPackage.Literals.PAPYRUS_TABLE;
+		return RepresentationPackage.Literals.PAPYRUS_TABLE;
 	}
 
 	/**
@@ -93,9 +94,8 @@ public class PapyrusTableImpl extends PapyrusViewImpl implements PapyrusTable {
 	public void setConfiguration(String newConfiguration) {
 		String oldConfiguration = configuration;
 		configuration = newConfiguration;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ConfigurationPackage.PAPYRUS_TABLE__CONFIGURATION, oldConfiguration, configuration));
-		}
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, RepresentationPackage.PAPYRUS_TABLE__CONFIGURATION, oldConfiguration, configuration));
 	}
 
 	/**
@@ -106,8 +106,8 @@ public class PapyrusTableImpl extends PapyrusViewImpl implements PapyrusTable {
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case ConfigurationPackage.PAPYRUS_TABLE__CONFIGURATION:
-			return getConfiguration();
+			case RepresentationPackage.PAPYRUS_TABLE__CONFIGURATION:
+				return getConfiguration();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -120,9 +120,9 @@ public class PapyrusTableImpl extends PapyrusViewImpl implements PapyrusTable {
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case ConfigurationPackage.PAPYRUS_TABLE__CONFIGURATION:
-			setConfiguration((String) newValue);
-			return;
+			case RepresentationPackage.PAPYRUS_TABLE__CONFIGURATION:
+				setConfiguration((String)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -135,9 +135,9 @@ public class PapyrusTableImpl extends PapyrusViewImpl implements PapyrusTable {
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case ConfigurationPackage.PAPYRUS_TABLE__CONFIGURATION:
-			setConfiguration(CONFIGURATION_EDEFAULT);
-			return;
+			case RepresentationPackage.PAPYRUS_TABLE__CONFIGURATION:
+				setConfiguration(CONFIGURATION_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -150,8 +150,8 @@ public class PapyrusTableImpl extends PapyrusViewImpl implements PapyrusTable {
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case ConfigurationPackage.PAPYRUS_TABLE__CONFIGURATION:
-			return CONFIGURATION_EDEFAULT == null ? configuration != null : !CONFIGURATION_EDEFAULT.equals(configuration);
+			case RepresentationPackage.PAPYRUS_TABLE__CONFIGURATION:
+				return CONFIGURATION_EDEFAULT == null ? configuration != null : !CONFIGURATION_EDEFAULT.equals(configuration);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -163,9 +163,7 @@ public class PapyrusTableImpl extends PapyrusViewImpl implements PapyrusTable {
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
-			return super.toString();
-		}
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (configuration: ");
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/impl/RepresentationFactoryImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/impl/RepresentationFactoryImpl.java
new file mode 100644
index 00000000000..c41263447e5
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/impl/RepresentationFactoryImpl.java
@@ -0,0 +1,117 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.nattable.representation.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
+import org.eclipse.papyrus.infra.nattable.representation.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class RepresentationFactoryImpl extends EFactoryImpl implements RepresentationFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static RepresentationFactory init() {
+		try {
+			RepresentationFactory theRepresentationFactory = (RepresentationFactory)EPackage.Registry.INSTANCE.getEFactory(RepresentationPackage.eNS_URI);
+			if (theRepresentationFactory != null) {
+				return theRepresentationFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new RepresentationFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RepresentationFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case RepresentationPackage.PAPYRUS_SYNC_TABLE: return createPapyrusSyncTable();
+			case RepresentationPackage.PAPYRUS_TABLE: return createPapyrusTable();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public PapyrusSyncTable createPapyrusSyncTable() {
+		PapyrusSyncTableImpl papyrusSyncTable = new PapyrusSyncTableImpl();
+		return papyrusSyncTable;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public PapyrusTable createPapyrusTable() {
+		PapyrusTableImpl papyrusTable = new PapyrusTableImpl();
+		return papyrusTable;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RepresentationPackage getRepresentationPackage() {
+		return (RepresentationPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static RepresentationPackage getPackage() {
+		return RepresentationPackage.eINSTANCE;
+	}
+
+} //RepresentationFactoryImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/impl/RepresentationPackageImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/impl/RepresentationPackageImpl.java
new file mode 100644
index 00000000000..ab8cf64fd75
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/impl/RepresentationPackageImpl.java
@@ -0,0 +1,217 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.nattable.representation.impl;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+
+import org.eclipse.papyrus.infra.nattable.representation.PapyrusSyncTable;
+import org.eclipse.papyrus.infra.nattable.representation.PapyrusTable;
+import org.eclipse.papyrus.infra.nattable.representation.RepresentationFactory;
+import org.eclipse.papyrus.infra.nattable.representation.RepresentationPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class RepresentationPackageImpl extends EPackageImpl implements RepresentationPackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass papyrusSyncTableEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass papyrusTableEClass = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.papyrus.infra.nattable.representation.RepresentationPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private RepresentationPackageImpl() {
+		super(eNS_URI, RepresentationFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>This method is used to initialize {@link RepresentationPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static RepresentationPackage init() {
+		if (isInited) return (RepresentationPackage)EPackage.Registry.INSTANCE.getEPackage(RepresentationPackage.eNS_URI);
+
+		// Obtain or create and register package
+		RepresentationPackageImpl theRepresentationPackage = (RepresentationPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof RepresentationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new RepresentationPackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.eINSTANCE.eClass();
+
+		// Create package meta-data objects
+		theRepresentationPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theRepresentationPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theRepresentationPackage.freeze();
+
+  
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(RepresentationPackage.eNS_URI, theRepresentationPackage);
+		return theRepresentationPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getPapyrusSyncTable() {
+		return papyrusSyncTableEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getPapyrusTable() {
+		return papyrusTableEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getPapyrusTable_Configuration() {
+		return (EAttribute)papyrusTableEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RepresentationFactory getRepresentationFactory() {
+		return (RepresentationFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		papyrusSyncTableEClass = createEClass(PAPYRUS_SYNC_TABLE);
+
+		papyrusTableEClass = createEClass(PAPYRUS_TABLE);
+		createEAttribute(papyrusTableEClass, PAPYRUS_TABLE__CONFIGURATION);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage theRepresentationPackage_1 = (org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage)EPackage.Registry.INSTANCE.getEPackage(org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		papyrusSyncTableEClass.getESuperTypes().add(theRepresentationPackage_1.getPapyrusRepresentationKind());
+		papyrusTableEClass.getESuperTypes().add(theRepresentationPackage_1.getPapyrusRepresentationKind());
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(papyrusSyncTableEClass, PapyrusSyncTable.class, "PapyrusSyncTable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(papyrusTableEClass, PapyrusTable.class, "PapyrusTable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getPapyrusTable_Configuration(), ecorePackage.getEString(), "configuration", null, 1, 1, PapyrusTable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		// Create resource
+		createResource(eNS_URI);
+	}
+
+} //RepresentationPackageImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/util/RepresentationAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/util/RepresentationAdapterFactory.java
new file mode 100644
index 00000000000..f47445a05bf
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/util/RepresentationAdapterFactory.java
@@ -0,0 +1,208 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.nattable.representation.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.papyrus.infra.core.architecture.ADElement;
+import org.eclipse.papyrus.infra.core.architecture.RepresentationKind;
+
+import org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind;
+
+import org.eclipse.papyrus.infra.nattable.representation.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.representation.RepresentationPackage
+ * @generated
+ */
+public class RepresentationAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static RepresentationPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RepresentationAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = RepresentationPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected RepresentationSwitch<Adapter> modelSwitch =
+		new RepresentationSwitch<Adapter>() {
+			@Override
+			public Adapter casePapyrusSyncTable(PapyrusSyncTable object) {
+				return createPapyrusSyncTableAdapter();
+			}
+			@Override
+			public Adapter casePapyrusTable(PapyrusTable object) {
+				return createPapyrusTableAdapter();
+			}
+			@Override
+			public Adapter caseADElement(ADElement object) {
+				return createADElementAdapter();
+			}
+			@Override
+			public Adapter caseRepresentationKind(RepresentationKind object) {
+				return createRepresentationKindAdapter();
+			}
+			@Override
+			public Adapter casePapyrusRepresentationKind(PapyrusRepresentationKind object) {
+				return createPapyrusRepresentationKindAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.representation.PapyrusSyncTable <em>Papyrus Sync Table</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.representation.PapyrusSyncTable
+	 * @generated
+	 */
+	public Adapter createPapyrusSyncTableAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.representation.PapyrusTable <em>Papyrus Table</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.representation.PapyrusTable
+	 * @generated
+	 */
+	public Adapter createPapyrusTableAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.core.architecture.ADElement <em>AD Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.core.architecture.ADElement
+	 * @generated
+	 */
+	public Adapter createADElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.core.architecture.RepresentationKind <em>Representation Kind</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.core.architecture.RepresentationKind
+	 * @generated
+	 */
+	public Adapter createRepresentationKindAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind <em>Papyrus Representation Kind</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind
+	 * @generated
+	 */
+	public Adapter createPapyrusRepresentationKindAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+
+} //RepresentationAdapterFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/util/RepresentationSwitch.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/util/RepresentationSwitch.java
new file mode 100644
index 00000000000..1ac0e469c48
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/util/RepresentationSwitch.java
@@ -0,0 +1,198 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.nattable.representation.util;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.util.Switch;
+
+import org.eclipse.papyrus.infra.core.architecture.ADElement;
+import org.eclipse.papyrus.infra.core.architecture.RepresentationKind;
+
+import org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind;
+
+import org.eclipse.papyrus.infra.nattable.representation.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.representation.RepresentationPackage
+ * @generated
+ */
+public class RepresentationSwitch<T> extends Switch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static RepresentationPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RepresentationSwitch() {
+		if (modelPackage == null) {
+			modelPackage = RepresentationPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case RepresentationPackage.PAPYRUS_SYNC_TABLE: {
+				PapyrusSyncTable papyrusSyncTable = (PapyrusSyncTable)theEObject;
+				T result = casePapyrusSyncTable(papyrusSyncTable);
+				if (result == null) result = casePapyrusRepresentationKind(papyrusSyncTable);
+				if (result == null) result = caseRepresentationKind(papyrusSyncTable);
+				if (result == null) result = caseADElement(papyrusSyncTable);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case RepresentationPackage.PAPYRUS_TABLE: {
+				PapyrusTable papyrusTable = (PapyrusTable)theEObject;
+				T result = casePapyrusTable(papyrusTable);
+				if (result == null) result = casePapyrusRepresentationKind(papyrusTable);
+				if (result == null) result = caseRepresentationKind(papyrusTable);
+				if (result == null) result = caseADElement(papyrusTable);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Papyrus Sync Table</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>Papyrus Sync Table</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T casePapyrusSyncTable(PapyrusSyncTable object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Papyrus Table</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>Papyrus Table</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T casePapyrusTable(PapyrusTable object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>AD Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>AD Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseADElement(ADElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Representation Kind</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>Representation Kind</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseRepresentationKind(RepresentationKind object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Papyrus Representation Kind</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>Papyrus Representation Kind</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T casePapyrusRepresentationKind(PapyrusRepresentationKind object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+
+} //RepresentationSwitch
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/plugin.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/plugin.xml
index b7cd776889c..f839a12a8ec 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/plugin.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/plugin.xml
@@ -2,14 +2,6 @@
 <?eclipse version="3.4"?>
 <plugin>
    <extension
-         point="org.eclipse.papyrus.infra.viewpoints.policy.custom">
-      <contribution
-            file="resources/viewpageTable.configuration"
-            original="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration">
-      </contribution>
-   </extension>
-
-   <extension
          point="org.eclipse.papyrus.infra.nattable.axismanager">
       <axisManager
             id="org.eclipse.papyrus.infra.nattable.pagelist.contents.axis.manager"
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpageTable.configuration b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpageTable.configuration
deleted file mode 100644
index b19d5966749..00000000000
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpageTable.configuration
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<configuration:PapyrusConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmi:id="_ko07IErbEeSdQKzSRatBjg">

-  <viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="_xogdoErbEeSdQKzSRatBjg" name="Default Papyrus Viewpoint">

-    <modelKinds xsi:type="configuration:PapyrusSyncTable" xmi:id="_wXztQHDwEeWh-MssWmCB_A" name="View Table" icon="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/icons/nattablepageeditor.png" implementationID="PapyrusViewsTable">

-      <modelRules xmi:id="_wXztQXDwEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>

-      </modelRules>

-      <owningRules xmi:id="_wXztQnDwEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>

-      </owningRules>

-      <categories href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb5dxhEeOqHvRyiN87hA"/>

-    </modelKinds>

-  </viewpoints>

-  <defaultStakeholder href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmkdxhEeOqHvRyiN87hA"/>

-  <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>

-</configuration:PapyrusConfiguration>

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
index ce9f44af5fc..333f4502cf7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
@@ -63,7 +63,6 @@ Require-Bundle: org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0
  org.eclipse.papyrus.infra.services.decoration;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/plugin.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/plugin.xml
index 39fa7384f28..e95f504da74 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/plugin.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/plugin.xml
@@ -1734,18 +1734,4 @@
             type="java.lang.Object">
       </propertyTester>
    </extension>
-   <extension
-         point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
-      <elementTypeSet
-            clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
-            path="model/nattable-tablecontents.elementtypesconfigurations">
-      </elementTypeSet>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
-      <elementTypeSet
-            clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
-            path="model/nattable-tablecontext.elementtypesconfigurations">
-      </elementTypeSet>
-   </extension>
 </plugin>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/contentprovider/ContextFeatureContentProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/contentprovider/ContextFeatureContentProvider.java
index 76eb927246d..71792958518 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/contentprovider/ContextFeatureContentProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/contentprovider/ContextFeatureContentProvider.java
@@ -22,10 +22,10 @@ import org.eclipse.jface.layout.GridLayoutFactory;
 import org.eclipse.jface.viewers.StructuredViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
+import org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind;
 import org.eclipse.papyrus.infra.nattable.messages.Messages;
 import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ui.ECoreModelContentProvider;
+import org.eclipse.papyrus.infra.ui.emf.utils.EcoreModelContentProvider;
 import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
 import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
 import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;
@@ -50,7 +50,7 @@ import org.eclipse.swt.widgets.Composite;
  *
  * @author Laurent Wouters
  */
-public class ContextFeatureContentProvider extends ECoreModelContentProvider implements IStaticContentProvider, IHierarchicContentProvider, IFlattenableContentProvider, IGraphicalContentProvider {
+public class ContextFeatureContentProvider extends EcoreModelContentProvider implements IStaticContentProvider, IHierarchicContentProvider, IFlattenableContentProvider, IGraphicalContentProvider {
 	/**
 	 * The table
 	 */
@@ -104,11 +104,11 @@ public class ContextFeatureContentProvider extends ECoreModelContentProvider imp
 		if (!(element instanceof EObject)) {
 			return false;
 		}
-		ViewPrototype prototype = ViewPrototype.get((PapyrusView) table.getPrototype());
+		ViewPrototype prototype = ViewPrototype.get((PapyrusRepresentationKind) table.getPrototype());
 		if (prototype == null) {
 			return false;
 		}
-		return PolicyChecker.getCurrent().canHaveNewView((EObject) element, table.getOwner(), prototype);
+		return PolicyChecker.getFor((EObject)element).canHaveNewView((EObject) element, table.getOwner(), prototype);
 	}
 
 	/**
@@ -139,7 +139,7 @@ public class ContextFeatureContentProvider extends ECoreModelContentProvider imp
 	/**
 	 * {@inheritDoc}
 	 * 
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ui.ECoreModelContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
+	 * @see org.eclipse.papyrus.infra.ui.emf.utils.EcoreModelContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
 	 */
 	@Override
 	public void inputChanged(final Viewer viewer, final Object oldInput, final Object newInput) {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/PasteEObjectTreeAxisInNattableCommandProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/PasteEObjectTreeAxisInNattableCommandProvider.java
index 3879b40e45d..f7fc3628ee1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/PasteEObjectTreeAxisInNattableCommandProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/PasteEObjectTreeAxisInNattableCommandProvider.java
@@ -634,7 +634,7 @@ public class PasteEObjectTreeAxisInNattableCommandProvider extends AbstractPaste
 	protected Object createElementInAttachedMode(final ExtendedCompoundCommand compoundCommand, final Map<Integer, EObject> contextMap, final int depth, final String valueAsString, final PasteEObjectConfiguration pasteConfToUse, final IProgressMonitor monitor,
 			final IAdaptable info)
 			throws ExecutionException {
-		Object createdElement = null;
+		EObject createdElement = null;
 
 		// get the element type to use to create the element
 		final IElementType typeToCreate = ElementTypeRegistry.getInstance().getType(pasteConfToUse.getPastedElementId());
@@ -660,29 +660,25 @@ public class PasteEObjectTreeAxisInNattableCommandProvider extends AbstractPaste
 			final CommandResult res = commandCreation.getCommandResult();
 
 			// 3 we update the map
-			createdElement = res.getReturnValue();
-			contextMap.put(Integer.valueOf(depth), (EObject) createdElement);
+			createdElement = (EObject) res.getReturnValue();
+			contextMap.put(Integer.valueOf(depth), createdElement);
 
 			// 4. we use the label to do a set name command on the created element
-			if (createdElement instanceof EObject) {
-				// TODO : this past must be specific for EMF AND for UML
-				final EObject eobject = (EObject) createdElement;
-				// get the feature used as ID for the element
-				final EStructuralFeature nameFeature = eobject.eClass().getEStructuralFeature("name"); //$NON-NLS-1$
-				if (null != nameFeature) {
-					final SetRequest setNameRequest = new SetRequest(contextEditingDomain, eobject, nameFeature, valueAsString);
-					final IElementEditService createdElementCommandProvider = ElementEditServiceUtils.getCommandProvider(createdElement);
-					if (null != createdElementCommandProvider) {
-						final ICommand setName = createdElementCommandProvider.getEditCommand(setNameRequest);
-						if (setName != null && setName.canExecute()) {
-
-							// We create the set command
-							final Command emfSetNameCommandCreation = GMFtoEMFCommandWrapper.wrap(setName);
-							emfSetNameCommandCreation.execute();
-
-							// Add the set name command to the compound command
-							compoundCommand.append(emfSetNameCommandCreation);
-						}
+			// get the feature used as ID for the element
+			final EStructuralFeature nameFeature = createdElement.eClass().getEStructuralFeature("name"); //$NON-NLS-1$
+			if (null != nameFeature) {
+				final SetRequest setNameRequest = new SetRequest(contextEditingDomain, createdElement, nameFeature, valueAsString);
+				final IElementEditService createdElementCommandProvider = ElementEditServiceUtils.getCommandProvider(createdElement);
+				if (null != createdElementCommandProvider) {
+					final ICommand setName = createdElementCommandProvider.getEditCommand(setNameRequest);
+					if (setName != null && setName.canExecute()) {
+
+						// We create the set command
+						final Command emfSetNameCommandCreation = GMFtoEMFCommandWrapper.wrap(setName);
+						emfSetNameCommandCreation.execute();
+
+						// Add the set name command to the compound command
+						compoundCommand.append(emfSetNameCommandCreation);
 					}
 				}
 			}
diff --git a/plugins/infra/nattable/pom.xml b/plugins/infra/nattable/pom.xml
index fdf93169c61..c0246c799bd 100755
--- a/plugins/infra/nattable/pom.xml
+++ b/plugins/infra/nattable/pom.xml
@@ -26,6 +26,8 @@
 		<module>org.eclipse.papyrus.infra.nattable.properties</module>
 		<module>org.eclipse.papyrus.infra.nattable.views.config</module>
 		<module>org.eclipse.papyrus.infra.nattable.views.editor</module>
+		<module>org.eclipse.papyrus.infra.nattable.representation</module>
+		<module>org.eclipse.papyrus.infra.nattable.representation.edit</module>
 		
 		<!-- This one has a dependency also on Infra Diagram, so it is built outside of both modules. -->
 		<!--module>org.eclipse.papyrus.infra.nattable.gmfdiag</module-->
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuFactory.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuFactory.java
index 6ef44f57d29..5d814eb3b31 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuFactory.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuFactory.java
@@ -35,6 +35,7 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
 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.CreateRelationshipRequest;
@@ -42,6 +43,7 @@ import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.papyrus.infra.core.resource.IModel;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
@@ -50,6 +52,7 @@ import org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.CreateRelatio
 import org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.CreationMenu;
 import org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.Folder;
 import org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.Separator;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
 import org.eclipse.papyrus.infra.services.edit.utils.RequestCacheEntries;
@@ -374,6 +377,14 @@ public class CreationMenuFactory {
 	 * @return a command that can be executed by the domain
 	 */
 	protected Command buildCommand(EReference reference, EObject container, CreationMenu creationMenu, Map<?, ?> adviceCache) {
+		IClientContext context;
+		try {
+			context = TypeContext.getContext(container);
+		} catch (ServiceException e) {
+			Activator.log.error(e);
+			return UnexecutableCommand.INSTANCE;
+		}
+		
 		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(container);
 		if (provider == null) {
 			return UnexecutableCommand.INSTANCE;
@@ -383,7 +394,7 @@ public class CreationMenuFactory {
 		if (creationMenu instanceof CreateRelationshipMenu) {
 			IElementType elementType = getElementType(creationMenu.getElementTypeIdRef());
 			if (elementType != null) {
-				IElementEditService serviceProvider = ElementEditServiceUtils.getCommandProvider(elementType);
+				IElementEditService serviceProvider = ElementEditServiceUtils.getCommandProvider(elementType, context);
 				TreeSelectorDialog dialog = getTargetTreeSelectorDialog(container, serviceProvider, editingDomain, reference, container, elementType);
 				if (dialog != null) {
 					createGMFCommand = new SetTargetAndRelationshipCommand(this.editingDomain, "Create " + elementType.getDisplayName(), serviceProvider, reference, container, elementType, dialog);
diff --git a/plugins/infra/pom.xml b/plugins/infra/pom.xml
index 542478c84a3..c848be5880a 100644
--- a/plugins/infra/pom.xml
+++ b/plugins/infra/pom.xml
@@ -12,6 +12,7 @@
 	<description>Container of the core APIs of the Papyrus editor and headless components.</description>
 
 	<modules>
+		<module>architecture</module>
 		<module>core</module>
 		<module>onefile</module>
 		<module>constraints</module>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/.classpath b/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/.classpath
index 2d1a4302f04..eca7bdba8f0 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/.classpath
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/.classpath
@@ -1,7 +1,7 @@
-<?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/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/.project b/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/.project
new file mode 100644
index 00000000000..309b80d927c
--- /dev/null
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.services.architecture</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/infra/services/org.eclipse.papyrus.infra.services.architecture/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..0c68a61dca8
--- /dev/null
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..c7806b14762
--- /dev/null
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/META-INF/MANIFEST.MF
@@ -0,0 +1,15 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.infra.services.architecture;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.papyrus.infra.services.architecture
+Require-Bundle: org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.services.edit;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[2.3.0,3.0.0)",
+ org.eclipse.papyrus.infra.architecture;bundle-version="[1.0.0,2.0.0)"
+Bundle-ActivationPolicy: lazy
+Bundle-Vendor: %providerName
+Bundle-Activator: org.eclipse.papyrus.infra.services.architecture.Activator
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/about.html b/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/about.html
new file mode 100644
index 00000000000..bbf2bd6aac7
--- /dev/null
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/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>January 30, 2017</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/infra/services/org.eclipse.papyrus.infra.services.architecture/build.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/build.properties
new file mode 100644
index 00000000000..0d413bddebd
--- /dev/null
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/build.properties
@@ -0,0 +1,7 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.properties,\
+               plugin.xml
+               
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/plugin.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/plugin.properties
new file mode 100644
index 00000000000..f8028c40563
--- /dev/null
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/plugin.properties
@@ -0,0 +1,14 @@
+# Copyright (c) 2017 CEA LIST.
+# 
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#  
+#  Contributors:
+#  Maged Elaasar - Initial API and implementation
+#  
+# 
+
+pluginName = Architecture Services
+providerName=Eclipse Modeling Project
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/plugin.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/plugin.xml
new file mode 100644
index 00000000000..7d34152d352
--- /dev/null
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/plugin.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+ Copyright (c) 2016 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
+  
+ 
+-->
+
+<plugin>
+   <extension
+         point="org.eclipse.papyrus.infra.core.service">
+      <service
+            classname="org.eclipse.papyrus.infra.services.architecture.ArchitectureDomainService"
+            description="Service used to registrer architecture domains"
+            id="ArchitectureDomainService"
+            priority="50"
+            startKind="startup">
+      </service>
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/pom.xml
new file mode 100644
index 00000000000..54a37258557
--- /dev/null
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.papyrus</groupId>
+		<artifactId>org.eclipse.papyrus.infra-services</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.services.architecture</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/src/org/eclipse/papyrus/infra/services/architecture/Activator.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/src/org/eclipse/papyrus/infra/services/architecture/Activator.java
new file mode 100644
index 00000000000..3390ed566dc
--- /dev/null
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/src/org/eclipse/papyrus/infra/services/architecture/Activator.java
@@ -0,0 +1,62 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.services.architecture;
+
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends Plugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.services.architecture"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	/** Logging helper */
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+	}
+
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		log = null;
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/src/org/eclipse/papyrus/infra/services/architecture/ArchitectureDomainService.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/src/org/eclipse/papyrus/infra/services/architecture/ArchitectureDomainService.java
new file mode 100644
index 00000000000..d7a0953dc26
--- /dev/null
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/src/org/eclipse/papyrus/infra/services/architecture/ArchitectureDomainService.java
@@ -0,0 +1,49 @@
+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.architecture;
+
+import org.eclipse.papyrus.infra.architecture.ArchitectureDomainManager;
+import org.eclipse.papyrus.infra.core.services.IService;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+
+/**
+ * Service to register architecture domains
+ */
+public class ArchitectureDomainService implements IService {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void init(ServicesRegistry servicesRegistry) throws ServiceException {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void startService() throws ServiceException {
+		// register architecture domains
+		ArchitectureDomainManager.getInstance();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void disposeService() throws ServiceException {
+		// Do nothing because registered architecture domains may be used
+		// somewhere else.
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/plugin.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/plugin.xml
index 78725c65d9a..96e3784ad48 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/plugin.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/plugin.xml
@@ -154,13 +154,6 @@
          </command>
       </menuContribution>
    </extension>
- <extension
-       point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
-    <elementTypeSet
-          clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
-          path="model/controlmode.elementtypesconfigurations">
-    </elementTypeSet>
- </extension>
    <extension
          point="org.eclipse.ui.decorators">
       <decorator
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/src/org/eclipse/papyrus/infra/services/edit/ui/databinding/PapyrusObservableValue.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/src/org/eclipse/papyrus/infra/services/edit/ui/databinding/PapyrusObservableValue.java
index f43ab6b315a..54f5618c798 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/src/org/eclipse/papyrus/infra/services/edit/ui/databinding/PapyrusObservableValue.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/src/org/eclipse/papyrus/infra/services/edit/ui/databinding/PapyrusObservableValue.java
@@ -112,7 +112,7 @@ public class PapyrusObservableValue extends EMFObservableValue implements Aggreg
 		Object oldValue = getValue();
 
 		try {
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(getObserved());
+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider((EObject)getObserved());
 
 			if (provider != null) {
 				CompositeCommand cc = new CompositeCommand("Edit value");
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF
index 75f88bcae36..6679550dcce 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.infra.services.edit,
  org.eclipse.papyrus.infra.services.edit.commands,
+ org.eclipse.papyrus.infra.services.edit.context,
  org.eclipse.papyrus.infra.services.edit.internal;x-internal:=true,
  org.eclipse.papyrus.infra.services.edit.internal.advice;x-internal:=true,
- org.eclipse.papyrus.infra.services.edit.internal.context;x-internal:=true,
  org.eclipse.papyrus.infra.services.edit.internal.matcher;x-internal:=true,
  org.eclipse.papyrus.infra.services.edit.messages,
  org.eclipse.papyrus.infra.services.edit.service,
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/plugin.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/plugin.xml
index 4c7c1fb072e..894b9472fe3 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/plugin.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/plugin.xml
@@ -1,93 +1,85 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<!--

- Copyright (c) 2010, 2014 CEA and others.

- 

- All rights reserved. This program and the accompanying materials

- are made available under the terms of the Eclipse Public License v1.0

- which accompanies this distribution, and is available at

- http://www.eclipse.org/legal/epl-v10.html

- 

- Contributors:

-   CEA - Initial API and implementation

-   Christian W. Damus (CEA) - bug 323802

-   

--->

-<plugin>

-

-<extension

-      point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">

-   <clientContext

-         id="org.eclipse.papyrus.infra.services.edit.TypeContext">

-      <matcher

-            class="org.eclipse.papyrus.infra.services.edit.internal.matcher.NoContextEnablementMatcher">

-      </matcher>

-   </clientContext>

-</extension>

-

-

-<!-- Binds general (non-UML specific) advices

-

-     The notation dependant advice add a View deletion command for any View that references

-     the EObject currently destroyed.

-     

-     Both the following advices are commonly used by GMF Runtime (and code generated by the tooling):

-     - org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents

-     - org.eclipse.gmf.runtime.diagram.core.advice.removeBookmarks

-     

-     The cross referencer is used to find any View referencing and EObject, as far as the Notation file 

-     is loaded (does not mean each diagram is opened), every view related to an element will be deleted

-     with the element deletion. These views may possibly be located in different diagrams.

-     

-     These advices are generally always added to the GMF default context. As the use of the extensible 

-     type framework in Papyrus is currently used with an explicit unique context, it is important 

-     to add these advices to this shared context to ensure the views are correctly deleted.

-     

-  -->

-<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">

-

-	<!-- Bindings declaration -->

-	<binding context="org.eclipse.papyrus.infra.services.edit.TypeContext">

-		

-		<!-- ElementType that deals with View deletion when their related model element is deleted -->

-		<elementType ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>

-		<elementType ref="org.eclipse.gmf.runtime.diagram.core.advice.removeBookmarks"/>

-

-        <!-- Check for attempts to edit read-only objects that cannot reasonably be made writeable. -->		

-        <advice ref="org.eclipse.papyrus.infra.emf.readOnlyAdvice" />

-        

-        <!-- Delete markers attached to objects being deleted. -->

-	</binding>

-	

-	<!-- 

-	     In the default context, we also want to remove Papyrus Markers from deleted elements.

-	     This is necessarily especially to ensure the advice is used in the deletion of dependent

-	     elements (such as associations of which a member end is being deleted).

-	-->

-    <binding context="org.eclipse.gmf.runtime.emf.type.core.defaultContext">

-        <!-- Delete markers attached to objects being deleted. -->

-        <advice ref="org.eclipse.papyrus.infra.services.edit.markerDeletionAdvice" />

-    </binding>

-

-</extension>

-

-<!-- Declaration of the IElementEditServiceProvider (Papyrus wrapper to the Extensible type framework) -->

-<extension point="org.eclipse.papyrus.infra.core.service">

-

-	<serviceFactory

-		id="org.eclipse.papyrus.infra.services.edit.service.IElementEditServiceProvider"

-		classname="org.eclipse.papyrus.infra.services.edit.internal.ElementEditServiceProviderFactory" 

-		priority="1" startKind="startup">

- 	</serviceFactory>

-

-</extension>

-<extension

-      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">

-   <elementTypeSet

-         clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"

-         path="model/marker.elementtypesconfigurations">

-   </elementTypeSet>

-</extension>

-   

-   

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<!--
+ Copyright (c) 2010, 2014 CEA and others.
+ 
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+ 
+ Contributors:
+   CEA - Initial API and implementation
+   Christian W. Damus (CEA) - bug 323802
+   
+-->
+<plugin>
+
+<extension
+      point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">
+   <clientContext
+         id="org.eclipse.papyrus.infra.services.edit.TypeContext">
+      <matcher
+            class="org.eclipse.papyrus.infra.services.edit.internal.matcher.NoContextEnablementMatcher">
+      </matcher>
+   </clientContext>
+</extension>
+
+
+<!-- Binds general (non-UML specific) advices
+
+     The notation dependant advice add a View deletion command for any View that references
+     the EObject currently destroyed.
+     
+     Both the following advices are commonly used by GMF Runtime (and code generated by the tooling):
+     - org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents
+     - org.eclipse.gmf.runtime.diagram.core.advice.removeBookmarks
+     
+     The cross referencer is used to find any View referencing and EObject, as far as the Notation file 
+     is loaded (does not mean each diagram is opened), every view related to an element will be deleted
+     with the element deletion. These views may possibly be located in different diagrams.
+     
+     These advices are generally always added to the GMF default context. As the use of the extensible 
+     type framework in Papyrus is currently used with an explicit unique context, it is important 
+     to add these advices to this shared context to ensure the views are correctly deleted.
+     
+  -->
+<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">
+
+	<!-- Bindings declaration -->
+	<binding context="org.eclipse.papyrus.infra.services.edit.TypeContext">
+		
+		<!-- ElementType that deals with View deletion when their related model element is deleted -->
+		<elementType ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
+		<elementType ref="org.eclipse.gmf.runtime.diagram.core.advice.removeBookmarks"/>
+
+        <!-- Check for attempts to edit read-only objects that cannot reasonably be made writeable. -->		
+        <advice ref="org.eclipse.papyrus.infra.emf.readOnlyAdvice" />
+        
+        <!-- Delete markers attached to objects being deleted. -->
+	</binding>
+	
+	<!-- 
+	     In the default context, we also want to remove Papyrus Markers from deleted elements.
+	     This is necessarily especially to ensure the advice is used in the deletion of dependent
+	     elements (such as associations of which a member end is being deleted).
+	-->
+    <binding context="org.eclipse.gmf.runtime.emf.type.core.defaultContext">
+        <!-- Delete markers attached to objects being deleted. -->
+        <advice ref="org.eclipse.papyrus.infra.services.edit.markerDeletionAdvice" />
+    </binding>
+
+</extension>
+
+<!-- Declaration of the IElementEditServiceProvider (Papyrus wrapper to the Extensible type framework) -->
+<extension point="org.eclipse.papyrus.infra.core.service">
+
+	<serviceFactory
+		id="org.eclipse.papyrus.infra.services.edit.service.IElementEditServiceProvider"
+		classname="org.eclipse.papyrus.infra.services.edit.internal.ElementEditServiceProviderFactory" 
+		priority="1" startKind="startup">
+ 	</serviceFactory>
+
+</extension>   
+   
+</plugin>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/context/TypeContext.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/context/TypeContext.java
new file mode 100644
index 00000000000..8a5c9b91205
--- /dev/null
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/context/TypeContext.java
@@ -0,0 +1,138 @@
+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.services.edit.context;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.gmf.runtime.emf.type.core.ClientContextManager;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescription;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModelUtils;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.services.edit.internal.context.DefaultTypeContext;
+import org.eclipse.papyrus.infra.services.edit.messages.Messages;
+
+/**
+ * <pre>
+ * An API that allows getting a GMF client context that corresponds to an architecture context
+ * that is applied to a Papyrus model set or one of its owned objects.
+ * </pre>
+ */
+public class TypeContext {
+
+	/**
+	 * Obtains the default Papyrus GMF client context
+	 * 
+	 * @return IClientContext
+	 * @throws ServiceException
+	 */
+	public static IClientContext getDefaultContext() throws ServiceException {
+		return DefaultTypeContext.getContext();
+	}
+
+	/**
+	 * Obtains the default Papyrus GMF client context id
+	 * 
+	 * @return IClientContext
+	 * @throws ServiceException
+	 */
+	public static String getDefaultContextId() {
+		return DefaultTypeContext.ID;
+	}
+
+	/**
+	 * Obtains the GMF client context that corresponds to the given model set
+	 * 
+	 * @param modelSet
+	 * @return IClientContext
+	 * @throws ServiceException
+	 */
+	public static IClientContext getContext(ModelSet modelSet) throws ServiceException {
+		ArchitectureDescription desc = DiModelUtils.getArchitectureDescription(modelSet);
+		if (desc != null)
+			return getContext(desc.getContextId());
+		return getDefaultContext();
+	}
+
+	/**
+	 * Obtains the GMF client context that corresponds to the given resource set
+	 * 
+	 * @param resourceSet
+	 * @return IClientContext
+	 * @throws ServiceException
+	 */
+	public static IClientContext getContext(ResourceSet resoureSet) throws ServiceException {
+		if (resoureSet instanceof ModelSet)
+			return getContext((ModelSet)resoureSet);
+		return getDefaultContext();
+	}
+
+	/**
+	 * Obtains the GMF client context that corresponds to the given editing domain
+	 * 
+	 * @param editingDomain
+	 * @return IClientContext
+	 * @throws ServiceException
+	 */
+	public static IClientContext getContext(EditingDomain editingDomain) throws ServiceException {
+		if (editingDomain.getResourceSet() != null)
+			return getContext(editingDomain.getResourceSet());
+		return getDefaultContext();
+	}
+
+	/**
+	 * Obtains the GMF client context that corresponds to the given resource
+	 * 
+	 * @param resource
+	 * @return IClientContext
+	 * @throws ServiceException
+	 */
+	public static IClientContext getContext(Resource resource) throws ServiceException {
+		if (resource.getResourceSet() != null)
+			return getContext(resource.getResourceSet());
+		return getDefaultContext();
+	}
+
+	/**
+	 * Obtains the GMF client context that corresponds to the given object
+	 * 
+	 * @param object
+	 * @return IClientContext
+	 * @throws ServiceException
+	 */
+	public static IClientContext getContext(EObject object) throws ServiceException {
+		if (object.eResource() != null)
+			return getContext(object.eResource());
+		return getDefaultContext();
+	}
+
+	/**
+	 * Obtains the GMF client context that corresponds to the given object
+	 * 
+	 * @param object
+	 * @return IClientContext
+	 * @throws ServiceException
+	 */
+	public static IClientContext getContext(String contextId) throws ServiceException {
+		IClientContext context = ClientContextManager.getInstance().getClientContext(contextId);
+		if (context == null) {
+			throw new ServiceException(NLS.bind(Messages.TypeContext_ContextNotFound, contextId));
+		}
+		return context;
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/internal/ElementEditServiceProvider.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/internal/ElementEditServiceProvider.java
index 6d2f602635d..b4dd23b8810 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/internal/ElementEditServiceProvider.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/internal/ElementEditServiceProvider.java
@@ -1,172 +1,158 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2014 CEA LIST and others.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- * 		Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *      Christian W. Damus (CEA) - support read-only objects (CDO)

- *      Christian W. Damus (CEA) - bug 323802

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.edit.internal;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.NullElementType;

-import org.eclipse.osgi.util.NLS;

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

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext;

-import org.eclipse.papyrus.infra.services.edit.messages.Messages;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditServiceProvider;

-

-/**

- * <pre>

- *

- * This provider wrap {@link ElementTypeRegistry} especially to provide a Papyrus-like

- * service provider.

- * This class is a singleton that may be access directly or via Papyrus service registry.

- * Note that this provider does not necessary need Papyrus to be the active editor to be available

- * (it relies on {@link ElementTypeRegistry} which is independant from Papyrus.

- *

- * It is registered as Papyrus service with the {@link ElementEditServiceProviderFactory}.

- *

- * </pre>

- */

-public class ElementEditServiceProvider implements IElementEditServiceProvider {

-

-	/** Papyrus shared {@link IClientContext} */

-	protected IClientContext sharedClientContext;

-

-	/** Singleton instance */

-	private static IElementEditServiceProvider instance;

-

-	/** Default constructor */

-	private ElementEditServiceProvider() throws ServiceException {

-		this.sharedClientContext = TypeContext.getContext();

-	}

-

-	/** Get singleton instance */

-	public static synchronized IElementEditServiceProvider getInstance() throws ServiceException {

-		if (instance == null) {

-			instance = new ElementEditServiceProvider();

-		}

-

-		return instance;

-	}

-

-	/**

-	 * <pre>

-	 *

-	 * This method try to retrieve the correct edit service for an object.

-	 *

-	 * It relies on GMF {@link ElementTypeRegistry} which provides the {@link IElementType} registered

-	 * in the Extensible type framework for the object passed in parameter. The found element type is returned

-	 * wrapped as an {@link IElementEditService}.

-	 *

-	 * The {@link IElementType} are registered in separate plug-ins (e.g. oep.uml.service.types for all types

-	 * related to UML metaclasses).

-	 *

-	 * @see org.eclipse.papyrus.infra.services.edit.service.IElementEditServiceProvider#getEditService(java.lang.Object)

-	 *

-	 * @param objectToEdit the object for which this method tries to retrieve an edit service

-	 * @return the {@link IElementEditService} for the passed object

-	 * @throws ServiceException

-	 *

-	 * </pre>

-	 */

-	@Override

-	public IElementEditService getEditService(Object objectToEdit) throws ServiceException {

-

-		if (!(objectToEdit instanceof EObject) && !(objectToEdit instanceof EClass) && !(objectToEdit instanceof IElementType)) {

-			throw new ServiceException(Messages.ElementEditServiceProvider_UnexpectedParameterType);

-		}

-

-		IElementType elementType = null;

-

-		if (objectToEdit instanceof EClass) {

-			elementType = ElementTypeRegistry.getInstance().getElementType((EClass) objectToEdit, sharedClientContext);

-		} else if (objectToEdit instanceof EObject) {

-			EObject eObject = (EObject) objectToEdit;

-			if (isReadOnly(eObject)) {

-				elementType = NullElementType.getInstance();

-			} else {

-				elementType = ElementTypeRegistry.getInstance().getElementType(eObject, sharedClientContext);

-			}

-		} else if (objectToEdit instanceof IElementType) {

-			// Make sure the IElementType is in Papyrus shared context

-			if (sharedClientContext.includes((IElementType) objectToEdit)) {

-				elementType = (IElementType) objectToEdit;

-			}

-		}

-

-		if (elementType == null) {

-			throw new ServiceException(NLS.bind(Messages.ElementEditServiceProvider_NoIElementTypeFound, objectToEdit));

-		}

-

-		return new ElementEditService(elementType, sharedClientContext);

-	}

-

-	private boolean isReadOnly(EObject object) {

-		EditingDomain domain = EMFHelper.resolveEditingDomain(object);

-		return EMFHelper.isReadOnly(object, domain) && !EMFHelper.canMakeWritable(object, domain);

-	}

-

-	/**

-	 * <pre>

-	 *

-	 * This method returns the registered {@link IElementType} (wrapped as {@link IElementEditService}) that may be contained by

-	 * the eContainer parameter for the specific reference parameter.

-	 *

-	 * @see org.eclipse.papyrus.infra.services.edit.service.IElementEditServiceProvider#getContainedTypeEditServices(org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EReference)

-	 *

-	 * @param eContainer

-	 * @param reference

-	 * @return the list of possibly contained {@link IElementEditService}

-	 * @throws ServiceException

-	 * </pre>

-	 */

-	@Override

-	public List<IElementEditService> getContainedTypeEditServices(EObject eContainer, EReference reference) throws ServiceException {

-		List<IElementEditService> services = new ArrayList<IElementEditService>();

-

-		for (IElementType type : ElementTypeRegistry.getInstance().getContainedTypes(eContainer, reference, sharedClientContext)) {

-			services.add(new ElementEditService(type, sharedClientContext));

-		}

-

-		return services;

-	}

-

-	/**

-	 * <pre>

-	 * Tests if the id

-	 * @param id the element type id to look for in the shared client context

-	 * @return true if the element type is bound to the shared client context

-	 * </pre>

-	 */

-	@Override

-	public boolean isKnownElementType(String id) {

-		boolean isKnown = false;

-

-		if (ElementTypeRegistry.getInstance().getType(id) != null) {

-			isKnown = sharedClientContext.includes(ElementTypeRegistry.getInstance().getType(id));

-		}

-

-		return isKnown;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST and others.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ * 		Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
+ *      Christian W. Damus (CEA) - support read-only objects (CDO)
+ *      Christian W. Damus (CEA) - bug 323802
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.edit.internal;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.NullElementType;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.services.edit.messages.Messages;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditServiceProvider;
+
+/**
+ * <pre>
+ *
+ * This provider wrap {@link ElementTypeRegistry} especially to provide a Papyrus-like
+ * service provider.
+ * Note that this provider does not necessary need Papyrus to be the active editor to be available
+ * (it relies on {@link ElementTypeRegistry} which is independant from Papyrus.
+ *
+ * It is registered as Papyrus service with the {@link ElementEditServiceProviderFactory}.
+ *
+ * </pre>
+ */
+public class ElementEditServiceProvider implements IElementEditServiceProvider {
+
+	/** Papyrus shared {@link IClientContext} */
+	protected IClientContext sharedClientContext;
+
+	/** Default constructor */
+	public ElementEditServiceProvider(IClientContext clientContext) {
+		this.sharedClientContext = clientContext;
+	}
+
+	/**
+	 * <pre>
+	 *
+	 * This method try to retrieve the correct edit service for an object.
+	 *
+	 * It relies on GMF {@link ElementTypeRegistry} which provides the {@link IElementType} registered
+	 * in the Extensible type framework for the object passed in parameter. The found element type is returned
+	 * wrapped as an {@link IElementEditService}.
+	 *
+	 * The {@link IElementType} are registered in separate plug-ins (e.g. oep.uml.service.types for all types
+	 * related to UML metaclasses).
+	 *
+	 * @see org.eclipse.papyrus.infra.services.edit.service.IElementEditServiceProvider#getEditService(java.lang.Object)
+	 *
+	 * @param objectToEdit the object for which this method tries to retrieve an edit service
+	 * @return the {@link IElementEditService} for the passed object
+	 * @throws ServiceException
+	 *
+	 * </pre>
+	 */
+	@Override
+	public IElementEditService getEditService(Object objectToEdit) throws ServiceException {
+
+		if (!(objectToEdit instanceof EObject) && !(objectToEdit instanceof EClass) && !(objectToEdit instanceof IElementType)) {
+			throw new ServiceException(Messages.ElementEditServiceProvider_UnexpectedParameterType);
+		}
+
+		IElementType elementType = null;
+
+		if (objectToEdit instanceof EClass) {
+			elementType = ElementTypeRegistry.getInstance().getElementType((EClass) objectToEdit, sharedClientContext);
+		} else if (objectToEdit instanceof EObject) {
+			EObject eObject = (EObject) objectToEdit;
+			if (isReadOnly(eObject)) {
+				elementType = NullElementType.getInstance();
+			} else {
+				elementType = ElementTypeRegistry.getInstance().getElementType(eObject, sharedClientContext);
+			}
+		} else if (objectToEdit instanceof IElementType) {
+			// Make sure the IElementType is in Papyrus shared context
+			if (sharedClientContext.includes((IElementType) objectToEdit)) {
+				elementType = (IElementType) objectToEdit;
+			}
+		}
+
+		if (elementType == null) {
+			throw new ServiceException(NLS.bind(Messages.ElementEditServiceProvider_NoIElementTypeFound, objectToEdit));
+		}
+
+		return new ElementEditService(elementType, sharedClientContext);
+	}
+
+	private boolean isReadOnly(EObject object) {
+		EditingDomain domain = EMFHelper.resolveEditingDomain(object);
+		return EMFHelper.isReadOnly(object, domain) && !EMFHelper.canMakeWritable(object, domain);
+	}
+
+	/**
+	 * <pre>
+	 *
+	 * This method returns the registered {@link IElementType} (wrapped as {@link IElementEditService}) that may be contained by
+	 * the eContainer parameter for the specific reference parameter.
+	 *
+	 * @see org.eclipse.papyrus.infra.services.edit.service.IElementEditServiceProvider#getContainedTypeEditServices(org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EReference)
+	 *
+	 * @param eContainer
+	 * @param reference
+	 * @return the list of possibly contained {@link IElementEditService}
+	 * @throws ServiceException
+	 * </pre>
+	 */
+	@Override
+	public List<IElementEditService> getContainedTypeEditServices(EObject eContainer, EReference reference) throws ServiceException {
+		List<IElementEditService> services = new ArrayList<IElementEditService>();
+
+		for (IElementType type : ElementTypeRegistry.getInstance().getContainedTypes(eContainer, reference, sharedClientContext)) {
+			services.add(new ElementEditService(type, sharedClientContext));
+		}
+
+		return services;
+	}
+
+	/**
+	 * <pre>
+	 * Tests if the id
+	 * @param id the element type id to look for in the shared client context
+	 * @return true if the element type is bound to the shared client context
+	 * </pre>
+	 */
+	@Override
+	public boolean isKnownElementType(String id) {
+		boolean isKnown = false;
+
+		if (ElementTypeRegistry.getInstance().getType(id) != null) {
+			isKnown = sharedClientContext.includes(ElementTypeRegistry.getInstance().getType(id));
+		}
+
+		return isKnown;
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/internal/ElementEditServiceProviderFactory.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/internal/ElementEditServiceProviderFactory.java
index 3742f83be40..edbac11b812 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/internal/ElementEditServiceProviderFactory.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/internal/ElementEditServiceProviderFactory.java
@@ -1,73 +1,80 @@
-/*****************************************************************************

- * 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.infra.services.edit.internal;

-

-import org.eclipse.papyrus.infra.core.services.IServiceFactory;

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

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditServiceProvider;

-

-/** Papyrus factory that provides ElementEditServiceProvider */

-public class ElementEditServiceProviderFactory implements IServiceFactory {

-

-	/** Default constructor */

-	public ElementEditServiceProviderFactory() {

-

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)

-	 *

-	 * @param servicesRegistry

-	 * @throws ServiceException

-	 */

-	@Override

-	public void init(ServicesRegistry servicesRegistry) throws ServiceException {

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.core.services.IService#startService()

-	 *

-	 * @throws ServiceException

-	 */

-	@Override

-	public void startService() throws ServiceException {

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()

-	 *

-	 * @throws ServiceException

-	 */

-	@Override

-	public void disposeService() throws ServiceException {

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.core.services.IServiceFactory#createServiceInstance()

-	 *

-	 * @return the singleton instance of {@link IElementEditServiceProvider}

-	 * @throws ServiceException

-	 */

-	@Override

-	public Object createServiceInstance() throws ServiceException {

-		return ElementEditServiceProvider.getInstance();

-	}

-

-}

+/*****************************************************************************
+ * 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.infra.services.edit.internal;
+
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.services.IServiceFactory;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditServiceProvider;
+
+/** Papyrus factory that provides ElementEditServiceProvider */
+public class ElementEditServiceProviderFactory implements IServiceFactory {
+
+	private ModelSet modelSet;
+
+	/** Default constructor */
+	public ElementEditServiceProviderFactory() {
+
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)
+	 *
+	 * @param servicesRegistry
+	 * @throws ServiceException
+	 */
+	@Override
+	public void init(ServicesRegistry servicesRegistry) throws ServiceException {
+		this.modelSet = servicesRegistry.getService(ModelSet.class);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.core.services.IService#startService()
+	 *
+	 * @throws ServiceException
+	 */
+	@Override
+	public void startService() throws ServiceException {
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()
+	 *
+	 * @throws ServiceException
+	 */
+	@Override
+	public void disposeService() throws ServiceException {
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.core.services.IServiceFactory#createServiceInstance()
+	 *
+	 * @return the singleton instance of {@link IElementEditServiceProvider}
+	 * @throws ServiceException
+	 */
+	@Override
+	public Object createServiceInstance() throws ServiceException {
+		IClientContext context = TypeContext.getContext(modelSet);
+		return new ElementEditServiceProvider(context);
+	}
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/internal/context/TypeContext.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/internal/context/DefaultTypeContext.java
index fa99b884dcf..45c6684362e 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/internal/context/TypeContext.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/internal/context/DefaultTypeContext.java
@@ -1,57 +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

- *

- * Contributors:

- *

- * 		Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- * 		Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.edit.internal.context;

-

-import org.eclipse.gmf.runtime.emf.type.core.ClientContextManager;

-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.osgi.util.NLS;

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

-import org.eclipse.papyrus.infra.services.edit.messages.Messages;

-

-/**

- * <pre>

- * The centralized model type edit service relies on GMF Runtime extensible

- * type framework, used via a single common {@link IClientContext} on which

- * the various {@link IElementType} used by Papyrus are registered.

- *

- * This class stores this context ID and provides a convenient API to

- * get the {@link IClientContext} from the {@link ClientContextManager}.

- * </pre>

- */

-public class TypeContext {

-

-	/** The ID of Papyrus {@link IClientContext} (declared in plugin.xml, shall not be modified) */

-	private static final String ID = "org.eclipse.papyrus.infra.services.edit.TypeContext"; //$NON-NLS-1$

-

-	/**

-	 * Retrieve Papyrus {@link IClientContext} from its ID.

-	 *

-	 * @return the tool context

-	 * @throws Exception

-	 *             if the context is not found

-	 */

-	public static IClientContext getContext() throws ServiceException {

-

-		IClientContext context = ClientContextManager.getInstance().getClientContext(ID);

-		if (context == null) {

-			throw new ServiceException(NLS.bind(Messages.TypeContext_ContextNotFound, ID));

-		}

-

-		return context;

-	}

-

-}

+/*****************************************************************************
+ * 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
+ * 		Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.edit.internal.context;
+
+import org.eclipse.gmf.runtime.emf.type.core.ClientContextManager;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.services.edit.messages.Messages;
+
+/**
+ * <pre>
+ * A wrapper for the default {@link IClientContext} for Papyrus
+ *
+ * This class stores this context ID and provides a convenient API to
+ * get the default {@link IClientContext} from the {@link ClientContextManager}.
+ * </pre>
+ */
+public class DefaultTypeContext {
+
+	/** The ID of Papyrus {@link IClientContext} (declared in plugin.xml, shall not be modified) */
+	public static final String ID = "org.eclipse.papyrus.infra.services.edit.TypeContext"; //$NON-NLS-1$
+
+	/**
+	 * Retrieve Papyrus {@link IClientContext} from its ID.
+	 *
+	 * @return the tool context
+	 * @throws Exception
+	 *             if the context is not found
+	 */
+	public static IClientContext getContext() throws ServiceException {
+
+		IClientContext context = ClientContextManager.getInstance().getClientContext(ID);
+		if (context == null) {
+			throw new ServiceException(NLS.bind(Messages.TypeContext_ContextNotFound, ID));
+		}
+
+		return context;
+	}
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/service/ElementEditServiceUtils.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/service/ElementEditServiceUtils.java
index bd7fcfe4eb4..1f602aa6f40 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/service/ElementEditServiceUtils.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/service/ElementEditServiceUtils.java
@@ -1,232 +1,237 @@
-/*****************************************************************************

- * 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.infra.services.edit.service;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.commands.ExecutionException;

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

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RollbackException;

-import org.eclipse.emf.transaction.Transaction;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;

-import org.eclipse.emf.transaction.util.TransactionUtil;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;

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

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

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

-import org.eclipse.osgi.util.NLS;

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

-import org.eclipse.papyrus.infra.core.utils.ServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.Activator;

-import org.eclipse.papyrus.infra.services.edit.internal.ElementEditServiceProvider;

-import org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext;

-import org.eclipse.papyrus.infra.services.edit.messages.Messages;

-import org.eclipse.papyrus.infra.services.edit.utils.IRequestCacheEntries;

-

-/**

- * <pre>

- *

- * Utility class for a convenient access to edit services.

- *

- * </pre>

- */

-public class ElementEditServiceUtils {

-

-	/**

-	 * <pre>

-	 * Try to retrieve an edit service for the object in parameter

-	 * (EObject or EClass expected).

-	 *

-	 * Current implementation directly use {@link IElementEditServiceProvider} instance

-	 * rather than using Papyrus {@link ServiceUtils} which requires Papyrus to be

-	 * the active editor.

-	 *

-	 * @param objectToEdit

-	 * @return the edit service or null

-	 * </pre>

-	 */

-	public static IElementEditService getCommandProvider(Object objectToEdit) {

-

-		try {

-			return getEditServiceProvider().getEditService(objectToEdit);

-		} catch (ServiceException e) {

-			Activator.log.error(NLS.bind(Messages.ElementEditServiceUtils_UnableToFindElementType, objectToEdit), e);

-		} catch (NullPointerException e) {

-			Activator.log.error(NLS.bind(Messages.ElementEditServiceUtils_UnableToFindElementType, objectToEdit), e);

-		}

-

-		return null;

-

-		// ServicesRegistry serviceRegistry = EditorUtils.getServiceRegistry();

-		// try {

-		// IElementEditServiceProvider serviceProvider = serviceRegistry.getService(IElementEditServiceProvider.class);

-		// IElementEditService service = serviceProvider.getEditService(objectToEdit);

-		// return serviceRegistry == null ? null : service;

-		// } catch (ServiceException e) {

-		// return null;

-		// }

-	}

-

-	/**

-	 * <pre>

-	 * Get the edit service provider (using {@link ElementTypeRegistry} instead of

-	 * {@link ServiceUtils}). Note that {@link ServiceUtils} would return the same instance

-	 * anyway.

-	 *

-	 * @return the service provider

-	 * </pre>

-	 */

-	public static IElementEditServiceProvider getEditServiceProvider() {

-

-		try {

-			return getEditServiceProviderFromElementTypeRegistry();

-		} catch (ServiceException e) {

-			Activator.log.error(Messages.ElementEditServiceUtils_UnableToFindServiceProvider, e);

-		}

-

-		return null;

-

-		// ServicesRegistry serviceRegistry = EditorUtils.getServiceRegistry();

-		// try {

-		// IElementEditServiceProvider serviceProvider = serviceRegistry.getService(IElementEditServiceProvider.class);

-		// return serviceRegistry == null ? null : serviceProvider;

-		// } catch (ServiceException e) {

-		// return null;

-		// }

-	}

-

-	/**

-	 * Get the element edit service provider from the {@link ElementTypeRegistry}.

-	 *

-	 * @return the element edit service

-	 * @throws ServiceException

-	 */

-	protected static IElementEditServiceProvider getEditServiceProviderFromElementTypeRegistry() throws ServiceException {

-		return ElementEditServiceProvider.getInstance();

-	}

-

-	/**

-	 * Return a target after executing a passed context request

-	 *

-	 * @param editingDomain

-	 *            the editing domain

-	 * @param owner

-	 *            the parent object in which we want to create an element

-	 * @param hintedType

-	 *            The information which element to create.

-	 * @return the resulting target object or null in case of a failure

-	 */

-	public static EObject getTargetFromContext(TransactionalEditingDomain editingDomain, EObject owner, IEditCommandRequest editRequest) {

-		GetEditContextRequest editContextRequest = new GetEditContextRequest(editingDomain, editRequest, owner);

-

-		editContextRequest.setParameter(IRequestCacheEntries.Cache_Maps, new HashMap<Object, Object>());

-		editContextRequest.setEditContext(owner);

-		try {

-			editContextRequest.setClientContext(TypeContext.getContext());

-		} catch (ServiceException e) {

-			Activator.log.error(e);

-			return null;

-		}

-

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(owner);

-		if (provider == null) {

-			Activator.log.debug(Messages.ElementEditServiceUtils_CantGetEditingDomainProvider);

-			return null;

-		}

-

-		EObject target = owner;

-		Object result = null;

-		final ICommand getEditContextCommand = provider.getEditCommand(editContextRequest);

-		if (getEditContextCommand != null) {

-			IStatus status = null;

-			try {

-				// this command could run in an unprotected transaction, it is not supposed to modify the model

-				InternalTransactionalEditingDomain domain = (InternalTransactionalEditingDomain) editingDomain;

-				Map<String, Object> options = new HashMap<String, Object>();

-				options.put(Transaction.OPTION_NO_NOTIFICATIONS, true);

-				options.put(Transaction.OPTION_NO_VALIDATION, true);

-				options.put(Transaction.OPTION_NO_TRIGGERS, true);

-				Transaction transaction = domain.startTransaction(false, options);

-				try {

-					status = getEditContextCommand.execute(null, null);

-				} finally {

-					transaction.commit();

-				}

-			} catch (InterruptedException e) {

-				Activator.log.error(e);

-			} catch (ExecutionException e) {

-				Activator.log.error(e);

-			} catch (RollbackException e) {

-				Activator.log.error(e);

-			}

-			if (status != null && status.isOK()) {

-				result = getEditContextCommand.getCommandResult().getReturnValue();

-			}

-			if (result instanceof EObject) {

-				target = (EObject) result;

-			}

-		}

-		return target;

-	}

-

-	/**

-	 * Convenience function that determines editing domain automatically.

-	 * 

-	 * @see {@link #getTargetFromContext(TransactionalEditingDomain, EObject, IEditCommandRequest)}

-	 */

-	public static EObject getTargetFromContext(EObject owner, IEditCommandRequest editRequest) {

-		return getTargetFromContext(TransactionUtil.getEditingDomain(owner), owner, editRequest);

-

-	}

-

-	/**

-	 * Support creation of a child within another object with a (default) context

-	 *

-	 * @param editingDomain

-	 *            the editing domain

-	 * @param owner

-	 *            the parent object in which we want to create an element

-	 * @param hintedType

-	 *            The information which element to create.

-	 * @return a GMF command that will create child

-	 */

-	public static ICommand getCreateChildCommandWithContext(TransactionalEditingDomain editingDomain, EObject owner, IHintedType hintedType) {

-		TransactionalEditingDomain transactionalEditingDomain = TransactionUtil.getEditingDomain(owner);

-		final EObject target = getTargetFromContext(transactionalEditingDomain, owner,

-				new CreateElementRequest(transactionalEditingDomain, owner, hintedType));

-

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(target);

-		if (provider == null) {

-			return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;

-		}

-

-		ICommand createGMFCommand = provider.getEditCommand(new CreateElementRequest(transactionalEditingDomain, target, hintedType));

-		return createGMFCommand;

-	}

-

-	/**

-	 * Convenience function that determines editing domain automatically

-	 * 

-	 * @see {@link #getCreateChildCommandWithContext(TransactionalEditingDomain, EObject, IHintedType)}

-	 */

-	public static ICommand getCreateChildCommandWithContext(EObject owner, IHintedType hintedType) {

-		return getCreateChildCommandWithContext(TransactionUtil.getEditingDomain(owner), owner, hintedType);

-	}

-}

+/*****************************************************************************
+ * 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.infra.services.edit.service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RollbackException;
+import org.eclipse.emf.transaction.Transaction;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
+import org.eclipse.emf.transaction.util.TransactionUtil;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
+import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.Activator;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
+import org.eclipse.papyrus.infra.services.edit.internal.ElementEditServiceProvider;
+import org.eclipse.papyrus.infra.services.edit.messages.Messages;
+import org.eclipse.papyrus.infra.services.edit.utils.IRequestCacheEntries;
+
+/**
+ * <pre>
+ *
+ * Utility class for a convenient access to edit services.
+ *
+ * </pre>
+ */
+public class ElementEditServiceUtils {
+
+	/**
+	 * <pre>
+	 * Try to retrieve an edit service for the object in parameter
+	 * (EObject or EClass, or IElementType expected) in a given context
+	 *
+	 * Current implementation directly use {@link IElementEditServiceProvider} instance
+	 * rather than using Papyrus {@link ServiceUtils} which requires Papyrus to be
+	 * the active editor.
+	 *
+	 * @param objectToEdit
+	 * @param context
+	 * @return the edit service or null
+	 * </pre>
+	 */
+	public static IElementEditService getCommandProvider(Object objectToEdit, IClientContext context) {
+		try {
+			IElementEditServiceProvider provider = getEditServiceProvider(context);
+			if (provider != null)
+				return provider.getEditService(objectToEdit);
+		} catch (ServiceException e) {
+			Activator.log.error(NLS.bind(Messages.ElementEditServiceUtils_UnableToFindElementType, objectToEdit), e);
+		}
+		return null;
+
+		// ServicesRegistry serviceRegistry = EditorUtils.getServiceRegistry();
+		// try {
+		// IElementEditServiceProvider serviceProvider = serviceRegistry.getService(IElementEditServiceProvider.class);
+		// IElementEditService service = serviceProvider.getEditService(objectToEdit);
+		// return serviceRegistry == null ? null : service;
+		// } catch (ServiceException e) {
+		// return null;
+		// }
+	}
+
+	/**
+	 * <pre>
+	 * Try to retrieve an edit service for the EObject in parameter assuming the context
+	 * of the model set that the object belongs to
+	 *
+	 * @param objectToEdit
+	 * @return the edit service or null
+	 * </pre>
+	 */
+	public static IElementEditService getCommandProvider(EObject objectToEdit) {
+		IClientContext context;
+		try {
+			context = TypeContext.getContext(objectToEdit);
+			return getCommandProvider(objectToEdit, context);
+		} catch (ServiceException e) {
+			Activator.log.error(e);
+		}
+		return null;
+	}
+	
+	/**
+	 * <pre>
+	 * Get the edit service provider (using {@link ElementTypeRegistry} instead of
+	 * {@link ServiceUtils}). Note that {@link ServiceUtils} would return the same instance
+	 * anyway.
+	 *
+	 * @return the service provider
+	 * </pre>
+	 */
+	public static IElementEditServiceProvider getEditServiceProvider(IClientContext context) {
+
+		return new ElementEditServiceProvider(context);
+
+		// ServicesRegistry serviceRegistry = EditorUtils.getServiceRegistry();
+		// try {
+		// IElementEditServiceProvider serviceProvider = serviceRegistry.getService(IElementEditServiceProvider.class);
+		// return serviceRegistry == null ? null : serviceProvider;
+		// } catch (ServiceException e) {
+		// return null;
+		// }
+	}
+
+	/**
+	 * Return a target after executing a passed context request
+	 *
+	 * @param editingDomain
+	 *            the editing domain
+	 * @param owner
+	 *            the parent object in which we want to create an element
+	 * @param hintedType
+	 *            The information which element to create.
+	 * @return the resulting target object or null in case of a failure
+	 */
+	public static EObject getTargetFromContext(TransactionalEditingDomain editingDomain, EObject owner, IEditCommandRequest editRequest) {
+		GetEditContextRequest editContextRequest = new GetEditContextRequest(editingDomain, editRequest, owner);
+
+		editContextRequest.setParameter(IRequestCacheEntries.Cache_Maps, new HashMap<Object, Object>());
+		editContextRequest.setEditContext(owner);
+		try {
+			editContextRequest.setClientContext(TypeContext.getContext(editingDomain));
+		} catch (ServiceException e) {
+			Activator.log.error(e);
+			return null;
+		}
+
+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(owner);
+		if (provider == null) {
+			Activator.log.debug(Messages.ElementEditServiceUtils_CantGetEditingDomainProvider);
+			return null;
+		}
+
+		EObject target = owner;
+		Object result = null;
+		final ICommand getEditContextCommand = provider.getEditCommand(editContextRequest);
+		if (getEditContextCommand != null) {
+			IStatus status = null;
+			try {
+				// this command could run in an unprotected transaction, it is not supposed to modify the model
+				InternalTransactionalEditingDomain domain = (InternalTransactionalEditingDomain) editingDomain;
+				Map<String, Object> options = new HashMap<String, Object>();
+				options.put(Transaction.OPTION_NO_NOTIFICATIONS, true);
+				options.put(Transaction.OPTION_NO_VALIDATION, true);
+				options.put(Transaction.OPTION_NO_TRIGGERS, true);
+				Transaction transaction = domain.startTransaction(false, options);
+				try {
+					status = getEditContextCommand.execute(null, null);
+				} finally {
+					transaction.commit();
+				}
+			} catch (InterruptedException e) {
+				Activator.log.error(e);
+			} catch (ExecutionException e) {
+				Activator.log.error(e);
+			} catch (RollbackException e) {
+				Activator.log.error(e);
+			}
+			if (status != null && status.isOK()) {
+				result = getEditContextCommand.getCommandResult().getReturnValue();
+			}
+			if (result instanceof EObject) {
+				target = (EObject) result;
+			}
+		}
+		return target;
+	}
+
+	/**
+	 * Convenience function that determines editing domain automatically.
+	 * 
+	 * @see {@link #getTargetFromContext(TransactionalEditingDomain, EObject, IEditCommandRequest)}
+	 */
+	public static EObject getTargetFromContext(EObject owner, IEditCommandRequest editRequest) {
+		return getTargetFromContext(TransactionUtil.getEditingDomain(owner), owner, editRequest);
+
+	}
+
+	/**
+	 * Support creation of a child within another object with a (default) context
+	 *
+	 * @param editingDomain
+	 *            the editing domain
+	 * @param owner
+	 *            the parent object in which we want to create an element
+	 * @param hintedType
+	 *            The information which element to create.
+	 * @return a GMF command that will create child
+	 */
+	public static ICommand getCreateChildCommandWithContext(TransactionalEditingDomain editingDomain, EObject owner, IHintedType hintedType) {
+		TransactionalEditingDomain transactionalEditingDomain = TransactionUtil.getEditingDomain(owner);
+		final EObject target = getTargetFromContext(transactionalEditingDomain, owner,
+				new CreateElementRequest(transactionalEditingDomain, owner, hintedType));
+
+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(target);
+		if (provider == null) {
+			return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;
+		}
+
+		ICommand createGMFCommand = provider.getEditCommand(new CreateElementRequest(transactionalEditingDomain, target, hintedType));
+		return createGMFCommand;
+	}
+
+	/**
+	 * Convenience function that determines editing domain automatically
+	 * 
+	 * @see {@link #getCreateChildCommandWithContext(TransactionalEditingDomain, EObject, IHintedType)}
+	 */
+	public static ICommand getCreateChildCommandWithContext(EObject owner, IHintedType hintedType) {
+		return getCreateChildCommandWithContext(TransactionUtil.getEditingDomain(owner), owner, hintedType);
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/utils/ElementTypeUtils.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/utils/ElementTypeUtils.java
index 07f40d2f92b..05bad1c7130 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/utils/ElementTypeUtils.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/utils/ElementTypeUtils.java
@@ -1,146 +1,146 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2014 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *  Christian W. Damus - bug 451230

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.edit.utils;

-

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.TreeSet;

-

-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

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

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

-import org.eclipse.papyrus.infra.services.edit.Activator;

-import org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext;

-

-/**

- * Utils class for elements types

- *

- * @author Vincent Lorenzo

- *

- */

-public class ElementTypeUtils {

-

-

-	protected ElementTypeUtils() {

-		// to prevent instanciation

-	}

-

-	/**

-	 *

-	 * @return

-	 * 		all existing elements types

-	 */

-	public static final Collection<IElementType> getAllExistingElementTypes() {

-		IClientContext clientContext = getEditContext();

-		final IElementType[] types = ElementTypeRegistry.getInstance().getElementTypes(clientContext);

-		return Arrays.asList(types);

-	}

-

-	/**

-	 * @return

-	 * 		all existing element type id, sorted by alphabetical order

-	 */

-	public static final Collection<String> getAllExistingElementTypesIds() {

-		final Collection<String> ids = new TreeSet<String>();

-		for (final IElementType iElementType : getAllExistingElementTypes()) {

-			ids.add(iElementType.getId());

-		}

-		return ids;

-	}

-

-	/**

-	 * Obtains the element type client context in which the edit service binds element types.

-	 *

-	 * @return the edit service's client context, or {@code null} if it is not available in the current installation

-	 */

-	public static IClientContext getEditContext() {

-		IClientContext result = null;

-

-		try {

-			result = TypeContext.getContext();

-		} catch (ServiceException e) {

-			Activator.log.error(e);

-		}

-

-		return result;

-

-	}

-

-	/**

-	 * return a boolean about the usage of a GUI for edition of an Element

-	 *

-	 * @param request

-	 *            an edition request

-	 * @return true if the request do not contain information about usage of GUI

-	 */

-	public static boolean useGUI(IEditCommandRequest request) {

-		Object value = request.getParameter(RequestParameterConstants.USE_GUI);

-

-		if (value instanceof Boolean) {

-			return (Boolean) value;

-		} else if (value instanceof String) {

-			Boolean booleanObject = Boolean.valueOf((String) value);

-			return booleanObject.booleanValue();

-		}

-

-		return true; // Default

-	}

-	

-	/**

-	 * return a boolean about the cancellability of a diagram for edition of an Element

-	 *

-	 * @param request

-	 *            an edition request

-	 * @return true if the request do not contain information about cancellability

-	 */

-	public static boolean dialogCancellable(IEditCommandRequest request) {

-		Object value = request.getParameter(RequestParameterConstants.DIALOG_CANCELLABLE);

-

-		if (value instanceof Boolean) {

-			return (Boolean) value;

-		} else if (value instanceof String) {

-			Boolean booleanObject = Boolean.valueOf((String) value);

-			return booleanObject.booleanValue();

-		}

-

-		return false; // Default

-	}

-

-	/**

-	 * Configure a request to specify whether the GUI should be used or not.

-	 *

-	 * If set to false, dialogs shouldn't be opened during the execution of the associated command(s)

-	 *

-	 * @param request

-	 * @param useGUI

-	 */

-	public static void setUseGUI(IEditCommandRequest request, boolean useGUI) {

-		request.setParameter(RequestParameterConstants.USE_GUI, useGUI);

-	}

-	

-	/**

-	 * Configure a request to specify whether the editdialog should be cancellable or not.

-	 *

-	 * If set to false, dialogs shouldn't be cancellable during the execution of the associated command(s)

-	 *

-	 * @param request

-	 * @param dialogCancellable

-	 */

-	public static void setDialogCancellable(IEditCommandRequest request, boolean dialogCancellable) {

-		request.setParameter(RequestParameterConstants.DIALOG_CANCELLABLE, dialogCancellable);

-	}

-

+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 451230
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.edit.utils;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.TreeSet;
+
+import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.services.edit.Activator;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
+
+/**
+ * Utils class for elements types
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ElementTypeUtils {
+
+
+	protected ElementTypeUtils() {
+		// to prevent instanciation
+	}
+
+	/**
+	 *
+	 * @return
+	 * 		all existing elements types
+	 */
+	public static final Collection<IElementType> getAllExistingElementTypes() {
+		IClientContext clientContext = getDefaultClientContext();
+		final IElementType[] types = ElementTypeRegistry.getInstance().getElementTypes(clientContext);
+		return Arrays.asList(types);
+	}
+
+	/**
+	 * @return
+	 * 		all existing element type id, sorted by alphabetical order
+	 */
+	public static final Collection<String> getAllExistingElementTypesIds() {
+		final Collection<String> ids = new TreeSet<String>();
+		for (final IElementType iElementType : getAllExistingElementTypes()) {
+			ids.add(iElementType.getId());
+		}
+		return ids;
+	}
+
+	/**
+	 * Obtains the default client context in which the edit service binds element types.
+	 *
+	 * @return the edit service's default client context, or {@code null} if it is not available in the current installation
+	 */
+	public static IClientContext getDefaultClientContext() {
+		IClientContext result = null;
+
+		try {
+			result = TypeContext.getDefaultContext();
+		} catch (ServiceException e) {
+			Activator.log.error(e);
+		}
+
+		return result;
+
+	}
+
+	/**
+	 * return a boolean about the usage of a GUI for edition of an Element
+	 *
+	 * @param request
+	 *            an edition request
+	 * @return true if the request do not contain information about usage of GUI
+	 */
+	public static boolean useGUI(IEditCommandRequest request) {
+		Object value = request.getParameter(RequestParameterConstants.USE_GUI);
+
+		if (value instanceof Boolean) {
+			return (Boolean) value;
+		} else if (value instanceof String) {
+			Boolean booleanObject = Boolean.valueOf((String) value);
+			return booleanObject.booleanValue();
+		}
+
+		return true; // Default
+	}
+	
+	/**
+	 * return a boolean about the cancellability of a diagram for edition of an Element
+	 *
+	 * @param request
+	 *            an edition request
+	 * @return true if the request do not contain information about cancellability
+	 */
+	public static boolean dialogCancellable(IEditCommandRequest request) {
+		Object value = request.getParameter(RequestParameterConstants.DIALOG_CANCELLABLE);
+
+		if (value instanceof Boolean) {
+			return (Boolean) value;
+		} else if (value instanceof String) {
+			Boolean booleanObject = Boolean.valueOf((String) value);
+			return booleanObject.booleanValue();
+		}
+
+		return false; // Default
+	}
+
+	/**
+	 * Configure a request to specify whether the GUI should be used or not.
+	 *
+	 * If set to false, dialogs shouldn't be opened during the execution of the associated command(s)
+	 *
+	 * @param request
+	 * @param useGUI
+	 */
+	public static void setUseGUI(IEditCommandRequest request, boolean useGUI) {
+		request.setParameter(RequestParameterConstants.USE_GUI, useGUI);
+	}
+	
+	/**
+	 * Configure a request to specify whether the editdialog should be cancellable or not.
+	 *
+	 * If set to false, dialogs shouldn't be cancellable during the execution of the associated command(s)
+	 *
+	 * @param request
+	 * @param dialogCancellable
+	 */
+	public static void setDialogCancellable(IEditCommandRequest request, boolean dialogCancellable) {
+		request.setParameter(RequestParameterConstants.DIALOG_CANCELLABLE, dialogCancellable);
+	}
+
 }
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/utils/RequestCacheEntries.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/utils/RequestCacheEntries.java
index ac17be25214..23bdd98e91d 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/utils/RequestCacheEntries.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/utils/RequestCacheEntries.java
@@ -23,7 +23,7 @@ import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
 
 /**
  * Caching the advices for a given eobject for a given context
@@ -35,7 +35,7 @@ public final class RequestCacheEntries implements IRequestCacheEntries {
 	}
 
 	public static final void initializeEObjCache(EObject eObj, Map map) throws ServiceException {
-		IClientContext clientContext = TypeContext.getContext();
+		IClientContext clientContext = TypeContext.getContext(eObj);
 		map.put(Client_Context, clientContext);
 		IElementType type = ElementTypeRegistry.getInstance().getElementType(
 				eObj, clientContext);
diff --git a/plugins/infra/services/pom.xml b/plugins/infra/services/pom.xml
index efdee69f376..e90463c2ba0 100644
--- a/plugins/infra/services/pom.xml
+++ b/plugins/infra/services/pom.xml
@@ -12,6 +12,7 @@
 	<description>Core services provided by the Papyrus Editor's Service Registry.</description>
 
 	<modules>
+		<module>org.eclipse.papyrus.infra.services.architecture</module>
 		<module>org.eclipse.papyrus.infra.services.controlmode</module>
 		<module>org.eclipse.papyrus.infra.services.controlmode.history</module>
 		<module>org.eclipse.papyrus.infra.services.decoration</module>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/META-INF/MANIFEST.MF b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/META-INF/MANIFEST.MF
index ef5175dfedf..ade836ff670 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/META-INF/MANIFEST.MF
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/META-INF/MANIFEST.MF
@@ -2,7 +2,8 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.services.edit;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
+ org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.architecture;bundle-version="[1.0.0,2.0.0)"
 Export-Package: org.eclipse.papyrus.infra.types.core,
  org.eclipse.papyrus.infra.types.core.extensionpoints,
  org.eclipse.papyrus.infra.types.core.factories,
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/registries/ElementTypeSetConfigurationRegistry.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/registries/ElementTypeSetConfigurationRegistry.java
index d9433ad0423..7286e7f2b7a 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/registries/ElementTypeSetConfigurationRegistry.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/registries/ElementTypeSetConfigurationRegistry.java
@@ -36,15 +36,21 @@ 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.util.Diagnostician;
+import org.eclipse.gmf.runtime.emf.type.core.ClientContext;
 import org.eclipse.gmf.runtime.emf.type.core.ClientContextManager;
 import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
 import org.eclipse.gmf.runtime.emf.type.core.ElementTypeUtil;
 import org.eclipse.gmf.runtime.emf.type.core.IAdviceBindingDescriptor;
 import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.IMetamodelType;
 import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
 import org.eclipse.gmf.runtime.emf.type.core.NullElementType;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureContext;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureDomain;
+import org.eclipse.papyrus.infra.architecture.ArchitectureDomainManager;
+import org.eclipse.papyrus.infra.architecture.ArchitectureDomainMerger;
 import org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration;
 import org.eclipse.papyrus.infra.types.AdviceConfiguration;
 import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
@@ -65,6 +71,9 @@ public class ElementTypeSetConfigurationRegistry {
 
 	private volatile static ElementTypeSetConfigurationRegistry elementTypeSetConfigurationRegistry;
 
+	/** Set of registered client contexts */
+	protected Set<IClientContext> clientContexts = null;
+
 	/** Map of retrieved elementType sets, key is their identifier */
 	protected Map<String, Map<String, ElementTypeSetConfiguration>> elementTypeSetConfigurations = null;
 
@@ -75,8 +84,8 @@ public class ElementTypeSetConfigurationRegistry {
 	/** unique resource set to load all elementType sets models */
 	protected ResourceSet elementTypeSetConfigurationResourceSet = null;
 
-	private ElementTypeSetConfigurationRegistry() {
-		super();
+	protected ElementTypeSetConfigurationRegistry() {
+		listenToArchitectureDomainManager();
 	}
 
 	/**
@@ -100,10 +109,12 @@ public class ElementTypeSetConfigurationRegistry {
 		elementTypeSetConfigurationResourceSet = null;
 		elementTypeSetConfigurations = new HashMap<String, Map<String, ElementTypeSetConfiguration>>();
 		advicesDeps = new HashMap<String, Map<String, OrientedGraph<String>>>();
+		clientContexts = new HashSet<IClientContext>();
 		// 1. creates the resource set
 		elementTypeSetConfigurationResourceSet = createResourceSet();
 		// 2. creates the list only when registry is acceded for the first time,
 		Map<String, Set<ElementTypeSetConfiguration>> elementTypeSetConfigurationsToLoad = readElementTypeSetConfigurationModelsFromExtensionPoints();
+		readElementTypeSetConfigurationModelsFromArchitectureDomainManager(elementTypeSetConfigurationsToLoad);
 		// Try to load all elementType set definitions
 		for (String contexId : elementTypeSetConfigurationsToLoad.keySet()) {
 			loadElementTypeSetConfigurations(contexId, elementTypeSetConfigurationsToLoad.get(contexId));
@@ -111,12 +122,8 @@ public class ElementTypeSetConfigurationRegistry {
 
 	}
 
-
 	protected Map<String, Set<ElementTypeSetConfiguration>> readElementTypeSetConfigurationModels() {
 		Map<String, Set<ElementTypeSetConfiguration>> elementTypeSetConfigurations = new HashMap<String, Set<ElementTypeSetConfiguration>>();
-
-
-
 		return elementTypeSetConfigurations;
 	}
 
@@ -129,14 +136,20 @@ public class ElementTypeSetConfigurationRegistry {
 		}
 
 		for (String contextId : elementTypeSetConfigurations.keySet()) {
-			for (String elementTypeSetId : elementTypeSetConfigurations.get(contextId).keySet()) {
+			for (String elementTypeSetId : new HashSet<String>(elementTypeSetConfigurations.get(contextId).keySet())) {
 				unload(contextId, elementTypeSetId);
 			}
 
 		}
+		
+		for (IClientContext clientContext : clientContexts) {
+			ClientContextManager.getInstance().deregisterClientContext(clientContext);
+		}
+		
 		elementTypeSetConfigurationResourceSet = createResourceSet();
 		elementTypeSetConfigurations.clear();
 		advicesDeps.clear();
+		clientContexts.clear();
 	}
 
 	/**
@@ -253,17 +266,23 @@ public class ElementTypeSetConfigurationRegistry {
 
 	}
 
-	public boolean loadElementTypeSetConfigurations(String contexId, Collection<ElementTypeSetConfiguration> elementTypeSetConfigurationsToRegister) {
+	public boolean loadElementTypeSetConfigurations(String contextId, Collection<ElementTypeSetConfiguration> elementTypeSetConfigurationsToRegister) {
 
-		if (contexId == null) {
+		if (contextId == null) {
 			Activator.log.warn("contexId must not be null. Loading aborted. ");
 			return false;
 		}
 
-		IClientContext context = ClientContextManager.getInstance().getClientContext(contexId);
+		IClientContext context = ClientContextManager.getInstance().getClientContext(contextId);
 		if (context == null) {
-			Activator.log.warn("contexId couldn't be found. Loading aborted: " + contexId);
-			return false;
+			context = new ClientContext(contextId, new IElementMatcher() {
+				@Override
+				public boolean matches(EObject eObject) {
+					return true;
+				}
+			});
+			ClientContextManager.getInstance().registerClientContext(context);
+			clientContexts.add(context);
 		}
 
 		Map<String, ElementTypeConfiguration> elementTypeConfigurationsDefinitions = new HashMap<String, ElementTypeConfiguration>();
@@ -304,8 +323,8 @@ public class ElementTypeSetConfigurationRegistry {
 		// Check there is no cyclic dependencies among elementTypes introduced by this loading
 		HashSet<ElementTypeConfiguration> elementTypesToCheck = new HashSet<ElementTypeConfiguration>();
 		// The old ones already registered
-		if (elementTypeSetConfigurations.containsKey(contexId)) {
-			for (ElementTypeSetConfiguration elementTypeSetConfiguration : elementTypeSetConfigurations.get(contexId).values()) {
+		if (elementTypeSetConfigurations.containsKey(contextId)) {
+			for (ElementTypeSetConfiguration elementTypeSetConfiguration : elementTypeSetConfigurations.get(contextId).values()) {
 				elementTypesToCheck.addAll(elementTypeSetConfiguration.getElementTypeConfigurations());
 			}
 		}
@@ -322,8 +341,8 @@ public class ElementTypeSetConfigurationRegistry {
 		// Collect all advicesconfiguration
 		HashSet<AdviceConfiguration> adviceToCheck = new HashSet<AdviceConfiguration>();
 		// The old ones already registered
-		if (elementTypeSetConfigurations.containsKey(contexId)) {
-			for (ElementTypeSetConfiguration elementTypeSetConfiguration : elementTypeSetConfigurations.get(contexId).values()) {
+		if (elementTypeSetConfigurations.containsKey(contextId)) {
+			for (ElementTypeSetConfiguration elementTypeSetConfiguration : elementTypeSetConfigurations.get(contextId).values()) {
 				TreeIterator<EObject> it = elementTypeSetConfiguration.eAllContents();
 				while (it.hasNext()) {
 					EObject element = (EObject) it.next();
@@ -358,10 +377,10 @@ public class ElementTypeSetConfigurationRegistry {
 
 		// If we reached that point, we should be able to register safely the none already registered elementTypeSets
 		for (ElementTypeSetConfiguration elementTypeSetConfiguration : registrableElementTypeSetConfiguration) {
-			if (!elementTypeSetConfigurations.containsKey(contexId)) {
-				elementTypeSetConfigurations.put(contexId, new HashMap<String, ElementTypeSetConfiguration>());
+			if (!elementTypeSetConfigurations.containsKey(contextId)) {
+				elementTypeSetConfigurations.put(contextId, new HashMap<String, ElementTypeSetConfiguration>());
 			}
-			elementTypeSetConfigurations.get(contexId).put(elementTypeSetConfiguration.getIdentifier(), elementTypeSetConfiguration);
+			elementTypeSetConfigurations.get(contextId).put(elementTypeSetConfiguration.getIdentifier(), elementTypeSetConfiguration);
 		}
 
 		// New ElementTypesConfigurations can be registered
@@ -384,7 +403,7 @@ public class ElementTypeSetConfigurationRegistry {
 		}
 
 		// Store the advicesDependencies
-		advicesDeps.put(contexId, deps);
+		advicesDeps.put(contextId, deps);
 
 		return true;
 	}
@@ -499,6 +518,29 @@ public class ElementTypeSetConfigurationRegistry {
 		return existingDefinitions;
 	}
 
+	protected void readElementTypeSetConfigurationModelsFromArchitectureDomainManager(Map<String, Set<ElementTypeSetConfiguration>> map) {
+		ArchitectureDomainMerger merger = ArchitectureDomainManager.getInstance().getMerger();
+		for (MergedArchitectureDomain domain : merger.getDomains()) {
+			for (MergedArchitectureContext context : domain.getContexts()) {
+				Set<ElementTypeSetConfiguration> set = map.get(context.getId());
+				if (set == null)
+					map.put(context.getId(), set = new HashSet<ElementTypeSetConfiguration>());
+				set.addAll(context.getElementTypes());
+			}
+		}
+	}
+
+	protected void listenToArchitectureDomainManager() {
+		ArchitectureDomainManager manager = ArchitectureDomainManager.getInstance();
+		manager.addListener(new ArchitectureDomainManager.Listener() {
+			@Override
+			public void domainManagerChanged() {
+				dispose();
+				init();
+			}
+		});
+	}
+	
 	protected boolean containsElementTypeSet(Set<ElementTypeSetConfiguration> elementTypeSets, String elementTypeSetConfigurationId) {
 		if (elementTypeSets == null) {
 			return false;
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/plugin.xml b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/plugin.xml
index bda57118a85..a3887ad26ca 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/plugin.xml
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/plugin.xml
@@ -1,54 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension-point id="ruleKind" name="Rule Extension Point" schema="schema/ruleKind.exsd"/>

-

-

-   <extension point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">

-      <elementTypeSet

-            clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"

-            path="model/rulebased.elementtypesconfigurations">

-      </elementTypeSet>

-   </extension>

-   <extension point="org.eclipse.papyrus.infra.types.core.elementTypeConfigurationKind">

-      <elementTypeConfigurationKind

-            configurationClass="org.eclipse.papyrus.infra.types.rulebased.RuleBasedTypeConfiguration"

-            factoryClass="org.eclipse.papyrus.infra.types.rulebased.core.RuleElementTypeFactory">

-      </elementTypeConfigurationKind>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated RuleBased -->

-      <package

-            uri="http://www.eclipse.org/papyrus/infra/types/rulebased/1.1"

-            class="org.eclipse.papyrus.infra.types.rulebased.RuleBasedPackage"

-            genModel="model/RuleBased.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.extension_parser">

-      <!-- @generated RuleBased -->

-      <parser

-            type="rulebased"

-            class="org.eclipse.papyrus.infra.types.rulebased.util.RuleBasedResourceFactoryImpl"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated RuleBased -->

-      <factory

-            uri="http://www.eclipse.org/papyrus/infra/types/rulebased/1.1"

-            class="org.eclipse.papyrus.infra.types.rulebased.provider.RuleBasedItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.edit.childCreationExtenders">

-      <!-- @generated RuleBased -->

-      <extender

-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2"

-            class="org.eclipse.papyrus.infra.types.rulebased.provider.RuleBasedItemProviderAdapterFactory$ElementTypesConfigurationsChildCreationExtender"/>

-   </extension>

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension-point id="ruleKind" name="Rule Extension Point" schema="schema/ruleKind.exsd"/>
+
+
+   <extension point="org.eclipse.papyrus.infra.types.core.elementTypeConfigurationKind">
+      <elementTypeConfigurationKind
+            configurationClass="org.eclipse.papyrus.infra.types.rulebased.RuleBasedTypeConfiguration"
+            factoryClass="org.eclipse.papyrus.infra.types.rulebased.core.RuleElementTypeFactory">
+      </elementTypeConfigurationKind>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated RuleBased -->
+      <package
+            uri="http://www.eclipse.org/papyrus/infra/types/rulebased/1.1"
+            class="org.eclipse.papyrus.infra.types.rulebased.RuleBasedPackage"
+            genModel="model/RuleBased.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.extension_parser">
+      <!-- @generated RuleBased -->
+      <parser
+            type="rulebased"
+            class="org.eclipse.papyrus.infra.types.rulebased.util.RuleBasedResourceFactoryImpl"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated RuleBased -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/infra/types/rulebased/1.1"
+            class="org.eclipse.papyrus.infra.types.rulebased.provider.RuleBasedItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.edit.childCreationExtenders">
+      <!-- @generated RuleBased -->
+      <extender
+            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2"
+            class="org.eclipse.papyrus.infra.types.rulebased.provider.RuleBasedItemProviderAdapterFactory$ElementTypesConfigurationsChildCreationExtender"/>
+   </extension>
+</plugin>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel b/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel
index 78f01d33e4e..8f3f2910fe0 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel
@@ -39,8 +39,8 @@
     </genClasses>
     <genClasses image="false" ecoreClass="ElementTypesConfigurations.ecore#//AbstractMatcherConfiguration"/>
     <genClasses image="false" ecoreClass="ElementTypesConfigurations.ecore#//AdviceConfiguration">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//AdviceConfiguration/before"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//AdviceConfiguration/after"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//AdviceConfiguration/before"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//AdviceConfiguration/after"/>
     </genClasses>
     <genClasses image="false" ecoreClass="ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration/target"/>
@@ -49,10 +49,10 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration/inheritance"/>
     </genClasses>
     <genClasses ecoreClass="ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/specializedTypesID"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/editHelperAdviceConfiguration"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/containerConfiguration"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/matcherConfiguration"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/specializedTypes"/>
     </genClasses>
     <genClasses ecoreClass="ElementTypesConfigurations.ecore#//ContainerConfiguration">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//ContainerConfiguration/containerMatcherConfiguration"/>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/.classpath b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/.classpath
index 2d1a4302f04..22f30643cba 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/.classpath
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/.classpath
@@ -1,7 +1,7 @@
-<?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="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/.project b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/.project
new file mode 100644
index 00000000000..4a60469d860
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.ui.architecture</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.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..dba7daad09d
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/META-INF/MANIFEST.MF
@@ -0,0 +1,26 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.infra.ui.architecture;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Activator: org.eclipse.papyrus.infra.ui.architecture.ArchitectureUIPlugin$Implementation
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.papyrus.infra.ui.architecture,
+ org.eclipse.papyrus.infra.ui.architecture.widgets
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources;visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
+ org.eclipse.emf.edit.ui;visibility:=reexport,
+ org.eclipse.ui.ide;visibility:=reexport,
+ org.eclipse.papyrus.infra.types.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.architecture;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.core.architecture.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.architecture.representation.edit;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="2.2.0",
+ org.eclipse.papyrus.infra.ui;bundle-version="2.0.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="3.0.0",
+ org.eclipse.papyrus.infra.nattable.common;bundle-version="3.0.0"
+Bundle-ActivationPolicy: lazy
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/about.html b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/about.html
new file mode 100644
index 00000000000..bbf2bd6aac7
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/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>January 30, 2017</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/infra/ui/org.eclipse.papyrus.infra.ui.architecture/build.properties b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/build.properties
new file mode 100644
index 00000000000..d9800df7f61
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/build.properties
@@ -0,0 +1,20 @@
+# Copyright (c) 2016 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:
+#  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+#  
+# 
+
+bin.includes = .,\
+               icons/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties
+jars.compile.order = .
+source.. = src/
+output.. = bin
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/icons/full/obj16/ArchitectureContext.gif b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/icons/full/obj16/ArchitectureContext.gif
new file mode 100755
index 00000000000..1c1f316b177
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/icons/full/obj16/ArchitectureContext.gif
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/icons/full/obj16/ExpansionmodelModelFile.gif b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/icons/full/obj16/ArchitectureModelFile.gif
index c4edfc0c55b..1ae5c0695d9 100644
--- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/icons/full/obj16/ExpansionmodelModelFile.gif
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/icons/full/obj16/ArchitectureModelFile.gif
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/icons/full/obj16/ArchitectureViewpoint.gif b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/icons/full/obj16/ArchitectureViewpoint.gif
new file mode 100755
index 00000000000..1c1f316b177
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/icons/full/obj16/ArchitectureViewpoint.gif
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/icons/full/wizban/NewArchitecture.gif b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/icons/full/wizban/NewArchitecture.gif
new file mode 100644
index 00000000000..36775a51305
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/icons/full/wizban/NewArchitecture.gif
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/plugin.properties b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/plugin.properties
index a6f2918d1e8..80ebaecd936 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/plugin.properties
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/plugin.properties
@@ -1,65 +1,65 @@
-##########################################################################################

-# Copyright (c) 2013 CEA LIST.

-# 

-#     

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#  Laurent Wouters (CEA LIST) laurent.wouters@cea.fr - Initial API and implementation

-#

-########################################################################################

-

-pluginName = Papyrus Viewpoints Configuration - Editor

-providerName = Eclipse Modeling Project

-

-_UI_ConfigurationEditor_menu = &Configuration Editor

-

-_UI_CreateChild_menu_item = &New Child

-_UI_CreateSibling_menu_item = N&ew Sibling

-

-_UI_ShowPropertiesView_menu_item = Show &Properties View

-_UI_RefreshViewer_menu_item = &Refresh

-

-_UI_SelectionPage_label = Selection

-_UI_ParentPage_label = Parent

-_UI_ListPage_label = List

-_UI_TreePage_label = Tree

-_UI_TablePage_label = Table

-_UI_TreeWithColumnsPage_label = Tree with Columns

-_UI_ObjectColumn_label = Object

-_UI_SelfColumn_label = Self

-

-_UI_NoObjectSelected = Selected Nothing

-_UI_SingleObjectSelected = Selected Object: {0}

-_UI_MultiObjectSelected = Selected {0} Objects

-

-_UI_OpenEditorError_label = Open Editor

-

-_UI_Wizard_category = Papyrus

-

-_UI_CreateModelError_message = Problems encountered in file "{0}"

-

-_UI_ConfigurationModelWizard_label = Viewpoints configuration

-_UI_ConfigurationModelWizard_description = Create a new viewpoints configuration model

-

-_UI_ConfigurationEditor_label = Viewpoints Configuration Model Editor

-

-_UI_ConfigurationEditorFilenameDefaultBase = My

-_UI_ConfigurationEditorFilenameExtensions = configuration

-

-_UI_Wizard_label = New

-

-_WARN_FilenameExtension = The file name must end in ''.{0}''

-_WARN_FilenameExtensions = The file name must have one of the following extensions: {0}

-

-_UI_ModelObject = &Model Object

-_UI_XMLEncoding = &XML Encoding

-_UI_XMLEncodingChoices = UTF-8 ASCII UTF-16 UTF-16BE UTF-16LE ISO-8859-1

-_UI_Wizard_initial_object_description = Select a model object to create

-

-_UI_FileConflict_label = File Conflict

-_WARN_FileConflict = There are unsaved changes that conflict with changes made outside the editor.  Do you wish to discard this editor's changes?

-

+# Copyright (c) 2016 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:
+#  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+#  
+# 
+
+pluginName = Architecture UI
+providerName = Eclipse Modeling Project
+
+_UI_ArchitectureEditor_menu = &Architecture Editor
+
+_UI_CreateChild_menu_item = &New Child
+_UI_CreateSibling_menu_item = N&ew Sibling
+
+_UI_ShowPropertiesView_menu_item = Show &Properties View
+_UI_RefreshViewer_menu_item = &Refresh
+
+_UI_SelectionPage_label = Selection
+_UI_ParentPage_label = Parent
+_UI_ListPage_label = List
+_UI_TreePage_label = Tree
+_UI_TablePage_label = Table
+_UI_TreeWithColumnsPage_label = Tree with Columns
+_UI_ObjectColumn_label = Object
+_UI_SelfColumn_label = Self
+
+_UI_NoObjectSelected = Selected Nothing
+_UI_SingleObjectSelected = Selected Object: {0}
+_UI_MultiObjectSelected = Selected {0} Objects
+
+_UI_OpenEditorError_label = Open Editor
+
+_UI_Wizard_category = Example EMF Model Creation Wizards
+
+_UI_CreateModelError_message = Problems encountered in file "{0}"
+
+_UI_ArchitectureModelWizard_label = Architecture Model
+_UI_ArchitectureModelWizard_description = Create a new Architecture model
+
+_UI_ArchitectureEditor_label = Architecture Model Editor
+
+_UI_ArchitectureEditorFilenameDefaultBase = My
+_UI_ArchitectureEditorFilenameExtensions = architecture
+
+_UI_Wizard_label = New
+
+_WARN_FilenameExtension = The file name must end in ''.{0}''
+_WARN_FilenameExtensions = The file name must have one of the following extensions: {0}
+
+_UI_ModelObject = &Model Object
+_UI_XMLEncoding = &XML Encoding
+_UI_XMLEncodingChoices = UTF-8 ASCII UTF-16 UTF-16BE UTF-16LE ISO-8859-1
+_UI_Wizard_initial_object_description = Select a model object to create
+
+_UI_FileConflict_label = File Conflict
+_WARN_FileConflict = There are unsaved changes that conflict with changes made outside the editor.  Do you wish to discard this editor's changes?
+
+Switch_Architecture_Context = Switch Architecture Context...
+Switch_Architecture_Viewpoints = Switch Architecture Viewpoints
\ No newline at end of file
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/plugin.xml b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/plugin.xml
new file mode 100644
index 00000000000..b054f1d1de6
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/plugin.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+ Copyright (c) 2016 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:
+  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+  
+ 
+-->
+
+<plugin>
+
+   <extension point="org.eclipse.ui.newWizards">
+      <!-- @generated Architecture -->
+      <category
+            id="org.eclipse.emf.ecore.Wizard.category.ID"
+            name="%_UI_Wizard_category"/>
+      <wizard
+            id="org.eclipse.papyrus.infra.ui.architecture.ArchitectureModelWizardID"
+            name="%_UI_ArchitectureModelWizard_label"
+            class="org.eclipse.papyrus.infra.ui.architecture.editor.ArchitectureModelWizard"
+            category="org.eclipse.papyrus.wizards.category"
+            icon="icons/full/obj16/ArchitectureModelFile.gif">
+         <description>%_UI_ArchitectureModelWizard_description</description>
+         <selection class="org.eclipse.core.resources.IResource"/>
+      </wizard>
+   </extension>
+
+   <extension point="org.eclipse.ui.editors">
+      <!-- @generated Architecture -->
+      <editor
+            id="org.eclipse.papyrus.infra.ui.architecture.ArchitectureEditorID"
+            name="%_UI_ArchitectureEditor_label"
+            icon="icons/full/obj16/ArchitectureModelFile.gif"
+            extensions="architecture"
+            class="org.eclipse.papyrus.infra.ui.architecture.editor.ArchitectureEditor"
+            contributorClass="org.eclipse.papyrus.infra.ui.architecture.editor.ArchitectureActionBarContributor">
+      </editor>
+   </extension>
+
+   <extension
+         point="org.eclipse.ui.preferencePages">
+      <page
+            category="org.eclipse.papyrus.infra.core.sasheditor.preferences.generalcategory"
+            class="org.eclipse.papyrus.infra.ui.architecture.preferences.ArchitectureContextPreferencePage"
+            id="org.eclipse.papyrus.infra.ui.architecture.preferences.ArchitecturesPreferencePage"
+            name="Architecture Contexts">
+      </page>
+   </extension>
+   
+   <extension
+        point="org.eclipse.ui.commands">
+	  <command
+	        defaultHandler="org.eclipse.papyrus.infra.ui.architecture.handlers.ChangeArchitectureContextHandler"
+	        id="org.eclipse.papyrus.infra.ui.architecture.commands.ChangeArchitectureContext"
+	        name="Change Architecture Context">
+	  </command>
+   </extension>
+ 
+   <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+          allPopups="false"
+          locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup?before=newelements">
+	    <separator
+	          name="architecture"
+	          visible="true">
+	    </separator>
+        <command
+              commandId="org.eclipse.papyrus.infra.ui.architecture.commands.ChangeArchitectureContext"
+              icon="icons/full/obj16/ArchitectureContext.gif"
+              id="org.eclipse.papyrus.infra.ui.architecture.commands.ChangeArchitectureContext"
+              label="%Switch_Architecture_Context"
+              mnemonic="C"
+              style="push">
+           <visibleWhen
+                checkEnabled="false">
+             <with
+                   variable="selection">
+                <iterate
+                      ifEmpty="false"
+                      operator="and">
+                   <adapt
+                         type="org.eclipse.emf.ecore.EObject">
+                   </adapt>
+                </iterate>
+             </with>
+           </visibleWhen>
+        </command>
+        <menu
+              icon="icons/full/obj16/ArchitectureViewpoint.gif"
+              id="org.eclipse.papyrus.infra.ui.architecture.menus.ChangeArchitectureViewpoints"
+              label="%Switch_Architecture_Viewpoints">
+          <dynamic
+               class="org.eclipse.papyrus.infra.ui.architecture.handlers.ChangeArchitectureViewpointsHandler"
+               id="org.eclipse.papyrus.infra.ui.architecture.menus.ChangeArchitectureViewpoints">
+          </dynamic>
+        </menu>
+     </menuContribution>
+   </extension>   
+
+   <extension point="org.eclipse.ui.navigator.navigatorContent">
+      <commonFilter
+            activeByDefault="true"
+            description="Filters diagrams/tables that are unsupported by the selected viewpoints in the Papyrus model"
+            class="org.eclipse.papyrus.infra.ui.architecture.navigator.ViewpointFilter"
+            id="org.eclipse.papyrus.infra.ui.architecture.viewpointFilter"
+            name="Unsupported Diagrams/Tables"
+            visibleInUI="true">
+      </commonFilter>
+   </extension>   
+
+   <extension
+         point="org.eclipse.ui.navigator.viewer">
+      <viewerContentBinding
+            viewerId="org.eclipse.papyrus.views.modelexplorer.modelexplorer">
+         <includes>
+            <contentExtension
+                  pattern="org.eclipse.papyrus.infra.ui.architecture.*">
+            </contentExtension>
+         </includes>
+      </viewerContentBinding>
+   </extension>
+    
+</plugin>
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/pom.xml b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/pom.xml
new file mode 100644
index 00000000000..06fa013a04e
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-ui</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.ui.architecture</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/ArchitectureUIPlugin.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/ArchitectureUIPlugin.java
new file mode 100644
index 00000000000..669fd4990b6
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/ArchitectureUIPlugin.java
@@ -0,0 +1,85 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.ui.architecture;
+
+import org.eclipse.emf.common.EMFPlugin;
+
+import org.eclipse.emf.common.ui.EclipseUIPlugin;
+
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.eclipse.papyrus.infra.types.provider.TypesConfigurationsEditPlugin;
+
+/**
+ * This is the central singleton for the Architecture UI plugin.
+ */
+public final class ArchitectureUIPlugin extends EMFPlugin {
+	/**
+	 * Keep track of the singleton.
+	 */
+	public static final ArchitectureUIPlugin INSTANCE = new ArchitectureUIPlugin();
+	
+	/**
+	 * Keep track of the singleton.
+	 */
+	private static Implementation plugin;
+
+	/** Logging helper */
+	public static LogHelper log;
+
+	/**
+	 * Create the instance.
+	 */
+	public ArchitectureUIPlugin() {
+		super
+			(new ResourceLocator [] {
+				TypesConfigurationsEditPlugin.INSTANCE,
+			});
+	}
+
+	/**
+	 * Returns the singleton instance of the Eclipse plugin.
+	 * @return the singleton instance.
+	 */
+	@Override
+	public ResourceLocator getPluginResourceLocator() {
+		return plugin;
+	}
+	
+	/**
+	 * Returns the singleton instance of the Eclipse plugin.
+	 * @return the singleton instance.
+	 */
+	public static Implementation getPlugin() {
+		return plugin;
+	}
+	
+	/**
+	 * The actual implementation of the Eclipse <b>Plugin</b>.
+	 */
+	public static class Implementation extends EclipseUIPlugin {
+		/**
+		 * Creates an instance.
+		 */
+		public Implementation() {
+			super();
+	
+			// Remember the static instance.
+			//
+			plugin = this;
+			log = new LogHelper(this);
+		}
+	}
+
+}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/presentation/ConfigurationActionBarContributor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/editor/ArchitectureActionBarContributor.java
index fd86c912100..9d756bac45f 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/presentation/ConfigurationActionBarContributor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/editor/ArchitectureActionBarContributor.java
@@ -1,30 +1,33 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.viewpoints.configuration.presentation;
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.ui.architecture.editor;
 
 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;
@@ -36,55 +39,47 @@ 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.papyrus.infra.ui.architecture.ArchitectureUIPlugin;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.PartInitException;
 
 /**
- * This is the action bar contributor for the Configuration model editor.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
+ * This is the action bar contributor for the Architecture model editor.
+ * 
+ * @since 1.0
  */
-public class ConfigurationActionBarContributor
-		extends EditingDomainActionBarContributor
-		implements ISelectionChangedListener {
+public class ArchitectureActionBarContributor
+	extends EditingDomainActionBarContributor
+	implements ISelectionChangedListener {
 	/**
 	 * This keeps track of the active editor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	protected IEditorPart activeEditorPart;
 
 	/**
 	 * This keeps track of the current selection provider.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	protected ISelectionProvider selectionProvider;
 
 	/**
 	 * This action opens the Properties view.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	protected IAction showPropertiesViewAction =
-			new Action(ConfigurationEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) {
+		new Action(ArchitectureUIPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) {
 			@Override
 			public void run() {
 				try {
 					getPage().showView("org.eclipse.ui.views.PropertySheet");
 				}
 				catch (PartInitException exception) {
-					ConfigurationEditorPlugin.INSTANCE.log(exception);
+					ArchitectureUIPlugin.INSTANCE.log(exception);
 				}
 			}
 		};
@@ -92,12 +87,9 @@ public class ConfigurationActionBarContributor
 	/**
 	 * 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(ConfigurationEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) {
+		new Action(ArchitectureUIPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) {
 			@Override
 			public boolean isEnabled() {
 				return activeEditorPart instanceof IViewerProvider;
@@ -117,44 +109,29 @@ public class ConfigurationActionBarContributor
 	/**
 	 * 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;
 
 	/**
 	 * 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;
 
 	/**
 	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
 	 * generated for the current selection by the item provider.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	protected Collection<IAction> createSiblingActions;
 
 	/**
 	 * 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;
 
 	/**
 	 * This creates an instance of the contributor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
-	public ConfigurationActionBarContributor() {
+	public ArchitectureActionBarContributor() {
 		super(ADDITIONS_LAST_STYLE);
 		loadResourceAction = new LoadResourceAction();
 		validateAction = new ValidateAction();
@@ -163,28 +140,22 @@ public class ConfigurationActionBarContributor
 
 	/**
 	 * This adds Separators for editor additions to the tool bar.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	@Override
 	public void contributeToToolBar(IToolBarManager toolBarManager) {
-		toolBarManager.add(new Separator("configuration-settings"));
-		toolBarManager.add(new Separator("configuration-additions"));
+		toolBarManager.add(new Separator("architecture-settings"));
+		toolBarManager.add(new Separator("architecture-additions"));
 	}
 
 	/**
 	 * This adds to the menu bar a menu and some separators for editor additions,
 	 * as well as the sub-menus for object creation items.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	@Override
 	public void contributeToMenu(IMenuManager menuManager) {
 		super.contributeToMenu(menuManager);
 
-		IMenuManager submenuManager = new MenuManager(ConfigurationEditorPlugin.INSTANCE.getString("_UI_ConfigurationEditor_menu"), "org.eclipse.papyrus.infra.viewpoints.configurationMenuID");
+		IMenuManager submenuManager = new MenuManager(ArchitectureUIPlugin.INSTANCE.getString("_UI_ArchitectureEditor_menu"), "org.eclipse.papyrus.infra.ui.architecture.menuID");
 		menuManager.insertAfter("additions", submenuManager);
 		submenuManager.add(new Separator("settings"));
 		submenuManager.add(new Separator("actions"));
@@ -193,12 +164,12 @@ public class ConfigurationActionBarContributor
 
 		// Prepare for CreateChild item addition or removal.
 		//
-		createChildMenuManager = new MenuManager(ConfigurationEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
+		createChildMenuManager = new MenuManager(ArchitectureUIPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
 		submenuManager.insertBefore("additions", createChildMenuManager);
 
 		// Prepare for CreateSibling item addition or removal.
 		//
-		createSiblingMenuManager = new MenuManager(ConfigurationEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
+		createSiblingMenuManager = new MenuManager(ArchitectureUIPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
 		submenuManager.insertBefore("additions", createSiblingMenuManager);
 
 		// Force an update because Eclipse hides empty menus now.
@@ -215,9 +186,6 @@ public class ConfigurationActionBarContributor
 
 	/**
 	 * 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
 	public void setActiveEditor(IEditorPart part) {
@@ -248,9 +216,6 @@ public class ConfigurationActionBarContributor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
 	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
 	 * 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.
@@ -295,9 +260,6 @@ public class ConfigurationActionBarContributor
 	/**
 	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
 	 * 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>();
@@ -312,9 +274,6 @@ public class ConfigurationActionBarContributor
 	/**
 	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
 	 * 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>();
@@ -331,9 +290,6 @@ public class ConfigurationActionBarContributor
 	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
 	 * by inserting them before the specified contribution item <code>contributionID</code>.
 	 * 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) {
@@ -347,13 +303,10 @@ public class ConfigurationActionBarContributor
 			}
 		}
 	}
-
+		
 	/**
 	 * 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) {
@@ -380,29 +333,23 @@ public class ConfigurationActionBarContributor
 
 	/**
 	 * This populates the pop-up menu before it appears.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	@Override
 	public void menuAboutToShow(IMenuManager menuManager) {
 		super.menuAboutToShow(menuManager);
 		MenuManager submenuManager = null;
 
-		submenuManager = new MenuManager(ConfigurationEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
+		submenuManager = new MenuManager(ArchitectureUIPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
 		populateManager(submenuManager, createChildActions, null);
 		menuManager.insertBefore("edit", submenuManager);
 
-		submenuManager = new MenuManager(ConfigurationEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
+		submenuManager = new MenuManager(ArchitectureUIPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
 		populateManager(submenuManager, createSiblingActions, null);
 		menuManager.insertBefore("edit", submenuManager);
 	}
 
 	/**
 	 * This inserts global actions before the "additions-end" separator.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	@Override
 	protected void addGlobalActions(IMenuManager menuManager) {
@@ -417,9 +364,6 @@ public class ConfigurationActionBarContributor
 
 	/**
 	 * This ensures that a delete action will clean up all references to deleted objects.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	@Override
 	protected boolean removeAllReferencesOnDelete() {
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/presentation/ConfigurationEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/editor/ArchitectureEditor.java
index 687da4dd3b9..48bbd71b8b7 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/presentation/ConfigurationEditor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/editor/ArchitectureEditor.java
@@ -1,17 +1,17 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.viewpoints.configuration.presentation;
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.ui.architecture.editor;
 
 
 import java.io.IOException;
@@ -25,6 +25,7 @@ import java.util.Iterator;
 import java.util.LinkedHashMap;
 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;
@@ -50,8 +51,6 @@ 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.papyrus.infra.constraints.environment.provider.EnvironmentItemProviderAdapterFactory;
-import org.eclipse.papyrus.infra.constraints.provider.ConstraintsItemProviderAdapterFactory;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.util.EContentAdapter;
@@ -96,8 +95,10 @@ import org.eclipse.jface.viewers.TableLayout;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.papyrus.infra.viewpoints.configuration.provider.ConfigurationItemProviderAdapterFactory;
-import org.eclipse.papyrus.infra.viewpoints.iso42010.provider.Iso42010ItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.core.architecture.provider.ArchitectureItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.architecture.representation.provider.RepresentationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.ui.architecture.ArchitectureUIPlugin;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.dnd.DND;
@@ -134,185 +135,127 @@ import org.eclipse.ui.views.properties.PropertySheetPage;
 
 
 /**
- * This is an example of a Configuration model editor.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
+ * This is the Architecture model editor.
+ * 
+ * @since 1.0
  */
-public class ConfigurationEditor
-		extends MultiPageEditorPart
-		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
+public class ArchitectureEditor
+	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;
 
 	/**
 	 * This is the one adapter factory used for providing views of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	protected ComposedAdapterFactory adapterFactory;
 
 	/**
 	 * This is the content outline page.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	protected IContentOutlinePage contentOutlinePage;
 
 	/**
 	 * This is a kludge...
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	protected IStatusLineManager contentOutlineStatusLineManager;
 
 	/**
 	 * This is the content outline page's viewer.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	protected TreeViewer contentOutlineViewer;
 
 	/**
 	 * This is the property sheet page.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
 
 	/**
 	 * This is the viewer that shadows the selection in the content outline.
 	 * The parent relation must be correctly defined for this to work.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	protected TreeViewer selectionViewer;
 
 	/**
 	 * 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;
 
 	/**
 	 * This shows how a tree view works.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	protected TreeViewer treeViewer;
 
 	/**
 	 * This shows how a list view works.
 	 * A list viewer doesn't support icons.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	protected ListViewer listViewer;
 
 	/**
 	 * This shows how a table view works.
 	 * A table can be used as a list with icons.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	protected TableViewer tableViewer;
 
 	/**
 	 * This shows how a tree view with columns works.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	protected TreeViewer treeViewerWithColumns;
 
 	/**
 	 * This keeps track of the active viewer pane, in the book.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	protected ViewerPane currentViewerPane;
 
 	/**
 	 * 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;
 
 	/**
 	 * This listens to which ever viewer is active.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	protected ISelectionChangedListener selectionChangedListener;
 
 	/**
 	 * 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>();
 
 	/**
 	 * This keeps track of the selection of the editor as a whole.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	protected ISelection editorSelection = StructuredSelection.EMPTY;
 
 	/**
 	 * The MarkerHelper is responsible for creating workspace resource markers presented
 	 * in Eclipse's Problems View.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
 
 	/**
 	 * This listens for when the outline becomes active
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	protected IPartListener partListener =
-			new IPartListener() {
+		new IPartListener() {
 			public void partActivated(IWorkbenchPart p) {
 				if (p instanceof ContentOutline) {
 					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {
-						getActionBarContributor().setActiveEditor(ConfigurationEditor.this);
+						getActionBarContributor().setActiveEditor(ArchitectureEditor.this);
 
 						setCurrentViewer(contentOutlineViewer);
 					}
 				}
 				else if (p instanceof PropertySheet) {
 					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {
-						getActionBarContributor().setActiveEditor(ConfigurationEditor.this);
+						getActionBarContributor().setActiveEditor(ArchitectureEditor.this);
 						handleActivate();
 					}
 				}
-				else if (p == ConfigurationEditor.this) {
+				else if (p == ArchitectureEditor.this) {
 					handleActivate();
 				}
 			}
@@ -332,52 +275,34 @@ public class ConfigurationEditor
 
 	/**
 	 * Resources that have been removed since last activation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	protected Collection<Resource> removedResources = new ArrayList<Resource>();
 
 	/**
 	 * Resources that have been changed since last activation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	protected Collection<Resource> changedResources = new ArrayList<Resource>();
 
 	/**
 	 * Resources that have been saved.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	protected Collection<Resource> savedResources = new ArrayList<Resource>();
 
 	/**
 	 * 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>();
 
 	/**
 	 * Controls whether the problem indication should be updated.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	protected boolean updateProblemIndication = true;
 
 	/**
 	 * Adapter used to update the problem indication when resources are demanded loaded.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	protected EContentAdapter problemIndicationAdapter =
-			new EContentAdapter() {
+		new EContentAdapter() {
 			@Override
 			public void notifyChanged(Notification notification) {
 				if (notification.getNotifier() instanceof Resource) {
@@ -433,12 +358,9 @@ public class ConfigurationEditor
 
 	/**
 	 * This listens for workspace changes.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	protected IResourceChangeListener resourceChangeListener =
-			new IResourceChangeListener() {
+		new IResourceChangeListener() {
 			public void resourceChanged(IResourceChangeEvent event) {
 				IResourceDelta delta = event.getDelta();
 				try {
@@ -485,7 +407,7 @@ public class ConfigurationEditor
 								 public void run() {
 									 removedResources.addAll(visitor.getRemovedResources());
 									 if (!isDirty()) {
-										 getSite().getPage().closeEditor(ConfigurationEditor.this, false);
+										 getSite().getPage().closeEditor(ArchitectureEditor.this, false);
 									 }
 								 }
 							 });
@@ -496,7 +418,7 @@ public class ConfigurationEditor
 							(new Runnable() {
 								 public void run() {
 									 changedResources.addAll(visitor.getChangedResources());
-									 if (getSite().getPage().getActiveEditor() == ConfigurationEditor.this) {
+									 if (getSite().getPage().getActiveEditor() == ArchitectureEditor.this) {
 										 handleActivate();
 									 }
 								 }
@@ -504,16 +426,13 @@ public class ConfigurationEditor
 					}
 				}
 				catch (CoreException exception) {
-					ConfigurationEditorPlugin.INSTANCE.log(exception);
+					ArchitectureUIPlugin.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.
@@ -528,7 +447,7 @@ public class ConfigurationEditor
 
 		if (!removedResources.isEmpty()) {
 			if (handleDirtyConflict()) {
-				getSite().getPage().closeEditor(ConfigurationEditor.this, false);
+				getSite().getPage().closeEditor(ArchitectureEditor.this, false);
 			}
 			else {
 				removedResources.clear();
@@ -546,9 +465,6 @@ public class ConfigurationEditor
 
 	/**
 	 * Handles what to do with changed resources on activation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	protected void handleChangedResources() {
 		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {
@@ -583,16 +499,13 @@ public class ConfigurationEditor
 
 	/**
 	 * 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.infra.viewpoints.configuration.editor",
+					 "org.eclipse.papyrus.infra.core.architecture.editor",
 					 0,
 					 null,
 					 new Object [] { editingDomain.getResourceSet() });
@@ -620,7 +533,7 @@ public class ConfigurationEditor
 					showTabs();
 				}
 				catch (PartInitException exception) {
-					ConfigurationEditorPlugin.INSTANCE.log(exception);
+					ArchitectureUIPlugin.INSTANCE.log(exception);
 				}
 			}
 
@@ -631,7 +544,7 @@ public class ConfigurationEditor
 						markerHelper.createMarkers(diagnostic);
 					}
 					catch (CoreException exception) {
-						ConfigurationEditorPlugin.INSTANCE.log(exception);
+						ArchitectureUIPlugin.INSTANCE.log(exception);
 					}
 				}
 			}
@@ -640,9 +553,6 @@ public class ConfigurationEditor
 
 	/**
 	 * Shows a dialog that asks if conflicting changes should be discarded.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	protected boolean handleDirtyConflict() {
 		return
@@ -654,20 +564,14 @@ public class ConfigurationEditor
 
 	/**
 	 * This creates a model editor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
-	public ConfigurationEditor() {
+	public ArchitectureEditor() {
 		super();
 		initializeEditingDomain();
 	}
 
 	/**
 	 * This sets up the editing domain for the model editor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	protected void initializeEditingDomain() {
 		// Create an adapter factory that yields item providers.
@@ -675,10 +579,9 @@ public class ConfigurationEditor
 		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
 
 		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
-		adapterFactory.addAdapterFactory(new ConfigurationItemProviderAdapterFactory());
-		adapterFactory.addAdapterFactory(new ConstraintsItemProviderAdapterFactory());
-		adapterFactory.addAdapterFactory(new EnvironmentItemProviderAdapterFactory());
-		adapterFactory.addAdapterFactory(new Iso42010ItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ArchitectureItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new RepresentationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());
 		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
 
 		// Create the command stack that will notify this editor as commands are executed.
@@ -722,20 +625,14 @@ public class ConfigurationEditor
 
 	/**
 	 * 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);
 	}
 
 	/**
 	 * 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;
@@ -760,78 +657,40 @@ public class ConfigurationEditor
 	 * 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}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	public EditingDomain getEditingDomain() {
 		return editingDomain;
 	}
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
 		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
 			super(adapterFactory);
 		}
 
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
 		@Override
 		public Object [] getElements(Object object) {
 			Object parent = super.getParent(object);
 			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
 		}
 
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
 		@Override
 		public Object [] getChildren(Object object) {
 			Object parent = super.getParent(object);
 			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
 		}
 
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
 		@Override
 		public boolean hasChildren(Object object) {
 			Object parent = super.getParent(object);
 			return parent != null;
 		}
 
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
 		@Override
 		public Object getParent(Object object) {
 			return null;
 		}
 	}
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public void setCurrentViewerPane(ViewerPane viewerPane) {
 		if (currentViewerPane != viewerPane) {
 			if (currentViewerPane != null) {
@@ -845,9 +704,6 @@ public class ConfigurationEditor
 	/**
 	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,
 	 * is the current one.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	public void setCurrentViewer(Viewer viewer) {
 		// If it is changing...
@@ -890,9 +746,6 @@ public class ConfigurationEditor
 
 	/**
 	 * This returns the viewer as required by the {@link IViewerProvider} interface.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	public Viewer getViewer() {
 		return currentViewer;
@@ -900,9 +753,6 @@ public class ConfigurationEditor
 
 	/**
 	 * 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) {
 		MenuManager contextMenu = new MenuManager("#PopUp");
@@ -921,12 +771,9 @@ public class ConfigurationEditor
 
 	/**
 	 * 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() {
-		URI resourceURI = EditUIUtil.getURI(getEditorInput());
+		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());
 		Exception exception = null;
 		Resource resource = null;
 		try {
@@ -949,16 +796,14 @@ public class ConfigurationEditor
 	/**
 	 * Returns a diagnostic describing the errors and warnings listed in the resource
 	 * 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()) {
+		boolean hasErrors = !resource.getErrors().isEmpty();
+		if (hasErrors || !resource.getWarnings().isEmpty()) {
 			BasicDiagnostic basicDiagnostic =
 				new BasicDiagnostic
-					(Diagnostic.ERROR,
-					 "org.eclipse.papyrus.infra.viewpoints.configuration.editor",
+					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,
+					 "org.eclipse.papyrus.infra.core.architecture.editor",
 					 0,
 					 getString("_UI_CreateModelError_message", resource.getURI()),
 					 new Object [] { exception == null ? (Object)resource : exception });
@@ -969,7 +814,7 @@ public class ConfigurationEditor
 			return
 				new BasicDiagnostic
 					(Diagnostic.ERROR,
-					 "org.eclipse.papyrus.infra.viewpoints.configuration.editor",
+					 "org.eclipse.papyrus.infra.core.architecture.editor",
 					 0,
 					 getString("_UI_CreateModelError_message", resource.getURI()),
 					 new Object[] { exception });
@@ -981,9 +826,6 @@ public class ConfigurationEditor
 
 	/**
 	 * This is the method used by the framework to install your own controls.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	@Override
 	public void createPages() {
@@ -998,7 +840,7 @@ public class ConfigurationEditor
 			//
 			{
 				ViewerPane viewerPane =
-					new ViewerPane(getSite().getPage(), ConfigurationEditor.this) {
+					new ViewerPane(getSite().getPage(), ArchitectureEditor.this) {
 						@Override
 						public Viewer createViewer(Composite composite) {
 							Tree tree = new Tree(composite, SWT.MULTI);
@@ -1032,7 +874,7 @@ public class ConfigurationEditor
 			//
 			{
 				ViewerPane viewerPane =
-					new ViewerPane(getSite().getPage(), ConfigurationEditor.this) {
+					new ViewerPane(getSite().getPage(), ArchitectureEditor.this) {
 						@Override
 						public Viewer createViewer(Composite composite) {
 							Tree tree = new Tree(composite, SWT.MULTI);
@@ -1061,7 +903,7 @@ public class ConfigurationEditor
 			//
 			{
 				ViewerPane viewerPane =
-					new ViewerPane(getSite().getPage(), ConfigurationEditor.this) {
+					new ViewerPane(getSite().getPage(), ArchitectureEditor.this) {
 						@Override
 						public Viewer createViewer(Composite composite) {
 							return new ListViewer(composite);
@@ -1086,7 +928,7 @@ public class ConfigurationEditor
 			//
 			{
 				ViewerPane viewerPane =
-					new ViewerPane(getSite().getPage(), ConfigurationEditor.this) {
+					new ViewerPane(getSite().getPage(), ArchitectureEditor.this) {
 						@Override
 						public Viewer createViewer(Composite composite) {
 							return new TreeViewer(composite);
@@ -1113,7 +955,7 @@ public class ConfigurationEditor
 			//
 			{
 				ViewerPane viewerPane =
-					new ViewerPane(getSite().getPage(), ConfigurationEditor.this) {
+					new ViewerPane(getSite().getPage(), ArchitectureEditor.this) {
 						@Override
 						public Viewer createViewer(Composite composite) {
 							return new TableViewer(composite);
@@ -1156,7 +998,7 @@ public class ConfigurationEditor
 			//
 			{
 				ViewerPane viewerPane =
-					new ViewerPane(getSite().getPage(), ConfigurationEditor.this) {
+					new ViewerPane(getSite().getPage(), ArchitectureEditor.this) {
 						@Override
 						public Viewer createViewer(Composite composite) {
 							return new TreeViewer(composite);
@@ -1230,9 +1072,6 @@ public class ConfigurationEditor
 	/**
 	 * If there is just one page in the multi-page editor part,
 	 * this hides the single tab at the bottom.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	protected void hideTabs() {
 		if (getPageCount() <= 1) {
@@ -1248,9 +1087,6 @@ public class ConfigurationEditor
 	/**
 	 * If there is more than one page in the multi-page editor part,
 	 * this shows the tabs at the bottom.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	protected void showTabs() {
 		if (getPageCount() > 1) {
@@ -1265,9 +1101,6 @@ public class ConfigurationEditor
 
 	/**
 	 * This is used to track the active viewer.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	@Override
 	protected void pageChange(int pageIndex) {
@@ -1280,11 +1113,8 @@ public class ConfigurationEditor
 
 	/**
 	 * This is how the framework determines which interfaces we implement.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
-	@SuppressWarnings("rawtypes")
+	@SuppressWarnings({ "rawtypes", "unchecked" })
 	@Override
 	public Object getAdapter(Class key) {
 		if (key.equals(IContentOutlinePage.class)) {
@@ -1303,9 +1133,6 @@ public class ConfigurationEditor
 
 	/**
 	 * This accesses a cached version of the content outliner.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	public IContentOutlinePage getContentOutlinePage() {
 		if (contentOutlinePage == null) {
@@ -1367,17 +1194,14 @@ public class ConfigurationEditor
 
 	/**
 	 * This accesses a cached version of the property sheet.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	public IPropertySheetPage getPropertySheetPage() {
 		PropertySheetPage propertySheetPage =
 			new ExtendedPropertySheetPage(editingDomain) {
 				@Override
 				public void setSelectionToViewer(List<?> selection) {
-					ConfigurationEditor.this.setSelectionToViewer(selection);
-					ConfigurationEditor.this.setFocus();
+					ArchitectureEditor.this.setSelectionToViewer(selection);
+					ArchitectureEditor.this.setFocus();
 				}
 
 				@Override
@@ -1394,9 +1218,6 @@ public class ConfigurationEditor
 
 	/**
 	 * 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) {
@@ -1433,9 +1254,6 @@ public class ConfigurationEditor
 
 	/**
 	 * This is for implementing {@link IEditorPart} and simply tests the command stack.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	@Override
 	public boolean isDirty() {
@@ -1444,9 +1262,6 @@ public class ConfigurationEditor
 
 	/**
 	 * This is for implementing {@link IEditorPart} and simply saves the model file.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	@Override
 	public void doSave(IProgressMonitor progressMonitor) {
@@ -1499,7 +1314,7 @@ public class ConfigurationEditor
 		catch (Exception exception) {
 			// Something went wrong that shouldn't.
 			//
-			ConfigurationEditorPlugin.INSTANCE.log(exception);
+			ArchitectureUIPlugin.INSTANCE.log(exception);
 		}
 		updateProblemIndication = true;
 		updateProblemIndication();
@@ -1508,9 +1323,6 @@ public class ConfigurationEditor
 	/**
 	 * 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.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	protected boolean isPersisted(Resource resource) {
 		boolean result = false;
@@ -1529,9 +1341,6 @@ public class ConfigurationEditor
 
 	/**
 	 * This always returns true because it is not currently supported.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	@Override
 	public boolean isSaveAsAllowed() {
@@ -1540,9 +1349,6 @@ public class ConfigurationEditor
 
 	/**
 	 * This also changes the editor's input.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	@Override
 	public void doSaveAs() {
@@ -1557,11 +1363,6 @@ public class ConfigurationEditor
 		}
 	}
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	protected void doSaveAs(URI uri, IEditorInput editorInput) {
 		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
 		setInputWithNotify(editorInput);
@@ -1573,11 +1374,6 @@ public class ConfigurationEditor
 		doSave(progressMonitor);
 	}
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public void gotoMarker(IMarker marker) {
 		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);
 		if (!targetObjects.isEmpty()) {
@@ -1587,9 +1383,6 @@ public class ConfigurationEditor
 
 	/**
 	 * This is called during startup.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	@Override
 	public void init(IEditorSite site, IEditorInput editorInput) {
@@ -1601,11 +1394,6 @@ public class ConfigurationEditor
 		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
 	}
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	@Override
 	public void setFocus() {
 		if (currentViewerPane != null) {
@@ -1618,9 +1406,6 @@ public class ConfigurationEditor
 
 	/**
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	public void addSelectionChangedListener(ISelectionChangedListener listener) {
 		selectionChangedListeners.add(listener);
@@ -1628,9 +1413,6 @@ public class ConfigurationEditor
 
 	/**
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
 		selectionChangedListeners.remove(listener);
@@ -1638,9 +1420,6 @@ public class ConfigurationEditor
 
 	/**
 	 * 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() {
 		return editorSelection;
@@ -1649,9 +1428,6 @@ public class ConfigurationEditor
 	/**
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.
 	 * Calling this result will notify the listeners.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	public void setSelection(ISelection selection) {
 		editorSelection = selection;
@@ -1662,11 +1438,6 @@ public class ConfigurationEditor
 		setStatusLineManager(selection);
 	}
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public void setStatusLineManager(ISelection selection) {
 		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
 			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
@@ -1698,66 +1469,37 @@ public class ConfigurationEditor
 
 	/**
 	 * 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) {
-		return ConfigurationEditorPlugin.INSTANCE.getString(key);
+		return ArchitectureUIPlugin.INSTANCE.getString(key);
 	}
 
 	/**
 	 * 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 ConfigurationEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });
+		return ArchitectureUIPlugin.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) {
 		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);
 	}
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public EditingDomainActionBarContributor getActionBarContributor() {
 		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();
 	}
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public IActionBars getActionBars() {
 		return getActionBarContributor().getActionBars();
 	}
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public AdapterFactory getAdapterFactory() {
 		return adapterFactory;
 	}
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	@Override
 	public void dispose() {
 		updateProblemIndication = false;
@@ -1785,9 +1527,6 @@ public class ConfigurationEditor
 
 	/**
 	 * Returns whether the outline view should be presented to the user.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	protected boolean showOutlineView() {
 		return true;
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/presentation/ConfigurationModelWizard.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/editor/ArchitectureModelWizard.java
index ba76c2dedea..2159daf94b0 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/presentation/ConfigurationModelWizard.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/editor/ArchitectureModelWizard.java
@@ -1,17 +1,17 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.viewpoints.configuration.presentation;
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.ui.architecture.editor;
 
 
 import java.util.ArrayList;
@@ -23,175 +23,170 @@ import java.util.List;
 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.EObject;
+import org.eclipse.emf.ecore.EClassifier;
+
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
+
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+
+import org.eclipse.emf.ecore.EObject;
+
 import org.eclipse.emf.ecore.xmi.XMLResource;
+
 import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
+
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
+
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationFactory;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.viewpoints.configuration.provider.ConfigurationEditPlugin;
+
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
+
 import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.ModifyEvent;
+
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
+
 import org.eclipse.ui.INewWizard;
 import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
+
 import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
 import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+
 import org.eclipse.ui.part.FileEditorInput;
 import org.eclipse.ui.part.ISetSelectionTarget;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureFactory;
+import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
+import org.eclipse.papyrus.infra.core.architecture.provider.ArchitectureEditPlugin;
+import org.eclipse.papyrus.infra.ui.architecture.ArchitectureUIPlugin;
+import org.eclipse.core.runtime.Path;
+
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
 
 
 /**
- * This is a simple wizard for creating a new model file.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ConfigurationModelWizard extends Wizard implements INewWizard {
+ * This is the wizard for creating a new architecture model file.
+ * 
+ * @since 1.0
+*/
+public class ArchitectureModelWizard 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(ConfigurationEditorPlugin.INSTANCE.getString("_UI_ConfigurationEditorFilenameExtensions").split("\\s*,\\s*")));
+		Collections.unmodifiableList(Arrays.asList(ArchitectureUIPlugin.INSTANCE.getString("_UI_ArchitectureEditorFilenameExtensions").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 =
-			ConfigurationEditorPlugin.INSTANCE.getString("_UI_ConfigurationEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");
+		ArchitectureUIPlugin.INSTANCE.getString("_UI_ArchitectureEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");
 
 	/**
 	 * This caches an instance of the model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
-	protected ConfigurationPackage configurationPackage = ConfigurationPackage.eINSTANCE;
+	protected ArchitecturePackage architecturePackage = ArchitecturePackage.eINSTANCE;
 
 	/**
 	 * This caches an instance of the model factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
-	protected ConfigurationFactory configurationFactory = configurationPackage.getConfigurationFactory();
+	protected ArchitectureFactory architectureFactory = architecturePackage.getArchitectureFactory();
 
 	/**
 	 * This is the file creation page.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
-	protected ConfigurationModelWizardNewFileCreationPage newFileCreationPage;
+	protected ArchitectureModelWizardNewFileCreationPage newFileCreationPage;
 
 	/**
 	 * This is the initial object creation page.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
-	protected ConfigurationModelWizardInitialObjectCreationPage initialObjectCreationPage;
+	protected ArchitectureModelWizardInitialObjectCreationPage initialObjectCreationPage;
 
 	/**
 	 * Remember the selection during initialization for populating the default container.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	protected IStructuredSelection selection;
 
 	/**
 	 * Remember the workbench during initialization.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	protected IWorkbench workbench;
 
 	/**
 	 * 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;
 
 	/**
 	 * This just records the information.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	public void init(IWorkbench workbench, IStructuredSelection selection) {
 		this.workbench = workbench;
 		this.selection = selection;
-		setWindowTitle(ConfigurationEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));
-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(ConfigurationEditorPlugin.INSTANCE.getImage("full/wizban/NewConfiguration.png")));
+		setWindowTitle(ArchitectureUIPlugin.INSTANCE.getString("_UI_Wizard_label"));
+		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(ArchitectureUIPlugin.INSTANCE.getImage("full/wizban/NewArchitecture")));
 	}
 
 	/**
 	 * Returns the names of the types that can be created as the root object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
 	 */
 	protected Collection<String> getInitialObjectNames() {
 		if (initialObjectNames == null) {
 			initialObjectNames = new ArrayList<String>();
-			initialObjectNames.add(ConfigurationPackage.Literals.PAPYRUS_CONFIGURATION.getName());
+			for (EClassifier eClassifier : architecturePackage.getEClassifiers()) {
+				if (eClassifier instanceof EClass) {
+					EClass eClass = (EClass)eClassifier;
+					if (!eClass.isAbstract()) {
+						initialObjectNames.add(eClass.getName());
+					}
+				}
+			}
+			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());
 		}
 		return initialObjectNames;
 	}
 
 	/**
 	 * Create a new model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	protected EObject createInitialModel() {
-		EClass eClass = (EClass)configurationPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
-		EObject rootObject = configurationFactory.create(eClass);
+		EClass eClass = (EClass)architecturePackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
+		EObject rootObject = architectureFactory.create(eClass);
 		return rootObject;
 	}
 
 	/**
 	 * Do the work after everything is specified.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	@Override
 	public boolean performFinish() {
@@ -233,7 +228,7 @@ public class ConfigurationModelWizard extends Wizard implements INewWizard {
 							resource.save(options);
 						}
 						catch (Exception exception) {
-							ConfigurationEditorPlugin.INSTANCE.log(exception);
+							ArchitectureUIPlugin.INSTANCE.log(exception);
 						}
 						finally {
 							progressMonitor.done();
@@ -266,40 +261,31 @@ public class ConfigurationModelWizard extends Wizard implements INewWizard {
 					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 
 			}
 			catch (PartInitException exception) {
-				MessageDialog.openError(workbenchWindow.getShell(), ConfigurationEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
+				MessageDialog.openError(workbenchWindow.getShell(), ArchitectureUIPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
 				return false;
 			}
 
 			return true;
 		}
 		catch (Exception exception) {
-			ConfigurationEditorPlugin.INSTANCE.log(exception);
+			ArchitectureUIPlugin.INSTANCE.log(exception);
 			return false;
 		}
 	}
 
 	/**
 	 * This is the one page of the wizard.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
-	public class ConfigurationModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
+	public class ArchitectureModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
 		/**
 		 * Pass in the selection.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
 		 */
-		public ConfigurationModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
+		public ArchitectureModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
 			super(pageId, selection);
 		}
 
 		/**
 		 * The framework calls this to see if the file is correct.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
 		 */
 		@Override
 		protected boolean validatePage() {
@@ -307,7 +293,7 @@ public class ConfigurationModelWizard extends Wizard implements INewWizard {
 				String extension = new Path(getFileName()).getFileExtension();
 				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {
 					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension";
-					setErrorMessage(ConfigurationEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));
+					setErrorMessage(ArchitectureUIPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));
 					return false;
 				}
 				return true;
@@ -315,11 +301,6 @@ public class ConfigurationModelWizard extends Wizard implements INewWizard {
 			return false;
 		}
 
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
 		public IFile getModelFile() {
 			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
 		}
@@ -327,49 +308,24 @@ public class ConfigurationModelWizard extends Wizard implements INewWizard {
 
 	/**
 	 * This is the page where the type of object to create is selected.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
-	public class ConfigurationModelWizardInitialObjectCreationPage extends WizardPage {
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+	public class ArchitectureModelWizardInitialObjectCreationPage extends WizardPage {
 		protected Combo initialObjectField;
 
-		/**
-		 * @generated
-		 *            <!-- begin-user-doc -->
-		 *            <!-- end-user-doc -->
-		 */
 		protected List<String> encodings;
 
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
 		protected Combo encodingField;
 
 		/**
 		 * Pass in the selection.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
 		 */
-		public ConfigurationModelWizardInitialObjectCreationPage(String pageId) {
+		public ArchitectureModelWizardInitialObjectCreationPage(String pageId) {
 			super(pageId);
 		}
 
-		/**
-		 * <!-- 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;
@@ -384,7 +340,7 @@ public class ConfigurationModelWizard extends Wizard implements INewWizard {
 
 			Label containerLabel = new Label(composite, SWT.LEFT);
 			{
-				containerLabel.setText(ConfigurationEditorPlugin.INSTANCE.getString("_UI_ModelObject"));
+				containerLabel.setText(ArchitectureUIPlugin.INSTANCE.getString("_UI_ModelObject"));
 
 				GridData data = new GridData();
 				data.horizontalAlignment = GridData.FILL;
@@ -410,7 +366,7 @@ public class ConfigurationModelWizard extends Wizard implements INewWizard {
 
 			Label encodingLabel = new Label(composite, SWT.LEFT);
 			{
-				encodingLabel.setText(ConfigurationEditorPlugin.INSTANCE.getString("_UI_XMLEncoding"));
+				encodingLabel.setText(ArchitectureUIPlugin.INSTANCE.getString("_UI_XMLEncoding"));
 
 				GridData data = new GridData();
 				data.horizontalAlignment = GridData.FILL;
@@ -435,32 +391,17 @@ public class ConfigurationModelWizard extends Wizard implements INewWizard {
 			setControl(composite);
 		}
 
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
 		protected ModifyListener validator =
-				new ModifyListener() {
+			new ModifyListener() {
 				public void modifyText(ModifyEvent e) {
 					setPageComplete(validatePage());
 				}
 			};
 
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
 		protected boolean validatePage() {
 			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());
 		}
 
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
 		@Override
 		public void setVisible(boolean visible) {
 			super.setVisible(visible);
@@ -476,11 +417,6 @@ public class ConfigurationModelWizard extends Wizard implements INewWizard {
 			}
 		}
 
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
 		public String getInitialObjectName() {
 			String label = initialObjectField.getText();
 
@@ -492,40 +428,27 @@ public class ConfigurationModelWizard extends Wizard implements INewWizard {
 			return null;
 		}
 
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
 		public String getEncoding() {
 			return encodingField.getText();
 		}
 
 		/**
 		 * Returns the label for the specified type name.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
 		 */
 		protected String getLabel(String typeName) {
 			try {
-				return ConfigurationEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type");
+				return ArchitectureEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type");
 			}
 			catch(MissingResourceException mre) {
-				ConfigurationEditorPlugin.INSTANCE.log(mre);
+				ArchitectureUIPlugin.INSTANCE.log(mre);
 			}
 			return typeName;
 		}
 
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
 		protected Collection<String> getEncodings() {
 			if (encodings == null) {
 				encodings = new ArrayList<String>();
-				for (StringTokenizer stringTokenizer = new StringTokenizer(ConfigurationEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) {
+				for (StringTokenizer stringTokenizer = new StringTokenizer(ArchitectureUIPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) {
 					encodings.add(stringTokenizer.nextToken());
 				}
 			}
@@ -535,18 +458,15 @@ public class ConfigurationModelWizard extends Wizard implements INewWizard {
 
 	/**
 	 * 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.
 		//
-		newFileCreationPage = new ConfigurationModelWizardNewFileCreationPage("Whatever", selection);
-		newFileCreationPage.setTitle(ConfigurationEditorPlugin.INSTANCE.getString("_UI_ConfigurationModelWizard_label"));
-		newFileCreationPage.setDescription(ConfigurationEditorPlugin.INSTANCE.getString("_UI_ConfigurationModelWizard_description"));
-		newFileCreationPage.setFileName(ConfigurationEditorPlugin.INSTANCE.getString("_UI_ConfigurationEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));
+		newFileCreationPage = new ArchitectureModelWizardNewFileCreationPage("Whatever", selection);
+		newFileCreationPage.setTitle(ArchitectureUIPlugin.INSTANCE.getString("_UI_ArchitectureModelWizard_label"));
+		newFileCreationPage.setDescription(ArchitectureUIPlugin.INSTANCE.getString("_UI_ArchitectureModelWizard_description"));
+		newFileCreationPage.setFileName(ArchitectureUIPlugin.INSTANCE.getString("_UI_ArchitectureEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));
 		addPage(newFileCreationPage);
 
 		// Try and get the resource selection to determine a current directory for the file dialog.
@@ -572,7 +492,7 @@ public class ConfigurationModelWizard extends Wizard implements INewWizard {
 
 					// Make up a unique new name here.
 					//
-					String defaultModelBaseFilename = ConfigurationEditorPlugin.INSTANCE.getString("_UI_ConfigurationEditorFilenameDefaultBase");
+					String defaultModelBaseFilename = ArchitectureUIPlugin.INSTANCE.getString("_UI_ArchitectureEditorFilenameDefaultBase");
 					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);
 					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension;
 					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {
@@ -582,17 +502,14 @@ public class ConfigurationModelWizard extends Wizard implements INewWizard {
 				}
 			}
 		}
-		initialObjectCreationPage = new ConfigurationModelWizardInitialObjectCreationPage("Whatever2");
-		initialObjectCreationPage.setTitle(ConfigurationEditorPlugin.INSTANCE.getString("_UI_ConfigurationModelWizard_label"));
-		initialObjectCreationPage.setDescription(ConfigurationEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));
+		initialObjectCreationPage = new ArchitectureModelWizardInitialObjectCreationPage("Whatever2");
+		initialObjectCreationPage.setTitle(ArchitectureUIPlugin.INSTANCE.getString("_UI_ArchitectureModelWizard_label"));
+		initialObjectCreationPage.setDescription(ArchitectureUIPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));
 		addPage(initialObjectCreationPage);
 	}
 
 	/**
 	 * Get the file from the page.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
 	public IFile getModelFile() {
 		return newFileCreationPage.getModelFile();
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/handlers/ChangeArchitectureContextHandler.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/handlers/ChangeArchitectureContextHandler.java
new file mode 100644
index 00000000000..a9c42d6db76
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/handlers/ChangeArchitectureContextHandler.java
@@ -0,0 +1,204 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.ui.architecture.handlers;
+
+import java.util.Arrays;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.emf.common.command.CompoundCommand;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureContext;
+import org.eclipse.papyrus.infra.architecture.ArchitectureDescriptionUtils;
+import org.eclipse.papyrus.infra.architecture.ArchitectureDomainManager;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.ui.architecture.ArchitectureUIPlugin;
+import org.eclipse.papyrus.infra.ui.architecture.widgets.ArchitectureContextComposite;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.MessageBox;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+/**
+ * A command handler for changing architecture context in a model set
+ *  
+ * @since 1.0
+ */
+public class ChangeArchitectureContextHandler extends AbstractHandler {
+
+	private final static String DIALOG_SECTION = ChangeArchitectureContextHandler.class.getName();
+	
+	/**
+	 * Constructor.
+	 */
+	public ChangeArchitectureContextHandler() {
+		// nothing by default
+	}
+	
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		EObject selection = getSelection(event);
+		if (selection == null)
+			return new IContributionItem[0];
+		ResourceSet resourceSet = selection.eResource().getResourceSet();
+		if (!(resourceSet instanceof ModelSet))
+			return new IContributionItem[0];
+		final ArchitectureDescriptionUtils helper = new ArchitectureDescriptionUtils((ModelSet)resourceSet);
+		String[] contextIds = new String[] {helper.getArchitectureContextId()};
+		String[] viewpointIds = helper.getArchitectureViewpointIds().toArray(new String[0]);
+		
+		final Shell shell = Display.getCurrent().getActiveShell();
+		ArchitectureContextDialog dialog = new ArchitectureContextDialog(shell);
+		dialog.setSelectedContexts(contextIds);
+		dialog.setSelectedViewpoints(viewpointIds);
+		dialog.create();
+		
+		if (dialog.open() == Window.OK) {
+			TransactionalEditingDomain dom = helper.getModelSet().getTransactionalEditingDomain();
+			CompoundCommand cmd = new CompoundCommand("Change Architecture Context");
+			if (!Arrays.equals(dialog.getSelectedContextIds(), contextIds)) {
+				cmd.append(helper.switchArchitectureContextId(dialog.getSelectedContextIds()[0]));
+			}
+			if (!Arrays.equals(dialog.getSelectedViewpointIds(), viewpointIds)) {
+				cmd.append(helper.switchArchitectureViewpointIds(dialog.getSelectedViewpointIds()));
+			}
+			if (!cmd.isEmpty()) {
+				dom.getCommandStack().execute(cmd);
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Gets the current selection as an EObject
+	 *
+	 * @return The current selection, or <code>null</code> if it is not an EObject
+	 */
+	protected EObject getSelection(ExecutionEvent event) {
+		Object selection = HandlerUtil.getCurrentSelection(event);
+		if (selection instanceof IStructuredSelection) {
+			IStructuredSelection struct = (IStructuredSelection) selection;
+			Object obj = struct.getFirstElement();
+			return EMFHelper.getEObject(obj);
+		}
+		return null;
+	}
+
+	/**
+	 * A dialog to allow choosing a new architecture context and viewpoints 
+	 */
+	private class ArchitectureContextDialog extends Dialog {
+
+		private String[] originalContextIds;
+		
+		private String[] selectedContextIds;
+
+		private String[] selectedViewpointIds;
+
+		protected ArchitectureContextDialog(Shell parentShell) {
+			super(parentShell);
+		}
+		
+		public String[] getSelectedContextIds() {
+			return selectedContextIds;
+		}
+
+		public String[] getSelectedViewpointIds() {
+			return selectedViewpointIds;
+		}
+
+		public void setSelectedContexts(String[] selectedContextIds) {
+			this.selectedContextIds = selectedContextIds;
+			this.originalContextIds = selectedContextIds;
+		}
+
+		public void setSelectedViewpoints(String[] selectedViewpointIds) {
+			this.selectedViewpointIds = selectedViewpointIds;
+		}
+
+		@Override
+        protected Control createDialogArea(Composite parent) {
+			Composite container = (Composite) super.createDialogArea(parent);
+			
+			Label label = new Label(container, SWT.NONE);
+			label.setText("Switch the architecture context and/or viewpoints applied to the Papyrus model:");
+			
+			ArchitectureDomainManager manager = ArchitectureDomainManager.getInstance();
+			
+			ArchitectureContextComposite acc = new ArchitectureContextComposite(container, 1, 1, GridData.FILL_BOTH, 0, 0);
+			acc.setAllowSeveralContexts(false);
+			acc.setSelectedContexts(selectedContextIds);
+			acc.setSelectedViewpoints(selectedViewpointIds);
+			acc.setInput(manager.getVisibleArchitectureContexts().toArray(new MergedArchitectureContext[0]));
+			acc.setUpdater(new ArchitectureContextComposite.Updater() {
+				@Override
+				public void update() {
+					selectedContextIds = acc.getSelectedContexts();
+					selectedViewpointIds = acc.getSelectedViewpoints();
+				}
+			});
+			
+			return container;
+		}
+		
+		@Override
+        protected void configureShell(Shell newShell) {
+			super.configureShell(newShell);
+            newShell.setText("Switch Architecture Context");
+        }
+
+        @Override
+    	protected boolean isResizable() {
+    		return true;
+    	}
+        
+        @Override
+        protected IDialogSettings getDialogBoundsSettings() {
+    		IDialogSettings globalSettings = ArchitectureUIPlugin.getPlugin().getDialogSettings();
+    		IDialogSettings dialogSettings = globalSettings.getSection(DIALOG_SECTION);
+    		if (dialogSettings == null) {
+    			dialogSettings = globalSettings.addNewSection(DIALOG_SECTION);
+    	    }
+    		return dialogSettings;
+    	}
+        
+		@Override
+		protected void okPressed() {
+			if (!Arrays.equals(getSelectedContextIds(), originalContextIds)) {
+				MessageBox messageBox = new MessageBox(getShell(), SWT.ICON_WARNING | SWT.YES | SWT.NO);
+			    messageBox.setMessage("Changing the architecture context may cause significant changes to the model.\nDo you like to proceed?");
+			    messageBox.setText("Warning");
+			    int response = messageBox.open();
+			    if (response != SWT.YES)
+			    	return;
+			}
+	    	super.okPressed();
+		}
+	}
+
+}
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/handlers/ChangeArchitectureViewpointsHandler.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/handlers/ChangeArchitectureViewpointsHandler.java
new file mode 100644
index 00000000000..00affdd915b
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/handlers/ChangeArchitectureViewpointsHandler.java
@@ -0,0 +1,118 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.ui.architecture.handlers;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.ActionContributionItem;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureContext;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureViewpoint;
+import org.eclipse.papyrus.infra.architecture.ArchitectureDescriptionUtils;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.actions.CompoundContributionItem;
+
+/**
+ * A command handler for changing architecture viewpoints in a model set
+ *
+ * @since 1.0
+ */
+public class ChangeArchitectureViewpointsHandler extends CompoundContributionItem {
+
+	// the label provider for architecture viewpoints
+	private ILabelProvider provider;
+	
+	public ChangeArchitectureViewpointsHandler() {
+		ComposedAdapterFactory composedAdapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+		provider = new AdapterFactoryLabelProvider(composedAdapterFactory);
+	}
+	
+	@Override
+	protected IContributionItem[] getContributionItems() {
+		final EObject selection = getSelection();
+		if (selection == null)
+			return new IContributionItem[0];
+		ResourceSet resourceSet = selection.eResource().getResourceSet();
+		if (!(resourceSet instanceof ModelSet))
+			return new IContributionItem[0];
+		final ArchitectureDescriptionUtils helper = new ArchitectureDescriptionUtils((ModelSet)resourceSet);
+		MergedArchitectureContext context = helper.getArchitectureContext();
+		final Set<String> viewpointIds = new HashSet<String>(helper.getArchitectureViewpointIds());
+
+		List<IContributionItem> items = new ArrayList<IContributionItem>();
+		for (MergedArchitectureViewpoint viewpoint : context.getViewpoints()) {
+			Object imageObject = viewpoint.getImageObject();
+			ImageDescriptor desc = ExtendedImageRegistry.getInstance().getImageDescriptor(provider.getImage(imageObject));
+			items.add(new ActionContributionItem(new Action(viewpoint.getName(), desc) {
+				{
+					setChecked(viewpointIds.contains(viewpoint.getId()));
+				}
+				@Override
+				public void run() {
+					if (!isChecked())
+						viewpointIds.remove(viewpoint.getId());
+					else
+						viewpointIds.add(viewpoint.getId());
+					TransactionalEditingDomain ted = helper.getModelSet().getTransactionalEditingDomain();
+					Command cmd = helper.switchArchitectureViewpointIds(viewpointIds.toArray(new String[0]));
+					ted.getCommandStack().execute(cmd);
+				}
+			}));
+		}
+		return items.toArray(new IContributionItem[0]);
+	}
+
+	/**
+	 * Gets the current selection as an EObject
+	 *
+	 * @return The current selection, or <code>null</code> if it is not an EObject
+	 */
+	protected EObject getSelection() {
+		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+		if (window == null) {
+			return null;
+		}
+		ISelection selection = window.getSelectionService().getSelection();
+		if (selection == null) {
+			return null;
+		}
+		if (selection.isEmpty()) {
+			return null;
+		}
+		if (selection instanceof IStructuredSelection) {
+			IStructuredSelection struct = (IStructuredSelection) selection;
+			Object obj = struct.getFirstElement();
+			return EMFHelper.getEObject(obj);
+		}
+		return null;
+	}
+}
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/navigator/ViewpointFilter.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/navigator/ViewpointFilter.java
new file mode 100644
index 00000000000..f7aa52d6320
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/navigator/ViewpointFilter.java
@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.ui.architecture.navigator;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EObjectTreeElement;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
+import org.eclipse.papyrus.infra.widgets.providers.AbstractTreeFilter;
+
+/**
+ * A tree filter for representations (diagrams, tables) based on active viewpoints in a model set 
+ *
+ * @since 1.0
+ */
+public class ViewpointFilter extends AbstractTreeFilter {
+
+	public ViewpointFilter() {
+		super();
+		useCache = false;//don't cache
+	}
+	
+	/**
+	 * hide a representation when it's not supported by the active viewpoints
+	 */
+	@Override
+	public boolean isVisible(Viewer viewer, Object parentElement, Object element) {
+		if (element instanceof EObjectTreeElement) {
+			EObject eObj = ((EObjectTreeElement)element).getEObject();
+			if (eObj instanceof Diagram || eObj instanceof Table) {
+				return ViewPrototype.get(eObj) != ViewPrototype.UNAVAILABLE_VIEW;
+			}
+		}
+		return true;
+	}
+}
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/preferences/ArchitectureContextPreferencePage.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/preferences/ArchitectureContextPreferencePage.java
new file mode 100755
index 00000000000..13e5d6f60b2
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/preferences/ArchitectureContextPreferencePage.java
@@ -0,0 +1,433 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.ui.architecture.preferences;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.layout.PixelConverter;
+import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.jface.resource.FontDescriptor;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.viewers.CheckStateChangedEvent;
+import org.eclipse.jface.viewers.CheckboxTreeViewer;
+import org.eclipse.jface.viewers.ColumnViewerToolTipSupport;
+import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider;
+import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
+import org.eclipse.jface.viewers.ICheckStateListener;
+import org.eclipse.jface.viewers.ICheckStateProvider;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.ListViewer;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StyledString;
+import org.eclipse.jface.viewers.StyledString.Styler;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerComparator;
+import org.eclipse.jface.window.ToolTip;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedADElement;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureContext;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureDomain;
+import org.eclipse.papyrus.infra.architecture.ArchitectureDomainManager;
+import org.eclipse.papyrus.infra.architecture.ArchitectureDomainPreferences;
+import org.eclipse.papyrus.infra.architecture.ArchitectureDomainMerger;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.TextStyle;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Layout;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.eclipse.ui.dialogs.ContainerCheckedTreeViewer;
+
+/**
+ * Represents the preference page for the architecture contexts
+ *
+ * @since 1.0
+ */
+public class ArchitectureContextPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
+
+	// The ID of this preference page used to contribute via extension
+	public static final String PAGE_ID = ArchitectureContextPreferencePage.class.getName();
+	
+	//A bold style
+	private static final Styler BOLD_FONT_STYLER = new Styler() {
+		@Override
+		public void applyStyles(TextStyle textStyle) {
+	        FontDescriptor boldDescriptor = FontDescriptor.createFrom(new FontData()).setStyle(SWT.BOLD);
+	        Font boldFont = boldDescriptor.createFont(Display.getCurrent());
+	        textStyle.font = boldFont;
+		}
+	};
+	
+	// Contexts viewer
+	private CheckboxTreeViewer fContextsViewer;
+	// Text displaying additional information
+	private ListViewer fDescription;
+	// Adapter Factory
+	private ComposedAdapterFactory fComposedAdapterFactory;
+	
+	// Buttons
+	private Button fOtherButton;
+	private Button fDefaultButton;
+
+	// the architecture domain model merger
+	ArchitectureDomainMerger fMerger;
+	
+	//Preferences
+	ArchitectureDomainPreferences fPreferences;
+	
+	/**
+	 * Constructor.
+	 */
+	public ArchitectureContextPreferencePage() {
+		fComposedAdapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+		fMerger = ArchitectureDomainManager.getInstance().getMerger().clone();
+		fPreferences = ArchitectureDomainManager.getInstance().getPreferences().clone();
+	}
+	
+	@Override
+	public Control createContents(Composite parent) {
+		Composite container = createComposite(parent, 1, 1, GridData.FILL_BOTH, 0, 0);
+		createArchitectureContextsGroup(container);
+		Dialog.applyDialogFont(container);
+		return container;
+	}
+
+	/**
+	 * Creates the Architecture Context group in the page
+	 */
+	private void createArchitectureContextsGroup(Composite container) {
+		Composite comp = createComposite(container, 1, 1, GridData.FILL_BOTH, 0, 0);
+		((GridData) comp.getLayoutData()).widthHint = 350;
+		createWrapLabel(comp, "Select the architecture contexts that can be applied to Papyrus models:", 2);
+		createVerticalSpacer(comp, 1);
+
+		Composite tableComposite = createComposite(comp, 2, 1, GridData.FILL_BOTH, 0, 0);
+		createLabel(tableComposite, "Architecture Contexts:", 2);
+
+		fContextsViewer = new ContainerCheckedTreeViewer(tableComposite, SWT.MULTI | SWT.BORDER);
+		GridData gd = new GridData(GridData.FILL_BOTH);
+		gd.heightHint = 250;
+		fContextsViewer.getControl().setLayoutData(gd);
+
+		final IStyledLabelProvider labelProvider = new AdapterFactoryLabelProvider.StyledLabelProvider(fComposedAdapterFactory, fContextsViewer) {
+			@Override
+			public StyledString getStyledText(Object object) {
+				MergedADElement element = (MergedADElement) object;
+				if (element instanceof MergedArchitectureContext) {
+					MergedArchitectureContext context = (MergedArchitectureContext)element;
+					if (context.getId() != null && context.getId().equals(fPreferences.getDefaultContextId()))
+						return new StyledString(element.getName(), BOLD_FONT_STYLER);
+				}
+				return new StyledString(element.getName());
+			}
+			@Override
+			public Image getImage(Object object) {
+				MergedADElement element = (MergedADElement) object;
+				return super.getImage(element.getImageObject());
+			}
+		};
+
+		fContextsViewer.setContentProvider(new ITreeContentProvider() {
+			@Override
+			public boolean hasChildren(Object element) {
+				if (element instanceof MergedArchitectureDomain) {
+					return !((MergedArchitectureDomain)element).getContexts().isEmpty();
+				}
+				return false;
+			}
+			@Override
+			public Object getParent(Object element) {
+				return null;
+			}
+			@Override
+			public Object[] getElements(Object inputElement) {
+				Collection<MergedArchitectureDomain> domains = ((ArchitectureDomainMerger)inputElement).getDomains();
+				return domains.toArray();
+			}
+			@Override
+			public Object[] getChildren(Object parentElement) {
+				if (parentElement instanceof MergedArchitectureDomain) {
+					Collection<MergedArchitectureContext> contexts = ((MergedArchitectureDomain)parentElement).getContexts();
+					return contexts.toArray();
+				}
+				return null;
+			}
+		});
+		fContextsViewer.setLabelProvider(new DelegatingStyledCellLabelProvider(labelProvider));
+		fContextsViewer.setComparator(new ViewerComparator() {
+		    public int compare(Viewer viewer, Object e1, Object e2) {
+		        String name1 = labelProvider.getStyledText(e1).getString();
+		        String name2 = labelProvider.getStyledText(e2).getString();
+		        return getComparator().compare(name1, name2);
+		    }			
+		});
+		fContextsViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+			@Override
+			public void selectionChanged(SelectionChangedEvent event) {
+				updateButtons();
+				updateDetails();
+			}
+		});
+		fContextsViewer.setCheckStateProvider(new ICheckStateProvider() {
+			@Override
+			public boolean isGrayed(Object element) {
+				return false;
+			}
+			@Override
+			public boolean isChecked(Object element) {
+				if (element instanceof MergedArchitectureContext) 
+					return !fPreferences.getExcludedContextIds().contains(((MergedArchitectureContext)element).getId());
+				else
+					return fContextsViewer.getChecked(element);
+			}
+		});
+		fContextsViewer.addCheckStateListener(new ICheckStateListener() {
+			@Override
+			public void checkStateChanged(CheckStateChangedEvent event) {
+				Collection<MergedArchitectureContext> contexts = null;
+				if (event.getElement() instanceof MergedArchitectureContext)
+					contexts = Collections.singletonList((MergedArchitectureContext) event.getElement());
+				else
+					contexts = ((MergedArchitectureDomain)event.getElement()).getContexts();
+				for (MergedArchitectureContext context : contexts) {
+					if (event.getChecked() == false)
+						fPreferences.getExcludedContextIds().add(context.getId());
+					else
+						fPreferences.getExcludedContextIds().remove(context.getId());
+				}
+			}
+		});
+		fContextsViewer.setInput(fMerger);
+		fContextsViewer.expandAll();
+		
+		ColumnViewerToolTipSupport.enableFor(fContextsViewer, ToolTip.NO_RECREATE);
+
+		Composite buttonComposite = createComposite(tableComposite, 1, 1, GridData.FILL_VERTICAL | GridData.VERTICAL_ALIGN_BEGINNING, 0, 0);
+		createVerticalSpacer(buttonComposite, 1);
+
+		fOtherButton = createPushButton(buttonComposite, "Other Architecture Models...", null, SWT.PUSH);
+		fOtherButton.addSelectionListener(new SelectionAdapter() {
+			public void widgetSelected(SelectionEvent e) {
+				handleOther();
+			}
+		});
+
+		fDefaultButton = createPushButton(buttonComposite, "Make Default", null, SWT.PUSH);
+		fDefaultButton.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				handleDefault();
+			}
+		});
+
+		updateButtons();
+
+		Composite descriptionComposite = createComposite(comp, 1, 1, GridData.FILL_HORIZONTAL, 0, 0);
+
+		createLabel(descriptionComposite, "Description:", 1);
+		
+		fDescription = new ListViewer(descriptionComposite);
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.heightHint = 50;
+		fDescription.getControl().setLayoutData(gd);
+		fDescription.setContentProvider(new IStructuredContentProvider() {
+			private Object input;
+			public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+				this.input = newInput;
+			}
+			public void dispose() {
+			}
+			public Object[] getElements(Object inputElement) {
+				return new Object[] {input};
+			}
+		});
+		fDescription.setLabelProvider(new LabelProvider() {
+			public String getText(Object element) {
+				return ((MergedADElement)element).getDesciption();
+			}
+		});
+	}
+
+	/**
+	 * Handles the selection of other models by merging them
+	 */
+	private void handleOther() {
+        ArchitectureModelSelectDialog dialog = new ArchitectureModelSelectDialog(getShell(), "File Selection", fPreferences.getAddedModelURIs().toArray(new String[0]));
+        dialog.open();
+        List<URI> files = dialog.getURIs();
+        fPreferences.getAddedModelURIs().clear();
+        for (URI file : files) {
+            fPreferences.getAddedModelURIs().add(file.toString());
+        }
+        fMerger.setPreferenceModels(files);
+		fContextsViewer.refresh();
+		fContextsViewer.expandAll();
+	}
+
+	/**
+	 * Handles the default button by setting the selected context as default
+	 */
+	protected void handleDefault() {
+		IStructuredSelection selection = (IStructuredSelection) fContextsViewer.getSelection();
+		MergedArchitectureContext selected = (MergedArchitectureContext) selection.getFirstElement();
+		fPreferences.setDefaultContextId(selected.getId());
+		fContextsViewer.refresh();
+	}
+
+	/**
+	 * Update the enabled state of the buttons
+	 */
+	protected void updateButtons() {
+		IStructuredSelection selection = (IStructuredSelection) fContextsViewer.getSelection();
+		if (selection.size() == 1) {
+			MergedADElement selected = (MergedADElement) selection.getFirstElement();
+			if (selected instanceof MergedArchitectureContext) {
+				fDefaultButton.setEnabled(true);
+				//ArchitectureContext context = (ArchitectureContext)selected;
+				//fDefaultButton.setSelection(context.getId().equals(fPreferences.getDefaultContextId()));
+				return;
+			}
+		}
+		fDefaultButton.setEnabled(false);
+		fDefaultButton.setSelection(false);
+	}
+
+	/**
+	 * Updates the details text box with information about the currently selected target
+	 */
+	protected void updateDetails() {
+		IStructuredSelection selection = (IStructuredSelection) fContextsViewer.getSelection();
+		if (selection.size() == 1) {
+			MergedADElement selected = (MergedADElement) selection.getFirstElement();
+			fDescription.setInput(selected);
+		} else {
+			fDescription.setInput(null);
+		}
+	}
+
+	@Override
+	public void init(IWorkbench workbench) {
+	}
+
+	@Override
+	public void performDefaults() {
+		fPreferences.reset();
+		fContextsViewer.refresh();
+	}
+
+	@Override
+	public boolean performOk() {
+		fPreferences.write();
+		return true;
+	}
+
+	private static Composite createComposite(Composite parent, int columns, int hspan, int fill, int marginwidth, int marginheight) {
+		Composite g = new Composite(parent, SWT.NONE);
+		GridLayout layout = new GridLayout(columns, false);
+		layout.marginWidth = marginwidth;
+		layout.marginHeight = marginheight;
+		g.setLayout(layout);
+		g.setFont(parent.getFont());
+		GridData gd = new GridData(fill);
+		gd.horizontalSpan = hspan;
+		g.setLayoutData(gd);
+		return g;
+	}
+	
+	private static Label createLabel(Composite parent, String text, int hspan) {
+		Label l = new Label(parent, SWT.NONE);
+		l.setFont(parent.getFont());
+		l.setText(text);
+		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan = hspan;
+		gd.grabExcessHorizontalSpace = false;
+		l.setLayoutData(gd);
+		return l;
+	}
+
+	private static Label createWrapLabel(Composite parent, String text, int hspan) {
+		Label l = new Label(parent, SWT.NONE | SWT.WRAP);
+		l.setFont(parent.getFont());
+		l.setText(text);
+		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan = hspan;
+		l.setLayoutData(gd);
+		return l;
+	}
+
+	private static void createVerticalSpacer(Composite parent, int numlines) {
+		Label lbl = new Label(parent, SWT.NONE);
+		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		Layout layout = parent.getLayout();
+		if (layout instanceof GridLayout) {
+			gd.horizontalSpan = ((GridLayout) parent.getLayout()).numColumns;
+		}
+		gd.heightHint = numlines;
+		lbl.setLayoutData(gd);
+	}
+
+	private static Button createPushButton(Composite parent, String label, Image image, int style) {
+		Button button = new Button(parent, style);
+		button.setFont(parent.getFont());
+		if (image != null) {
+			button.setImage(image);
+		}
+		if (label != null) {
+			button.setText(label);
+		}
+		GridData gd = new GridData();
+		button.setLayoutData(gd);
+		setButtonDimensionHint(button);
+		return button;
+	}
+
+	private static void setButtonDimensionHint(Button button) {
+		Assert.isNotNull(button);
+		Object gd = button.getLayoutData();
+		if (gd instanceof GridData) {
+			((GridData) gd).widthHint = getButtonWidthHint(button);
+			((GridData) gd).horizontalAlignment = GridData.FILL;
+		}
+	}
+
+	private static int getButtonWidthHint(Button button) {
+		button.setFont(JFaceResources.getDialogFont());
+		PixelConverter converter = new PixelConverter(button);
+		int widthHint = converter.convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
+		return Math.max(widthHint, button.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
+	}
+
+}
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/preferences/ArchitectureModelSelectDialog.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/preferences/ArchitectureModelSelectDialog.java
new file mode 100644
index 00000000000..4cfa56fed22
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/preferences/ArchitectureModelSelectDialog.java
@@ -0,0 +1,234 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.ui.architecture.preferences;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.emf.common.EMFPlugin;
+import org.eclipse.emf.common.ui.CommonUIPlugin;
+import org.eclipse.emf.common.ui.dialogs.WorkspaceResourceDialog;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.FormAttachment;
+import org.eclipse.swt.layout.FormData;
+import org.eclipse.swt.layout.FormLayout;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+
+/**
+ * A dialog to select architecture models from the file system or workspace by URIs
+ *
+ * @since 1.0
+ */
+public class ArchitectureModelSelectDialog extends Dialog {
+	protected static final int CONTROL_OFFSET = 10;
+	protected String title;
+	protected int style;
+	protected Text uriField;
+	protected String uriText;
+	protected String[] initialSelection;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parent
+	 * @param title
+	 * @param initialSelection
+	 */
+	public ArchitectureModelSelectDialog(Shell parent, String title, String[] initialSelection) {
+		super(parent);
+		this.title = title != null ? title : CommonUIPlugin.INSTANCE.getString("_UI_ResourceDialog_title");
+		this.style = SWT.MULTI | SWT.OPEN;
+
+		setShellStyle(getShellStyle() | SWT.MAX | SWT.RESIZE);
+		this.initialSelection = initialSelection;
+	}
+
+	@Override
+	protected void configureShell(Shell shell) {
+		super.configureShell(shell);
+		shell.setText(title);
+	}
+
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		Composite composite = (Composite) super.createDialogArea(parent);
+		{
+			FormLayout layout = new FormLayout();
+			composite.setLayout(layout);
+
+			GridData data = new GridData();
+			data.verticalAlignment = GridData.FILL;
+			data.grabExcessVerticalSpace = true;
+			data.horizontalAlignment = GridData.FILL;
+			data.grabExcessHorizontalSpace = true;
+			if (!EMFPlugin.IS_RESOURCES_BUNDLE_AVAILABLE) {
+				data.widthHint = 330;
+			}
+			composite.setLayoutData(data);
+		}
+
+		Composite buttonComposite = new Composite(composite, SWT.NONE);
+
+		Label resourceURILabel = new Label(composite, SWT.LEFT);
+		{
+			resourceURILabel.setText(
+					CommonUIPlugin.INSTANCE.getString("_UI_ResourceURIs_label"));
+			FormData data = new FormData();
+			data.left = new FormAttachment(0, CONTROL_OFFSET);
+			data.top = new FormAttachment(0, CONTROL_OFFSET);
+			resourceURILabel.setLayoutData(data);
+		}
+
+		{
+			FormData data = new FormData();
+			data.top = new FormAttachment(resourceURILabel, CONTROL_OFFSET, SWT.CENTER);
+			data.left = new FormAttachment(resourceURILabel, CONTROL_OFFSET);
+			data.right = new FormAttachment(100, -CONTROL_OFFSET);
+			buttonComposite.setLayoutData(data);
+
+			buttonComposite.setLayout(new FormLayout());
+		}
+
+		uriField = new Text(composite, SWT.BORDER);
+		{
+			FormData data = new FormData();
+			data.top = new FormAttachment(buttonComposite, CONTROL_OFFSET);
+			data.left = new FormAttachment(0, CONTROL_OFFSET);
+			data.right = new FormAttachment(100, -CONTROL_OFFSET);
+			uriField.setLayoutData(data);
+			uriField.setText(String.join(" ", initialSelection));
+		}
+
+		Button browseFileSystemButton = new Button(buttonComposite, SWT.PUSH);
+		browseFileSystemButton.setText(CommonUIPlugin.INSTANCE.getString("_UI_BrowseFileSystem_label"));
+		prepareBrowseFileSystemButton(browseFileSystemButton);
+
+		if (EMFPlugin.IS_RESOURCES_BUNDLE_AVAILABLE) {
+			Button browseWorkspaceButton = new Button(buttonComposite, SWT.PUSH);
+			{
+				FormData data = new FormData();
+				data.right = new FormAttachment(100);
+				browseWorkspaceButton.setLayoutData(data);
+			}
+			{
+				FormData data = new FormData();
+				data.right = new FormAttachment(browseWorkspaceButton, -CONTROL_OFFSET);
+				browseFileSystemButton.setLayoutData(data);
+			}
+			browseWorkspaceButton.setText(CommonUIPlugin.INSTANCE.getString("_UI_BrowseWorkspace_label"));
+			prepareBrowseWorkspaceButton(browseWorkspaceButton);
+		} else {
+			FormData data = new FormData();
+			data.right = new FormAttachment(100);
+			browseFileSystemButton.setLayoutData(data);
+		}
+
+		Label separatorLabel = new Label(composite, SWT.SEPARATOR | SWT.HORIZONTAL);
+		{
+			FormData data = new FormData();
+			data.top = new FormAttachment(uriField, (int) (1.5 * CONTROL_OFFSET));
+			data.left = new FormAttachment(0, -CONTROL_OFFSET);
+			data.right = new FormAttachment(100, CONTROL_OFFSET);
+			separatorLabel.setLayoutData(data);
+		}
+
+		composite.setTabList(new Control[] { uriField, buttonComposite });
+		return composite;
+	}
+
+	/**
+	 * Configures the Browse File System button
+	 * @param browseFileSystemButton
+	 */
+	protected void prepareBrowseFileSystemButton(Button browseFileSystemButton) {
+		browseFileSystemButton.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent event) {
+				FileDialog fileDialog = new FileDialog(getShell(), style);
+				fileDialog.open();
+
+				String filterPath = fileDialog.getFilterPath();
+				String[] fileNames = fileDialog.getFileNames();
+				StringBuffer uris = new StringBuffer();
+
+				for (int i = 0, len = fileNames.length; i < len; i++) {
+					uris.append(URI.createFileURI(filterPath + File.separator + fileNames[i]).toString());
+					uris.append("  ");
+				}
+				uriField.setText((uriField.getText() + "  " + uris.toString()).trim());
+			}
+		});
+	}
+
+	/**
+	 * Prepares the Browse Workspace button
+	 * @param browseWorkspaceButton
+	 */
+	protected void prepareBrowseWorkspaceButton(Button browseWorkspaceButton) {
+		browseWorkspaceButton.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent event) {
+				StringBuffer uris = new StringBuffer();
+
+				IFile[] files = WorkspaceResourceDialog.openFileSelection(getShell(), null, null, true,
+						null, null);
+				for (int i = 0, len = files.length; i < len; i++) {
+					uris.append(URI.createPlatformResourceURI(files[i].getFullPath().toString(), true));
+					uris.append("  ");
+				}
+				uriField.setText((uriField.getText() + "  " + uris.toString()).trim());
+			}
+		});
+	}
+
+	@Override
+	protected void okPressed() {
+		uriText = getURIText();
+		super.okPressed();
+	}
+
+	/**
+	 * @return the value of the model URIs as a string
+	 */
+	public String getURIText() {
+		return uriField != null && !uriField.isDisposed() ? uriField.getText() : uriText;
+	}
+
+	/**
+	 * @return the value of the model URIs as a list
+	 */
+	public List<URI> getURIs() {
+		List<URI> uris = new ArrayList<URI>();
+		for (StringTokenizer stringTokenizer = new StringTokenizer(getURIText()); stringTokenizer.hasMoreTokens();) {
+			String uri = stringTokenizer.nextToken();
+			uris.add(URI.createURI(uri));
+		}
+		return uris;
+	}
+
+}
\ No newline at end of file
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/widgets/ArchitectureContextComposite.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/widgets/ArchitectureContextComposite.java
new file mode 100644
index 00000000000..7b26a867ce6
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/widgets/ArchitectureContextComposite.java
@@ -0,0 +1,374 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Maged Elaasar - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.ui.architecture.widgets;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.jface.viewers.CheckStateChangedEvent;
+import org.eclipse.jface.viewers.CheckboxTableViewer;
+import org.eclipse.jface.viewers.CheckboxTreeViewer;
+import org.eclipse.jface.viewers.ColumnViewerToolTipSupport;
+import org.eclipse.jface.viewers.ICheckStateListener;
+import org.eclipse.jface.viewers.ICheckStateProvider;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.ViewerComparator;
+import org.eclipse.jface.window.ToolTip;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedADElement;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureContext;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureDomain;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureViewpoint;
+import org.eclipse.papyrus.infra.architecture.ArchitectureDomainManager;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.TreeItem;
+import org.eclipse.ui.dialogs.ContainerCheckedTreeViewer;
+
+/**
+ * A composite widget that shows the visible architecture contexts and their viewpoints
+ * and allows for changing their selection
+ *
+ * @since 1.0
+ */
+public class ArchitectureContextComposite extends Composite {
+	
+	/**
+	 * An interface for doing updates upon selection changes 
+	 */
+	public static interface Updater {
+		void update();
+	}
+	
+	// allow selection of multiple contexts
+	private boolean allowSeveralContexts;
+
+	// the set of selected contexts
+	private Set<String> selectedContexts;
+
+	// the set of selected viewpoints
+	private Set<String> selectedViewpoints;
+
+	// the viewer for architecture contexts
+	private CheckboxTreeViewer contextsViewer;
+	
+	// the viewer for architecture viewpoints
+	private CheckboxTableViewer viewpointViewer;
+
+	// the adapter factory of the architecture metadata
+	private ComposedAdapterFactory composedAdapterFactory;
+	
+	// an updater to call upon selection changes
+	private Updater updater;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parent
+	 * @param columns
+	 * @param hspan
+	 * @param fill
+	 * @param marginwidth
+	 * @param marginheight
+	 */
+	public ArchitectureContextComposite(Composite parent, int columns, int hspan, int fill, int marginwidth, int marginheight) {
+		super(parent, SWT.NONE);
+		layoutComposite(this, parent, columns, hspan, fill, marginwidth, marginheight);
+		
+		composedAdapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+		
+		Composite tableComposite = createComposite(this, 1, 1, GridData.FILL_BOTH, 0, 0);
+		createLabel(tableComposite, "Architecture Contexts:", 2);
+
+		contextsViewer = new ContainerCheckedTreeViewer(tableComposite, SWT.MULTI | SWT.BORDER);
+		GridData gd = new GridData(GridData.FILL_BOTH);
+		gd.heightHint = 250;
+		contextsViewer.getControl().setLayoutData(gd);
+
+		contextsViewer.setContentProvider(new ITreeContentProvider() {
+			private Collection<MergedArchitectureContext> allContexts;
+			@Override
+			public boolean hasChildren(Object element) {
+				return element instanceof MergedArchitectureDomain;
+			}
+			@Override
+			public Object getParent(Object element) {
+				return null;
+			}
+			@Override
+			public Object[] getElements(Object inputElement) {
+				Set<MergedArchitectureDomain> allDomains = new LinkedHashSet<MergedArchitectureDomain>();
+				allContexts  = new LinkedHashSet<MergedArchitectureContext>();
+				for (Object obj : ((Object[])inputElement)) {
+					MergedArchitectureContext context = (MergedArchitectureContext)obj;
+					allContexts.add(context);
+					allDomains.add(context.getDomain());
+				}
+				return allDomains.toArray();
+			}
+			@Override
+			public Object[] getChildren(Object parentElement) {
+				if (parentElement instanceof MergedArchitectureDomain) {
+					MergedArchitectureDomain domain = (MergedArchitectureDomain)parentElement;
+					List<MergedArchitectureContext> possibleContexts = new ArrayList<MergedArchitectureContext>(domain.getContexts());
+					possibleContexts.retainAll(allContexts);
+					return possibleContexts.toArray();
+				}
+				return null;
+			}
+		});
+		contextsViewer.setLabelProvider(new AdapterFactoryLabelProvider(composedAdapterFactory) {
+			@Override
+			public Image getImage(Object object) {
+				if (object instanceof MergedADElement) {
+					MergedADElement element = (MergedADElement) object;
+					return super.getImage(element.getImageObject());
+				}
+				return super.getImage(object);
+			}
+			@Override
+			public String getText(Object object) {
+				return ((MergedADElement)object).getName();
+			}
+		});
+		contextsViewer.setComparator(new ViewerComparator());
+		contextsViewer.setCheckStateProvider(new ICheckStateProvider() {
+			@Override
+			public boolean isGrayed(Object element) {
+				return false;
+			}
+			@Override
+			public boolean isChecked(Object element) {
+				if (element instanceof MergedArchitectureContext) 
+					return selectedContexts.contains(((MergedArchitectureContext)element).getId());
+				else
+					return contextsViewer.getChecked(element);
+			}
+		});
+		contextsViewer.addCheckStateListener(new ICheckStateListener() {
+			@Override
+			public void checkStateChanged(CheckStateChangedEvent event) {
+				ArchitectureDomainManager manager = ArchitectureDomainManager.getInstance();
+				
+				if (!allowSeveralContexts) {
+					if (event.getChecked() || contextsViewer.getCheckedElements().length == 0) {
+						if (event.getElement() instanceof MergedArchitectureContext) {
+							contextsViewer.setCheckedElements(new Object[] {event.getElement()});
+						} else {
+							for (TreeItem item : contextsViewer.getTree().getItems()) {
+								if (item.getData() == event.getElement()) {
+									contextsViewer.setCheckedElements(new Object[] {item.getItem(0).getData()});
+									break;
+								}
+							}
+						}
+					}
+				}
+				
+				selectedContexts.clear();
+				for (Object element : contextsViewer.getCheckedElements()) {
+					if (element instanceof MergedArchitectureContext)
+						selectedContexts.add(((MergedArchitectureContext)element).getId());
+				}
+				
+				selectedViewpoints.clear();
+				for (String contextId : selectedContexts) {
+					MergedArchitectureContext context = manager.getArchitectureContextById(contextId);
+					for (MergedArchitectureViewpoint viewpoint : context.getViewpoints()) {
+						selectedViewpoints.add(viewpoint.getId());
+					}
+				}
+				
+				updateViewpoints();
+				if (updater != null)
+					updater.update();
+			}
+		});
+		
+		ColumnViewerToolTipSupport.enableFor(contextsViewer, ToolTip.NO_RECREATE);
+
+		Composite viewpointComposite = createComposite(this, 1, 1, GridData.FILL_HORIZONTAL, 0, 0);
+
+		createLabel(viewpointComposite, "Architecture Viewpoints:", 1);
+		
+		viewpointViewer = CheckboxTableViewer.newCheckList(viewpointComposite, SWT.BORDER | SWT.MULTI | SWT.FULL_SELECTION);
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.heightHint = 100;
+		viewpointViewer.getControl().setLayoutData(gd);
+		viewpointViewer.setContentProvider(new IStructuredContentProvider() {
+			public Object[] getElements(Object inputElement) {
+				Set<MergedADElement> viewpoints = new TreeSet<MergedADElement>(new Comparator<MergedADElement>() {
+					@Override
+					public int compare(MergedADElement o1, MergedADElement o2) {
+						return o1.getName().compareTo(o2.getName());
+					}
+				});
+				for (Object obj : ((Object[])inputElement)) {
+					if (obj instanceof MergedArchitectureContext)
+						viewpoints.addAll(((MergedArchitectureContext)obj).getViewpoints());
+				}
+				return viewpoints.toArray();
+			}
+		});
+		viewpointViewer.setLabelProvider(new LabelProvider() {
+			private ILabelProvider provider = new AdapterFactoryLabelProvider(composedAdapterFactory);
+			@Override
+			public Image getImage(Object object) {
+				MergedADElement element = (MergedADElement) object;
+				return provider.getImage(element.getImageObject());
+			}
+			@Override
+			public String getText(Object object) {
+				return ((MergedADElement)object).getName();
+			}
+		});
+		viewpointViewer.setCheckStateProvider(new ICheckStateProvider() {
+			@Override
+			public boolean isGrayed(Object element) {
+				return false;
+			}
+			@Override
+			public boolean isChecked(Object element) {
+				return selectedViewpoints.contains(((MergedArchitectureViewpoint)element).getId());
+			}
+		});
+		viewpointViewer.addCheckStateListener(new ICheckStateListener() {
+			@Override
+			public void checkStateChanged(CheckStateChangedEvent event) {
+				MergedArchitectureViewpoint viewpoint = (MergedArchitectureViewpoint) event.getElement();
+				if (event.getChecked())
+					selectedViewpoints.add(viewpoint.getId());
+				else
+					selectedViewpoints.remove(viewpoint.getId());
+				updateViewpoints();
+				if (updater != null)
+					updater.update();
+			}
+		});
+		updateViewpoints();
+	}
+
+	/**
+	 * Sets the input object of the composite that initializes its viewers
+	 * 
+	 * @param input the input object
+	 */
+    public void setInput(Object input) {
+		contextsViewer.setInput(input);
+		contextsViewer.expandAll();
+		updateViewpoints();
+    }
+    
+    /**
+     * Sets whether to show several context
+     * 
+     * @param allowSeveralContexts boolean value
+     */
+    public void setAllowSeveralContexts(boolean allowSeveralContexts) {
+		this.allowSeveralContexts = allowSeveralContexts;
+	}
+	
+    /**
+     * @return an array of selected contexts
+     */
+	public String[] getSelectedContexts() {
+		return selectedContexts.toArray(new String[0]);
+	}
+
+	/**
+	 * Sets the selected contexts
+	 * 
+	 * @param selectedContexts
+	 */
+	public void setSelectedContexts(String[] selectedContexts) {
+		this.selectedContexts = new HashSet<String>(Arrays.asList(selectedContexts));
+	}
+	
+	/**
+	 * @return an array of selected viewpoints
+	 */
+	public String[] getSelectedViewpoints() {
+		return selectedViewpoints.toArray(new String[0]);
+	}
+
+	/**
+	 * Sets the selected viewpoints
+	 * 
+	 * @param selectedViewpoints
+	 */
+	public void setSelectedViewpoints(String[] selectedViewpoints) {
+		this.selectedViewpoints = new HashSet<String>(Arrays.asList(selectedViewpoints));
+	}
+	
+	/**
+	 * Sets the updater instance 
+	 * 
+	 * @param updater
+	 */
+	public void setUpdater(Updater updater) {
+		this.updater = updater;
+	}
+
+	/*
+	 * update the viewpoint viewer based on changes to context viewer 
+	 */
+	private void updateViewpoints() {
+		viewpointViewer.setInput(contextsViewer.getCheckedElements());
+	}
+
+	private static Composite createComposite(Composite parent, int columns, int hspan, int fill, int marginwidth, int marginheight) {
+		Composite g = new Composite(parent, SWT.NONE);
+		layoutComposite(g, parent, columns, hspan, fill, marginwidth, marginheight);
+		return g;
+	}
+	
+	private static Composite layoutComposite(Composite g, Composite parent, int columns, int hspan, int fill, int marginwidth, int marginheight) {
+		GridLayout layout = new GridLayout(columns, false);
+		layout.marginWidth = marginwidth;
+		layout.marginHeight = marginheight;
+		g.setLayout(layout);
+		g.setFont(parent.getFont());
+		GridData gd = new GridData(fill);
+		gd.horizontalSpan = hspan;
+		g.setLayoutData(gd);
+		return g;
+	}
+
+	private static Label createLabel(Composite parent, String text, int hspan) {
+		Label l = new Label(parent, SWT.NONE);
+		l.setFont(parent.getFont());
+		l.setText(text);
+		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan = hspan;
+		gd.grabExcessHorizontalSpace = false;
+		l.setLayoutData(gd);
+		return l;
+	}
+
+}
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/schema/papyrusDiagram.exsd b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/schema/papyrusDiagram.exsd
index 241fe0c27f1..54ba81578bc 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/schema/papyrusDiagram.exsd
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/schema/papyrusDiagram.exsd
@@ -32,7 +32,6 @@ The &lt;code&gt;org.eclipse.papyrus.infra.ui.papyrusDiagram&lt;/code&gt; extensi
             <element ref="editorDiagram" minOccurs="0" maxOccurs="unbounded"/>
             <element ref="creationCommand" minOccurs="0" maxOccurs="unbounded"/>
             <element ref="actionBarContributor" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="diagramCategory" minOccurs="0" maxOccurs="unbounded"/>
          </sequence>
          <attribute name="point" type="string" use="required">
             <annotation>
@@ -199,64 +198,6 @@ The &lt;code&gt;org.eclipse.papyrus.infra.ui.papyrusDiagram&lt;/code&gt; extensi
       </complexType>
    </element>
 
-   <element name="diagramCategory">
-      <annotation>
-         <documentation>
-            The category of a domain model. The registered category is available in New papyrus Model Wizard and it customizes creation of a domain model. It is also used to filter diagram kinds and model templates.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a unique identifier used as a reference for this diagram category. It is used to filter model templates and diagram kinds.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a name of the fully qualified class that implements &lt;samp&gt;org.eclipse.papyrus.infra.ui.extension.commands.IModelCreationCommand&lt;/samp&gt;.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.ui.extension.commands.IModelCreationCommand"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="extensionPrefix" type="string">
-            <annotation>
-               <documentation>
-                  the file extension.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="label" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a translatable name of the diagram category, it is displayed in the New Papyrus Model Wizard to select a Diagram Category.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="description" type="string">
-            <annotation>
-               <documentation>
-                  a description of the diagram category is to be displayed as a tooltip next ti its label.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="icon" type="string">
-            <annotation>
-               <documentation>
-                  a relative path of an icon used to visually represent the diagram category. The path is relative to the location of the plugin.xml file of the contributing plug-in.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="resource"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
    <annotation>
       <appInfo>
          <meta.section type="since"/>
@@ -307,7 +248,7 @@ As Requirement diagram belongs to SysML category it will be created with a SysML
          <meta.section type="apiInfo"/>
       </appInfo>
       <documentation>
-         &lt;p&gt;The value of the &lt;code&gt;class&lt;/code&gt; attribute of &lt;code&gt;diagramCategory&lt;/code&gt; must represent a class that implements the &lt;code&gt;org.eclipse.papyrus.infra.ui.extension.commands.IModelCreationCommand&lt;/code&gt; interface. There are a few default implementations of &lt;code&gt;IModelCreationCommand&lt;/code&gt; that may be useful to users of this extension point: 
+         &lt;p&gt;The value of the &lt;code&gt;class&lt;/code&gt; attribute of &lt;code&gt;diagramCategory&lt;/code&gt; must represent a class that implements the &lt;code&gt;org.eclipse.papyrus.infra.architecture.commands.IModelCreationCommand&lt;/code&gt; interface. There are a few default implementations of &lt;code&gt;IModelCreationCommand&lt;/code&gt; that may be useful to users of this extension point: 
 &lt;ul&gt;
 &lt;li&gt;&lt;code&gt;org.eclipse.papyrus.commands.ModelCreationCommandBase&lt;/code&gt; - an abstract implementation of a basic &lt;code&gt;IModelCreationCommand&lt;/code&gt;.&lt;/li&gt;
 &lt;li&gt;&lt;code&gt;org.eclipse.papyrus.uml.diagram.common.commands.CreateUMLModelCommand&lt;/code&gt;&lt;/li&gt; - implementation of IModelCreationCommand that creates a UML model.
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/IModelCreationCommand.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/IModelCreationCommand.java
deleted file mode 100644
index 838908b38c2..00000000000
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/IModelCreationCommand.java
+++ /dev/null
@@ -1,33 +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:
- *  Tatiana Fesenko (CEA LIST) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.ui.extension.commands;
-
-import org.eclipse.papyrus.infra.core.resource.ModelSet;
-
-/**
- * The Interface IModelCreationCommand.
- * 
- * @since 1.2
- */
-public interface IModelCreationCommand {
-
-	/**
-	 * Creates the model.
-	 *
-	 * @param modelSet
-	 *            the modelSet set
-	 */
-	void createModel(final ModelSet modelSet);
-
-}
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/commands/SashLayoutCommandFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/commands/SashLayoutCommandFactory.java
index 61c931b1ec4..b72840bec46 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/commands/SashLayoutCommandFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/commands/SashLayoutCommandFactory.java
@@ -131,15 +131,13 @@ public class SashLayoutCommandFactory {
 	void moveContents(Resource fromResource, Resource toResource) {
 		// Safe copy to allow concurrent modifications
 		for (EObject root : new ArrayList<>(fromResource.getContents())) {
-			EObject toReplace = (EObject) EcoreUtil.getObjectByType(toResource.getContents(), root.eClass());
-			if (toReplace != null) {
-				EcoreUtil.replace(toReplace, root);
-			} else {
-				if (root instanceof SashWindowsMngr) {
+			if (root instanceof SashWindowsMngr) {
+				EObject toReplace = (EObject) EcoreUtil.getObjectByType(toResource.getContents(), root.eClass());
+				if (toReplace != null) {
+					EcoreUtil.replace(toReplace, root);
+				} else {
 					// This one is expected always to be first
 					toResource.getContents().add(0, root);
-				} else {
-					toResource.getContents().add(root);
 				}
 			}
 		}
diff --git a/plugins/infra/ui/pom.xml b/plugins/infra/ui/pom.xml
index f9cec6ab2b3..2774d80b1e2 100644
--- a/plugins/infra/ui/pom.xml
+++ b/plugins/infra/ui/pom.xml
@@ -13,6 +13,7 @@
 
 	<modules>
 		<module>org.eclipse.papyrus.infra.ui</module>
+		<module>org.eclipse.papyrus.infra.ui.architecture</module>
 		<module>org.eclipse.papyrus.infra.ui.resources</module>
 		<module>org.eclipse.papyrus.infra.onefile.ui</module>
 		<module>org.eclipse.papyrus.infra.widgets</module>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/.project b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/.project
deleted file mode 100755
index 7fa3ac2d513..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/.project
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.infra.viewpoints.configuration.edit</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>
-		<buildCommand>
-			<name>org.eclipse.oomph.version.VersionBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>check.maven.pom</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>ignore.lower.bound.dependency.ranges</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>release.path</key>
-					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.oomph.version.VersionNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100755
index 4759947300a..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-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

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/.settings/org.eclipse.pde.api.tools.prefs b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 23fb95e120f..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,98 +0,0 @@
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-API_USE_SCAN_FIELD_SEVERITY=Error
-API_USE_SCAN_METHOD_SEVERITY=Error
-API_USE_SCAN_TYPE_SEVERITY=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Warning
-ILLEGAL_IMPLEMENT=Warning
-ILLEGAL_INSTANTIATE=Warning
-ILLEGAL_OVERRIDE=Warning
-ILLEGAL_REFERENCE=Warning
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_ANNOTATION=Ignore
-INVALID_JAVADOC_TAG=Ignore
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
-LEAK_EXTEND=Warning
-LEAK_FIELD_DECL=Warning
-LEAK_IMPLEMENT=Warning
-LEAK_METHOD_PARAM=Warning
-LEAK_METHOD_RETURN_TYPE=Warning
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Warning
-automatically_removed_unused_problem_filters=Enabled
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Warning
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/META-INF/MANIFEST.MF b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/META-INF/MANIFEST.MF
deleted file mode 100755
index edab2d937e4..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.configuration.edit;singleton:=true
-Require-Bundle: org.eclipse.papyrus.infra.constraints.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)",
- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.viewpoints.iso42010.edit;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
-Bundle-ActivationPolicy: lazy
-Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: %providerName
-Export-Package: org.eclipse.papyrus.infra.viewpoints.configuration.provider
-Bundle-Version: 2.0.0.qualifier
-Bundle-Name: %pluginName
-Bundle-ClassPath: .
-Bundle-Localization: plugin
-Bundle-Activator: org.eclipse.papyrus.infra.viewpoints.configuration.provider.ConfigurationEditPlugin$Implementation
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/build.properties b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/build.properties
deleted file mode 100644
index 8bea233d4ed..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-
-bin.includes = .,\
-               icons/,\
-               META-INF/,\
-               plugin.xml,\
-               plugin.properties,\
-               about.html
-jars.compile.order = .
-source.. = src-gen/
-output.. = bin/
-src.includes = about.html
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/.gitignore b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/.gitignore
deleted file mode 100644
index 2d0c92986b9..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.gif
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/obj16/ElementImport.png b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/obj16/ElementImport.png
deleted file mode 100755
index 4874c9a4bda..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/obj16/ElementImport.png
+++ /dev/null
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/obj16/PapyrusView.png b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/obj16/PapyrusView.png
deleted file mode 100755
index 5eb0dd58505..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/obj16/PapyrusView.png
+++ /dev/null
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/plugin.xml b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/plugin.xml
deleted file mode 100755
index 01deab57a0e..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/plugin.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
--->
-
-<plugin>
-
-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
-      <!-- @generated configuration -->
-      <factory
-            uri="http://www.eclipse.org/papyrus/infra/viewpoints/configuration"
-            class="org.eclipse.papyrus.infra.viewpoints.configuration.provider.ConfigurationItemProviderAdapterFactory"
-            supportedTypes=
-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
-               org.eclipse.emf.edit.provider.ITreeItemContentProvider
-               org.eclipse.emf.edit.provider.IItemLabelProvider
-               org.eclipse.emf.edit.provider.IItemPropertySource"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.edit.childCreationExtenders">
-      <!-- @generated configuration -->
-      <extender
-            uri="http://www.eclipse.org/papyrus/infra/viewpoints/iso42010"
-            class="org.eclipse.papyrus.infra.viewpoints.configuration.provider.ConfigurationItemProviderAdapterFactory$Iso42010ChildCreationExtender"/>
-   </extension>
-
-</plugin>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/pom.xml b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/pom.xml
deleted file mode 100644
index bb0034fe49c..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/pom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus.infra-viewpoints</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.infra.viewpoints.configuration.edit</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/ConfigurationItemProviderAdapterFactory.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/ConfigurationItemProviderAdapterFactory.java
deleted file mode 100644
index 8725b15be49..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/ConfigurationItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,745 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.viewpoints.configuration.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.CommandParameter;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ChildCreationExtenderManager;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationFactory;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.viewpoints.configuration.util.ConfigurationAdapterFactory;
-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription;
-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureFramework;
-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint;
-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package;
-import org.eclipse.papyrus.infra.viewpoints.iso42010.util.Iso42010Switch;
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers.
- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
- * The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ConfigurationItemProviderAdapterFactory extends ConfigurationAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable, IChildCreationExtender {
-	/**
-	 * This keeps track of the root adapter factory that delegates to this adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ComposedAdapterFactory parentAdapterFactory;
-
-	/**
-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
-	/**
-	 * This helps manage the child creation extenders.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(ConfigurationEditPlugin.INSTANCE, ConfigurationPackage.eNS_URI);
-
-	/**
-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Collection<Object> supportedTypes = new ArrayList<Object>();
-
-	/**
-	 * This constructs an instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ConfigurationItemProviderAdapterFactory() {
-		supportedTypes.add(IEditingDomainItemProvider.class);
-		supportedTypes.add(IStructuredItemContentProvider.class);
-		supportedTypes.add(ITreeItemContentProvider.class);
-		supportedTypes.add(IItemLabelProvider.class);
-		supportedTypes.add(IItemPropertySource.class);
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusConfiguration} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PapyrusConfigurationItemProvider papyrusConfigurationItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusConfiguration}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createPapyrusConfigurationAdapter() {
-		if (papyrusConfigurationItemProvider == null) {
-			papyrusConfigurationItemProvider = new PapyrusConfigurationItemProvider(this);
-		}
-
-		return papyrusConfigurationItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusViewpoint} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PapyrusViewpointItemProvider papyrusViewpointItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusViewpoint}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createPapyrusViewpointAdapter() {
-		if (papyrusViewpointItemProvider == null) {
-			papyrusViewpointItemProvider = new PapyrusViewpointItemProvider(this);
-		}
-
-		return papyrusViewpointItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PapyrusViewItemProvider papyrusViewItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createPapyrusViewAdapter() {
-		if (papyrusViewItemProvider == null) {
-			papyrusViewItemProvider = new PapyrusViewItemProvider(this);
-		}
-
-		return papyrusViewItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PapyrusDiagramItemProvider papyrusDiagramItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createPapyrusDiagramAdapter() {
-		if (papyrusDiagramItemProvider == null) {
-			papyrusDiagramItemProvider = new PapyrusDiagramItemProvider(this);
-		}
-
-		return papyrusDiagramItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusSyncTable} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PapyrusSyncTableItemProvider papyrusSyncTableItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusSyncTable}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createPapyrusSyncTableAdapter() {
-		if (papyrusSyncTableItemProvider == null) {
-			papyrusSyncTableItemProvider = new PapyrusSyncTableItemProvider(this);
-		}
-
-		return papyrusSyncTableItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusTable} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PapyrusTableItemProvider papyrusTableItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusTable}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createPapyrusTableAdapter() {
-		if (papyrusTableItemProvider == null) {
-			papyrusTableItemProvider = new PapyrusTableItemProvider(this);
-		}
-
-		return papyrusTableItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.viewpoints.configuration.ModelRule} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ModelRuleItemProvider modelRuleItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.viewpoints.configuration.ModelRule}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createModelRuleAdapter() {
-		if (modelRuleItemProvider == null) {
-			modelRuleItemProvider = new ModelRuleItemProvider(this);
-		}
-
-		return modelRuleItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.viewpoints.configuration.OwningRule} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected OwningRuleItemProvider owningRuleItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.viewpoints.configuration.OwningRule}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createOwningRuleAdapter() {
-		if (owningRuleItemProvider == null) {
-			owningRuleItemProvider = new OwningRuleItemProvider(this);
-		}
-
-		return owningRuleItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.viewpoints.configuration.ChildRule} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ChildRuleItemProvider childRuleItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.viewpoints.configuration.ChildRule}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createChildRuleAdapter() {
-		if (childRuleItemProvider == null) {
-			childRuleItemProvider = new ChildRuleItemProvider(this);
-		}
-
-		return childRuleItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.viewpoints.configuration.PaletteRule} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PaletteRuleItemProvider paletteRuleItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.viewpoints.configuration.PaletteRule}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createPaletteRuleAdapter() {
-		if (paletteRuleItemProvider == null) {
-			paletteRuleItemProvider = new PaletteRuleItemProvider(this);
-		}
-
-		return paletteRuleItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.viewpoints.configuration.PathElement} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PathElementItemProvider pathElementItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.viewpoints.configuration.PathElement}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createPathElementAdapter() {
-		if (pathElementItemProvider == null) {
-			pathElementItemProvider = new PathElementItemProvider(this);
-		}
-
-		return pathElementItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.viewpoints.configuration.Category} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CategoryItemProvider categoryItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.viewpoints.configuration.Category}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createCategoryAdapter() {
-		if (categoryItemProvider == null) {
-			categoryItemProvider = new CategoryItemProvider(this);
-		}
-
-		return categoryItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.viewpoints.configuration.ModelAutoCreate} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ModelAutoCreateItemProvider modelAutoCreateItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.viewpoints.configuration.ModelAutoCreate}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createModelAutoCreateAdapter() {
-		if (modelAutoCreateItemProvider == null) {
-			modelAutoCreateItemProvider = new ModelAutoCreateItemProvider(this);
-		}
-
-		return modelAutoCreateItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.viewpoints.configuration.RootAutoSelect} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RootAutoSelectItemProvider rootAutoSelectItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.viewpoints.configuration.RootAutoSelect}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createRootAutoSelectAdapter() {
-		if (rootAutoSelectItemProvider == null) {
-			rootAutoSelectItemProvider = new RootAutoSelectItemProvider(this);
-		}
-
-		return rootAutoSelectItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.viewpoints.configuration.AssistantRule} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AssistantRuleItemProvider assistantRuleItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.viewpoints.configuration.AssistantRule}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createAssistantRuleAdapter() {
-		if (assistantRuleItemProvider == null) {
-			assistantRuleItemProvider = new AssistantRuleItemProvider(this);
-		}
-
-		return assistantRuleItemProvider;
-	}
-
-	/**
-	 * This returns the root adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ComposeableAdapterFactory getRootAdapterFactory() {
-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
-	}
-
-	/**
-	 * This sets the composed adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
-		this.parentAdapterFactory = parentAdapterFactory;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object type) {
-		return supportedTypes.contains(type) || super.isFactoryForType(type);
-	}
-
-	/**
-	 * This implementation substitutes the factory itself as the key for the adapter.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter adapt(Notifier notifier, Object type) {
-		return super.adapt(notifier, this);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
-			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {
-				return adapter;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List<IChildCreationExtender> getChildCreationExtenders() {
-		return childCreationExtenderManager.getChildCreationExtenders();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Collection<?> getNewChildDescriptors(Object object, EditingDomain editingDomain) {
-		return childCreationExtenderManager.getNewChildDescriptors(object, editingDomain);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return childCreationExtenderManager;
-	}
-
-	/**
-	 * This adds a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void addListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.addListener(notifyChangedListener);
-	}
-
-	/**
-	 * This removes a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void removeListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.removeListener(notifyChangedListener);
-	}
-
-	/**
-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void fireNotifyChanged(Notification notification) {
-		changeNotifier.fireNotifyChanged(notification);
-
-		if (parentAdapterFactory != null) {
-			parentAdapterFactory.fireNotifyChanged(notification);
-		}
-	}
-
-	/**
-	 * This disposes all of the item providers created by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void dispose() {
-		if (papyrusConfigurationItemProvider != null) {
-			papyrusConfigurationItemProvider.dispose();
-		}
-		if (papyrusViewpointItemProvider != null) {
-			papyrusViewpointItemProvider.dispose();
-		}
-		if (papyrusViewItemProvider != null) {
-			papyrusViewItemProvider.dispose();
-		}
-		if (papyrusDiagramItemProvider != null) {
-			papyrusDiagramItemProvider.dispose();
-		}
-		if (papyrusSyncTableItemProvider != null) {
-			papyrusSyncTableItemProvider.dispose();
-		}
-		if (papyrusTableItemProvider != null) {
-			papyrusTableItemProvider.dispose();
-		}
-		if (modelRuleItemProvider != null) {
-			modelRuleItemProvider.dispose();
-		}
-		if (owningRuleItemProvider != null) {
-			owningRuleItemProvider.dispose();
-		}
-		if (childRuleItemProvider != null) {
-			childRuleItemProvider.dispose();
-		}
-		if (paletteRuleItemProvider != null) {
-			paletteRuleItemProvider.dispose();
-		}
-		if (pathElementItemProvider != null) {
-			pathElementItemProvider.dispose();
-		}
-		if (categoryItemProvider != null) {
-			categoryItemProvider.dispose();
-		}
-		if (modelAutoCreateItemProvider != null) {
-			modelAutoCreateItemProvider.dispose();
-		}
-		if (rootAutoSelectItemProvider != null) {
-			rootAutoSelectItemProvider.dispose();
-		}
-		if (assistantRuleItemProvider != null) {
-			assistantRuleItemProvider.dispose();
-		}
-	}
-
-	/**
-	 * A child creation extender for the {@link Iso42010Package}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static class Iso42010ChildCreationExtender implements IChildCreationExtender {
-		/**
-		 * The switch for creating child descriptors specific to each extended class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		protected static class CreationSwitch extends Iso42010Switch<Object> {
-			/**
-			 * The child descriptors being populated.
-			 * <!-- begin-user-doc -->
-			 * <!-- end-user-doc -->
-			 * @generated
-			 */
-			protected List<Object> newChildDescriptors;
-
-			/**
-			 * The domain in which to create the children.
-			 * <!-- begin-user-doc -->
-			 * <!-- end-user-doc -->
-			 * @generated
-			 */
-			protected EditingDomain editingDomain;
-
-			/**
-			 * Creates the a switch for populating child descriptors in the given domain.
-			 * <!-- begin-user-doc -->
-			 * <!-- end-user-doc -->
-			 * @generated
-			 */
-			CreationSwitch(List<Object> newChildDescriptors, EditingDomain editingDomain) {
-				this.newChildDescriptors = newChildDescriptors;
-				this.editingDomain = editingDomain;
-			}
-
-			/**
-			 * <!-- begin-user-doc -->
-			 * <!-- end-user-doc -->
-			 * @generated
-			 */
-			@Override
-			public Object caseArchitectureDescription(ArchitectureDescription object) {
-				newChildDescriptors.add(createChildParameter(Iso42010Package.Literals.ARCHITECTURE_DESCRIPTION__VIEWPOINTS,
-						ConfigurationFactory.eINSTANCE.createPapyrusViewpoint()));
-
-				return null;
-			}
-
-			/**
-			 * <!-- begin-user-doc -->
-			 * <!-- end-user-doc -->
-			 * @generated
-			 */
-			@Override
-			public Object caseArchitectureViewpoint(ArchitectureViewpoint object) {
-				newChildDescriptors.add(createChildParameter(Iso42010Package.Literals.ARCHITECTURE_VIEWPOINT__MODEL_KINDS,
-						ConfigurationFactory.eINSTANCE.createPapyrusView()));
-
-				newChildDescriptors.add(createChildParameter(Iso42010Package.Literals.ARCHITECTURE_VIEWPOINT__MODEL_KINDS,
-						ConfigurationFactory.eINSTANCE.createPapyrusDiagram()));
-
-				newChildDescriptors.add(createChildParameter(Iso42010Package.Literals.ARCHITECTURE_VIEWPOINT__MODEL_KINDS,
-						ConfigurationFactory.eINSTANCE.createPapyrusSyncTable()));
-
-				newChildDescriptors.add(createChildParameter(Iso42010Package.Literals.ARCHITECTURE_VIEWPOINT__MODEL_KINDS,
-						ConfigurationFactory.eINSTANCE.createPapyrusTable()));
-
-				return null;
-			}
-
-			/**
-			 * <!-- begin-user-doc -->
-			 * <!-- end-user-doc -->
-			 * @generated
-			 */
-			@Override
-			public Object caseArchitectureFramework(ArchitectureFramework object) {
-				newChildDescriptors.add(createChildParameter(Iso42010Package.Literals.ARCHITECTURE_FRAMEWORK__VIEWPOINTS,
-						ConfigurationFactory.eINSTANCE.createPapyrusViewpoint()));
-
-				return null;
-			}
-
-			/**
-			 * <!-- begin-user-doc -->
-			 * <!-- end-user-doc -->
-			 * @generated
-			 */
-			protected CommandParameter createChildParameter(Object feature, Object child) {
-				return new CommandParameter(null, feature, child);
-			}
-
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public Collection<Object> getNewChildDescriptors(Object object, EditingDomain editingDomain) {
-			ArrayList<Object> result = new ArrayList<Object>();
-			new CreationSwitch(result, editingDomain).doSwitch((EObject) object);
-			return result;
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public ResourceLocator getResourceLocator() {
-			return ConfigurationEditPlugin.INSTANCE;
-		}
-	}
-
-}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/PapyrusConfigurationItemProvider.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/PapyrusConfigurationItemProvider.java
deleted file mode 100644
index 2df4e7d7ece..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/PapyrusConfigurationItemProvider.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.viewpoints.configuration.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.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationFactory;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.viewpoints.configuration.EPackagePropertyDescriptor;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusConfiguration;
-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Factory;
-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package;
-import org.eclipse.papyrus.infra.viewpoints.iso42010.provider.ArchitectureFrameworkItemProvider;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusConfiguration} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class PapyrusConfigurationItemProvider
-		extends ArchitectureFrameworkItemProvider {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PapyrusConfigurationItemProvider(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);
-
-			addDefaultStakeholderPropertyDescriptor(object);
-			addMetamodelPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Default Stakeholder feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDefaultStakeholderPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_PapyrusConfiguration_defaultStakeholder_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_PapyrusConfiguration_defaultStakeholder_feature", "_UI_PapyrusConfiguration_type"),
-				ConfigurationPackage.Literals.PAPYRUS_CONFIGURATION__DEFAULT_STAKEHOLDER,
-				true,
-				false,
-				true,
-				null,
-				null,
-				null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Metamodel feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated NOT
-	 */
-	protected void addMetamodelPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new EPackagePropertyDescriptor(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_PapyrusConfiguration_metamodel_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_PapyrusConfiguration_metamodel_feature", "_UI_PapyrusConfiguration_type"),
-				ConfigurationPackage.Literals.PAPYRUS_CONFIGURATION__METAMODEL,
-				true,
-				false,
-				true,
-				null,
-				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(ConfigurationPackage.Literals.PAPYRUS_CONFIGURATION__CATEGORIES);
-		}
-		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 PapyrusConfiguration.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated NOT - Custom Image
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/PapyrusConfiguration.png"));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected boolean shouldComposeCreationImage() {
-		return true;
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	@Override
-	public String getText(Object object) {
-		PapyrusConfiguration config = (PapyrusConfiguration) object;
-		if (config.getMetamodel() != null) {
-			return "Papyrus Configuration (" + config.getMetamodel().getNsURI() + ")";
-		}
-		return "Papyrus Configuration (?)";
-	}
-
-	/**
-	 * 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(PapyrusConfiguration.class)) {
-		case ConfigurationPackage.PAPYRUS_CONFIGURATION__CATEGORIES:
-			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 -->
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		newChildDescriptors.add(createChildParameter(Iso42010Package.Literals.ARCHITECTURE_FRAMEWORK__VIEWPOINTS,
-				ConfigurationFactory.eINSTANCE.createPapyrusViewpoint()));
-
-		newChildDescriptors.add(createChildParameter(Iso42010Package.Literals.ARCHITECTURE_FRAMEWORK__STAKEHOLDERS,
-				Iso42010Factory.eINSTANCE.createStakeholder()));
-
-		newChildDescriptors.add(createChildParameter(ConfigurationPackage.Literals.PAPYRUS_CONFIGURATION__CATEGORIES,
-				ConfigurationFactory.eINSTANCE.createCategory()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender) adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/PapyrusDiagramItemProvider.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/PapyrusDiagramItemProvider.java
deleted file mode 100644
index 1ddfe373fbe..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/PapyrusDiagramItemProvider.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.viewpoints.configuration.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.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationFactory;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class PapyrusDiagramItemProvider
-		extends PapyrusViewItemProvider {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PapyrusDiagramItemProvider(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);
-
-			addCustomPalettePropertyDescriptor(object);
-			addCustomStylePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Custom Palette feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addCustomPalettePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_PapyrusDiagram_customPalette_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_PapyrusDiagram_customPalette_feature", "_UI_PapyrusDiagram_type"),
-				ConfigurationPackage.Literals.PAPYRUS_DIAGRAM__CUSTOM_PALETTE,
-				true,
-				false,
-				false,
-				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				null,
-				null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Custom Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addCustomStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_PapyrusDiagram_customStyle_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_PapyrusDiagram_customStyle_feature", "_UI_PapyrusDiagram_type"),
-				ConfigurationPackage.Literals.PAPYRUS_DIAGRAM__CUSTOM_STYLE,
-				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(ConfigurationPackage.Literals.PAPYRUS_DIAGRAM__CHILD_RULES);
-			childrenFeatures.add(ConfigurationPackage.Literals.PAPYRUS_DIAGRAM__PALETTE_RULES);
-			childrenFeatures.add(ConfigurationPackage.Literals.PAPYRUS_DIAGRAM__ASSISTANT_RULES);
-		}
-		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 PapyrusDiagram.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated NOT - Custom Image
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/PapyrusDiagram.png"));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected boolean shouldComposeCreationImage() {
-		return true;
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	@Override
-	public String getText(Object object) {
-		return getTextFor((PapyrusDiagram) object);
-	}
-
-	/**
-	 * 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(PapyrusDiagram.class)) {
-		case ConfigurationPackage.PAPYRUS_DIAGRAM__CUSTOM_PALETTE:
-		case ConfigurationPackage.PAPYRUS_DIAGRAM__CUSTOM_STYLE:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		case ConfigurationPackage.PAPYRUS_DIAGRAM__CHILD_RULES:
-		case ConfigurationPackage.PAPYRUS_DIAGRAM__PALETTE_RULES:
-		case ConfigurationPackage.PAPYRUS_DIAGRAM__ASSISTANT_RULES:
-			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(ConfigurationPackage.Literals.PAPYRUS_DIAGRAM__CHILD_RULES,
-				ConfigurationFactory.eINSTANCE.createChildRule()));
-
-		newChildDescriptors.add(createChildParameter(ConfigurationPackage.Literals.PAPYRUS_DIAGRAM__PALETTE_RULES,
-				ConfigurationFactory.eINSTANCE.createPaletteRule()));
-
-		newChildDescriptors.add(createChildParameter(ConfigurationPackage.Literals.PAPYRUS_DIAGRAM__ASSISTANT_RULES,
-				ConfigurationFactory.eINSTANCE.createAssistantRule()));
-	}
-
-}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/PapyrusViewItemProvider.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/PapyrusViewItemProvider.java
deleted file mode 100644
index 1fcdc1b4554..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/PapyrusViewItemProvider.java
+++ /dev/null
@@ -1,307 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.viewpoints.configuration.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.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationFactory;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusViewpoint;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ProfilePropertyDescriptor;
-import org.eclipse.papyrus.infra.viewpoints.iso42010.provider.ModelKindItemProvider;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class PapyrusViewItemProvider
-		extends ModelKindItemProvider {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PapyrusViewItemProvider(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);
-
-			addIconPropertyDescriptor(object);
-			addParentPropertyDescriptor(object);
-			addProfilesPropertyDescriptor(object);
-			addImplementationIDPropertyDescriptor(object);
-			addCategoriesPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * 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_PapyrusView_icon_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_PapyrusView_icon_feature", "_UI_PapyrusView_type"),
-				ConfigurationPackage.Literals.PAPYRUS_VIEW__ICON,
-				true,
-				false,
-				false,
-				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				null,
-				null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Parent feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addParentPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_PapyrusView_parent_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_PapyrusView_parent_feature", "_UI_PapyrusView_type"),
-				ConfigurationPackage.Literals.PAPYRUS_VIEW__PARENT,
-				true,
-				false,
-				true,
-				null,
-				null,
-				null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Profiles feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated NOT
-	 */
-	protected void addProfilesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ProfilePropertyDescriptor(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_PapyrusView_profiles_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_PapyrusView_profiles_feature", "_UI_PapyrusView_type"),
-				ConfigurationPackage.Literals.PAPYRUS_VIEW__PROFILES,
-				true,
-				false,
-				true,
-				null,
-				null,
-				null)));
-	}
-
-	/**
-	 * This adds a property descriptor for the Implementation ID feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addImplementationIDPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_PapyrusView_implementationID_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_PapyrusView_implementationID_feature", "_UI_PapyrusView_type"),
-				ConfigurationPackage.Literals.PAPYRUS_VIEW__IMPLEMENTATION_ID,
-				true,
-				false,
-				false,
-				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				null,
-				null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Categories feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addCategoriesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_PapyrusView_categories_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_PapyrusView_categories_feature", "_UI_PapyrusView_type"),
-				ConfigurationPackage.Literals.PAPYRUS_VIEW__CATEGORIES,
-				true,
-				false,
-				true,
-				null,
-				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(ConfigurationPackage.Literals.PAPYRUS_VIEW__MODEL_RULES);
-			childrenFeatures.add(ConfigurationPackage.Literals.PAPYRUS_VIEW__OWNING_RULES);
-		}
-		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 PapyrusView.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated NOT - Custom Image
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/PapyrusView.png"));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected boolean shouldComposeCreationImage() {
-		return true;
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((PapyrusView) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_PapyrusView_type") : getString("_UI_PapyrusView_type") + " " + label;
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	protected static String getTextFor(PapyrusView view) {
-		PapyrusViewpoint vp = (PapyrusViewpoint) view.eContainer();
-		if (view.getName() == null) {
-			return (vp.getName() + " :: <natural> [" + view.getImplementationID() + "]");
-		}
-		return (vp.getName() + " :: " + view.getName());
-	}
-
-	/**
-	 * 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(PapyrusView.class)) {
-		case ConfigurationPackage.PAPYRUS_VIEW__ICON:
-		case ConfigurationPackage.PAPYRUS_VIEW__IMPLEMENTATION_ID:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		case ConfigurationPackage.PAPYRUS_VIEW__MODEL_RULES:
-		case ConfigurationPackage.PAPYRUS_VIEW__OWNING_RULES:
-			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(ConfigurationPackage.Literals.PAPYRUS_VIEW__MODEL_RULES,
-				ConfigurationFactory.eINSTANCE.createModelRule()));
-
-		newChildDescriptors.add(createChildParameter(ConfigurationPackage.Literals.PAPYRUS_VIEW__OWNING_RULES,
-				ConfigurationFactory.eINSTANCE.createOwningRule()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender) adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/PapyrusViewpointItemProvider.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/PapyrusViewpointItemProvider.java
deleted file mode 100644
index aaf8e735d1e..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/PapyrusViewpointItemProvider.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.viewpoints.configuration.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.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationFactory;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusViewpoint;
-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package;
-import org.eclipse.papyrus.infra.viewpoints.iso42010.provider.ArchitectureViewpointItemProvider;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusViewpoint} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class PapyrusViewpointItemProvider
-		extends ArchitectureViewpointItemProvider {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PapyrusViewpointItemProvider(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);
-
-			addParentPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Parent feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addParentPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_PapyrusViewpoint_parent_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_PapyrusViewpoint_parent_feature", "_UI_PapyrusViewpoint_type"),
-				ConfigurationPackage.Literals.PAPYRUS_VIEWPOINT__PARENT,
-				true,
-				false,
-				true,
-				null,
-				null,
-				null));
-	}
-
-	/**
-	 * This returns PapyrusViewpoint.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated NOT - Custom Image
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/PapyrusViewpoint.png"));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected boolean shouldComposeCreationImage() {
-		return true;
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((PapyrusViewpoint) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_PapyrusViewpoint_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 -->
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		newChildDescriptors.add(createChildParameter(Iso42010Package.Literals.ARCHITECTURE_VIEWPOINT__MODEL_KINDS,
-				ConfigurationFactory.eINSTANCE.createPapyrusDiagram()));
-		newChildDescriptors.add(createChildParameter(Iso42010Package.Literals.ARCHITECTURE_VIEWPOINT__MODEL_KINDS,
-				ConfigurationFactory.eINSTANCE.createPapyrusTable()));
-		newChildDescriptors.add(createChildParameter(Iso42010Package.Literals.ARCHITECTURE_VIEWPOINT__MODEL_KINDS,
-				ConfigurationFactory.eINSTANCE.createPapyrusSyncTable()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender) adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/RuleItemProvider.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/RuleItemProvider.java
deleted file mode 100644
index 84bce077239..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/provider/RuleItemProvider.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.viewpoints.configuration.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.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.viewpoints.configuration.Rule;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.viewpoints.configuration.Rule} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class RuleItemProvider
-		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 RuleItemProvider(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);
-
-			addPermitPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Permit feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addPermitPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_Rule_permit_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Rule_permit_feature", "_UI_Rule_type"),
-				ConfigurationPackage.Literals.RULE__PERMIT,
-				true,
-				false,
-				false,
-				ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				null,
-				null));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected boolean shouldComposeCreationImage() {
-		return true;
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		Rule rule = (Rule) object;
-		return getString("_UI_Rule_type") + " " + rule.isPermit();
-	}
-
-	/**
-	 * 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(Rule.class)) {
-		case ConfigurationPackage.RULE__PERMIT:
-			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 ((IChildCreationExtender) adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/.project b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/.project
deleted file mode 100755
index 4c9b13f86c6..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/.project
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.infra.viewpoints.configuration.editor</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>
-		<buildCommand>
-			<name>org.eclipse.oomph.version.VersionBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>check.maven.pom</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>ignore.lower.bound.dependency.ranges</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>release.path</key>
-					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.oomph.version.VersionNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100755
index 4759947300a..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-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

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/.settings/org.eclipse.pde.api.tools.prefs b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 23fb95e120f..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,98 +0,0 @@
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-API_USE_SCAN_FIELD_SEVERITY=Error
-API_USE_SCAN_METHOD_SEVERITY=Error
-API_USE_SCAN_TYPE_SEVERITY=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Warning
-ILLEGAL_IMPLEMENT=Warning
-ILLEGAL_INSTANTIATE=Warning
-ILLEGAL_OVERRIDE=Warning
-ILLEGAL_REFERENCE=Warning
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_ANNOTATION=Ignore
-INVALID_JAVADOC_TAG=Ignore
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
-LEAK_EXTEND=Warning
-LEAK_FIELD_DECL=Warning
-LEAK_IMPLEMENT=Warning
-LEAK_METHOD_PARAM=Warning
-LEAK_METHOD_RETURN_TYPE=Warning
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Warning
-automatically_removed_unused_problem_filters=Enabled
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Warning
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/META-INF/MANIFEST.MF b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/META-INF/MANIFEST.MF
deleted file mode 100755
index 4fedcd370f8..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)";visibility:=reexport,
- org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
- org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)",
- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.viewpoints.configuration.edit;bundle-version="[2.0.0,3.0.0)"
-Export-Package: org.eclipse.papyrus.infra.viewpoints.configuration.presentation
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.infra.viewpoints.configuration.presentation.ConfigurationEditorPlugin$Implementation
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.configuration.editor;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/build.properties b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/build.properties
deleted file mode 100644
index ae68638f897..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-
-bin.includes = .,\
-               icons/,\
-               META-INF/,\
-               plugin.xml,\
-               plugin.properties,\
-               about.html
-jars.compile.order = .
-source.. = src-gen/
-output.. = bin
-src.includes = about.html
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/icons/full/obj16/ConfigurationModelFile.png b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/icons/full/obj16/ConfigurationModelFile.png
deleted file mode 100755
index bf425f3de24..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/icons/full/obj16/ConfigurationModelFile.png
+++ /dev/null
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/icons/full/wizban/NewConfiguration.png b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/icons/full/wizban/NewConfiguration.png
deleted file mode 100755
index 22d81e43298..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/icons/full/wizban/NewConfiguration.png
+++ /dev/null
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/icons/full/wizban/NewConfiguration.svg b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/icons/full/wizban/NewConfiguration.svg
deleted file mode 100755
index a99b314ac64..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/icons/full/wizban/NewConfiguration.svg
+++ /dev/null
@@ -1,275 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="750"
-   height="660"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="NewConfiguration.svg"
-   inkscape:export-filename="C:\Users\LW238780\Desktop\Wizban.png"
-   inkscape:export-xdpi="9"
-   inkscape:export-ydpi="9">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3795">
-      <stop
-         style="stop-color:#c8c8ff;stop-opacity:1;"
-         offset="0"
-         id="stop3797" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.58823532;"
-         offset="1"
-         id="stop3799" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3783">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3785" />
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="1"
-         id="stop3787" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3765">
-      <stop
-         style="stop-color:#e6e6ff;stop-opacity:1;"
-         offset="0"
-         id="stop3767" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3769" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#aaaaaa;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="444.28577"
-       y1="971.64789"
-       x2="604.28577"
-       y2="163.09605"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3765"
-       id="linearGradient3771"
-       x1="444.28577"
-       y1="971.64789"
-       x2="604.28577"
-       y2="163.09605"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3765"
-       id="linearGradient3019"
-       gradientUnits="userSpaceOnUse"
-       x1="444.28577"
-       y1="971.64789"
-       x2="444.28577"
-       y2="201.53497" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3021"
-       gradientUnits="userSpaceOnUse"
-       x1="444.28577"
-       y1="971.64789"
-       x2="444.28577"
-       y2="201.53497" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3783"
-       id="linearGradient3023"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.25,0,0,1.25,-222.5,-53.090544)"
-       x1="758.57141"
-       y1="343.79074"
-       x2="948.75952"
-       y2="153.60266" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3795"
-       id="linearGradient3801"
-       x1="737.41138"
-       y1="1017.2488"
-       x2="230.78159"
-       y2="358.62936"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3783"
-       id="linearGradient3788"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.62224447,0,0,0.62224447,-121.84293,434.73891)"
-       x1="758.57141"
-       y1="343.79074"
-       x2="948.75952"
-       y2="153.60266" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3765"
-       id="linearGradient3791"
-       gradientUnits="userSpaceOnUse"
-       x1="444.28577"
-       y1="971.64789"
-       x2="444.28577"
-       y2="201.53497"
-       gradientTransform="matrix(0.49779558,0,0,0.49779558,-11.083413,461.16715)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3793"
-       gradientUnits="userSpaceOnUse"
-       x1="444.28577"
-       y1="971.64789"
-       x2="444.28577"
-       y2="201.53497"
-       gradientTransform="matrix(0.49779558,0,0,0.49779558,-11.083413,461.16715)" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.9899495"
-     inkscape:cx="5.7054101"
-     inkscape:cy="384.16226"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3910"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="1178"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="File"
-     style="display:inline"
-     transform="translate(0,-364)">
-    <rect
-       style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-       id="rect3025"
-       width="750"
-       height="660"
-       x="0"
-       y="364.00003" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#9696c8;fill-opacity:0.58823532;stroke:none"
-       id="path3803"
-       sodipodi:cx="550.53314"
-       sodipodi:cy="298.36539"
-       sodipodi:rx="261.62952"
-       sodipodi:ry="195.96959"
-       d="m 812.16266,298.36539 c 0,108.23101 -117.13553,195.96959 -261.62952,195.96959 -144.49399,0 -261.62951,-87.73858 -261.62951,-195.96959 0,-108.23102 117.13552,-195.96959 261.62951,-195.96959 144.49399,0 261.62952,87.73857 261.62952,195.96959 z"
-       transform="matrix(0.63782687,-0.55249393,0.72923815,0.48323784,-19.016144,951.1577)" />
-    <path
-       style="fill:url(#linearGradient3791);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3793);stroke-width:12.44488907;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       d="m 113.6403,537.28719 233.68912,0 114.21818,114.21816 -3e-5,308.35844 -347.90727,0 z"
-       id="rect2985"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
-    <path
-       style="fill:url(#linearGradient3788);fill-opacity:1;stroke:none;display:inline"
-       d="m 344.84043,529.54544 124.44889,124.44889 -124.44889,0 z"
-       id="rect3780"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
-    <g
-       id="g3910"
-       transform="matrix(0.49779558,0,0,0.49779558,-11.083413,475.28572)">
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="rect3797"
-         d="m 333.91746,576.89245 331.1681,-11.03899 c 12.10305,20.96311 10.59675,36.84058 0,55.19468 l -331.1681,-11.03888 c -6.07195,-10.5169 -7.99455,-19.26985 0,-33.11681 z"
-         inkscape:transform-center-x="-280"
-         style="fill:#9ed000;fill-opacity:1;stroke:#000000;stroke-width:10;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
-      <path
-         transform="matrix(0.98227829,0,0,0.98227829,-230.56514,-74.217723)"
-         d="m 512.85715,679.71429 c 0,46.54972 -37.73599,84.28572 -84.28571,84.28572 -46.54971,0 -84.28571,-37.736 -84.28571,-84.28572 0,-46.54971 37.736,-84.28571 84.28571,-84.28571 46.54972,0 84.28571,37.736 84.28571,84.28571 z"
-         sodipodi:ry="84.285713"
-         sodipodi:rx="84.285713"
-         sodipodi:cy="679.71429"
-         sodipodi:cx="428.57144"
-         id="path3027"
-         style="fill:#009ab9;fill-opacity:0.99607843;fill-rule:evenodd;stroke:#000000;stroke-width:10.18041420000000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         sodipodi:type="arc" />
-      <path
-         inkscape:transform-center-y="-143.60032"
-         style="fill:#9ed000;fill-opacity:1;stroke:#000000;stroke-width:10;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         inkscape:transform-center-x="-243.7231"
-         d="M 306.62797,508.16338 587.90846,333.01926 c 20.96312,12.10306 27.59734,26.60652 27.59734,47.8 L 323.18637,536.84337 c -10.51692,-6.07194 -16.5584,-12.69091 -16.5584,-28.67999 z"
-         id="path3856"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:transform-center-y="-243.72307"
-         style="fill:#9ed000;fill-opacity:1;stroke:#000000;stroke-width:10;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         inkscape:transform-center-x="-143.60036"
-         d="m 248.63004,462.28699 156.02398,-292.3195 c 24.20614,0 37.20327,9.24325 47.80001,27.59734 l -175.144,281.28057 c -12.14388,0 -20.68545,-2.71145 -28.67999,-16.55841 z"
-         id="path3862"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:transform-center-y="143.60036"
-         style="fill:#9ed000;fill-opacity:1;stroke:#000000;stroke-width:10;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         inkscape:transform-center-x="-243.72307"
-         d="m 323.18631,650.05833 292.31949,156.024 c 0,24.20612 -9.24324,37.20325 -27.59734,47.80001 l -281.28055,-175.144 c -2e-5,-12.14389 2.71144,-20.68545 16.5584,-28.68001 z"
-         id="path3864"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:transform-center-y="243.72308"
-         style="fill:#9ed000;fill-opacity:1;stroke:#000000;stroke-width:10;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         inkscape:transform-center-x="-143.60031"
-         d="m 277.30993,708.05626 175.1441,281.28046 c -12.10307,20.96318 -26.60651,27.59738 -47.80001,27.59738 L 248.62992,724.61466 c 6.07194,-10.5169 12.69091,-16.5584 28.68001,-16.5584 z"
-         id="path3866"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-    </g>
-  </g>
-</svg>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/plugin.xml b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/plugin.xml
deleted file mode 100755
index a7bc395be29..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/plugin.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-

-<!--

--->

-

-<plugin>

-

-   <extension point="org.eclipse.ui.newWizards">

-      <!-- @generated configuration -->

-      <wizard

-            id="org.eclipse.papyrus.infra.viewpoints.configuration.presentation.ConfigurationModelWizardID"

-            name="%_UI_ConfigurationModelWizard_label"

-            class="org.eclipse.papyrus.infra.viewpoints.configuration.presentation.ConfigurationModelWizard"

-            category="org.eclipse.papyrus.wizards.category"

-            icon="icons/full/obj16/ConfigurationModelFile.png">

-         <description>%_UI_ConfigurationModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-

-   <extension point="org.eclipse.ui.editors">

-      <!-- @generated configuration -->

-      <editor

-            id="org.eclipse.papyrus.infra.viewpoints.configuration.presentation.ConfigurationEditorID"

-            name="%_UI_ConfigurationEditor_label"

-            icon="icons/full/obj16/ConfigurationModelFile.png"

-            extensions="configuration"

-            class="org.eclipse.papyrus.infra.viewpoints.configuration.presentation.ConfigurationEditor"

-            contributorClass="org.eclipse.papyrus.infra.viewpoints.configuration.presentation.ConfigurationActionBarContributor">

-      </editor>

-   </extension>

-

-</plugin>

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/.project b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/.project
deleted file mode 100755
index d952cd176b3..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/.project
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.infra.viewpoints.configuration</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>
-		<buildCommand>
-			<name>org.eclipse.oomph.version.VersionBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>check.maven.pom</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>ignore.lower.bound.dependency.ranges</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>release.path</key>
-					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.oomph.version.VersionNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100755
index 4759947300a..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-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

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/.settings/org.eclipse.pde.api.tools.prefs b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 23fb95e120f..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,98 +0,0 @@
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-API_USE_SCAN_FIELD_SEVERITY=Error
-API_USE_SCAN_METHOD_SEVERITY=Error
-API_USE_SCAN_TYPE_SEVERITY=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Warning
-ILLEGAL_IMPLEMENT=Warning
-ILLEGAL_INSTANTIATE=Warning
-ILLEGAL_OVERRIDE=Warning
-ILLEGAL_REFERENCE=Warning
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_ANNOTATION=Ignore
-INVALID_JAVADOC_TAG=Ignore
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
-LEAK_EXTEND=Warning
-LEAK_FIELD_DECL=Warning
-LEAK_IMPLEMENT=Warning
-LEAK_METHOD_PARAM=Warning
-LEAK_METHOD_RETURN_TYPE=Warning
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Warning
-automatically_removed_unused_problem_filters=Enabled
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Warning
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/META-INF/MANIFEST.MF b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/META-INF/MANIFEST.MF
deleted file mode 100644
index d202aea1346..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.viewpoints.configuration,
- org.eclipse.papyrus.infra.viewpoints.configuration.impl,
- org.eclipse.papyrus.infra.viewpoints.configuration.ui,
- org.eclipse.papyrus.infra.viewpoints.configuration.util
-Require-Bundle: org.eclipse.jface;bundle-version="[3.12.0,4.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.viewpoints.iso42010;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.services.edit;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 2.0.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.infra.viewpoints.configuration.Activator$Implementation
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.configuration;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/build.properties b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/build.properties
deleted file mode 100644
index e35efe8a7f0..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/build.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-
-bin.includes = .,\
-               model/,\
-               META-INF/,\
-               plugin.xml,\
-               plugin.properties,\
-               about.html,\
-               icons/
-jars.compile.order = .
-source.. = src/,\
-           src-gen/
-output.. = bin/
-src.includes = about.html
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/ChildRule.svg b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/ChildRule.svg
deleted file mode 100755
index df1f68eebf1..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/ChildRule.svg
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1024"
-   height="1024"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="rule_child.svg"
-   inkscape:export-filename="C:\Users\LW238780\Desktop\cviewpoint.png"
-   inkscape:export-xdpi="1.41"
-   inkscape:export-ydpi="1.41">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3976">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3978" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3980" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3940">
-      <stop
-         style="stop-color:#ff6400;stop-opacity:1;"
-         offset="0"
-         id="stop3942" />
-      <stop
-         style="stop-color:#ffd200;stop-opacity:1;"
-         offset="1"
-         id="stop3944" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3783">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3785" />
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="1"
-         id="stop3787" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3765">
-      <stop
-         style="stop-color:#e6e6ff;stop-opacity:1;"
-         offset="0"
-         id="stop3767" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3769" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#aaaaaa;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="444.28577"
-       y1="971.64789"
-       x2="604.28577"
-       y2="163.09605"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3765"
-       id="linearGradient3771"
-       x1="444.28577"
-       y1="971.64789"
-       x2="604.28577"
-       y2="163.09605"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3940"
-       id="radialGradient3946"
-       cx="1127.8128"
-       cy="480.05185"
-       fx="1127.8128"
-       fy="480.05185"
-       r="150"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2835941,0,0,1.2835941,-647.65383,-392.19171)" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.24410375"
-     inkscape:cx="1591.3792"
-     inkscape:cy="-208.74877"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer2"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1178"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Element"
-     style="display:inline">
-    <g
-       id="g3007"
-       transform="matrix(0.55555556,0,0,0.55555556,26.666666,38.44444)">
-      <rect
-         y="174"
-         x="70"
-         height="780"
-         width="880"
-         id="rect3948"
-         style="fill:#ffffff;fill-opacity:1;stroke:#000096;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <rect
-         y="169"
-         x="70"
-         height="180"
-         width="880"
-         id="rect3948-5"
-         style="fill:#c8c8ff;fill-opacity:1;stroke:#000096;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
-      <rect
-         y="424"
-         x="160"
-         height="150"
-         width="350"
-         id="rect3984"
-         style="fill:#ffc800;fill-opacity:1;stroke:#ff6400;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <rect
-         style="fill:#ffc800;fill-opacity:1;stroke:#ff6400;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="rect3997"
-         width="350"
-         height="150"
-         x="510"
-         y="714" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         id="path3999"
-         d="m 250,574 0,225 260,0"
-         style="fill:none;stroke:#505050;stroke-width:20;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    </g>
-    <rect
-       style="fill:#c8c8c8;fill-opacity:1;stroke:#505050;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect3014"
-       width="600"
-       height="200"
-       x="360"
-       y="754" />
-    <path
-       style="fill:none;stroke:#ff5000;stroke-width:60;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:120, 60;stroke-dashoffset:0"
-       d="m 350,874 -160,0 0,-300"
-       id="path3786"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="Tool"
-     style="display:none">
-    <path
-       style="fill:url(#radialGradient3946);fill-opacity:1;stroke:#ff5000;stroke-width:14.92178059;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 748.65625,31.460876 0,141.195364 -141.19536,0 0,102.68751 141.19536,0 0,141.19536 102.68751,0 0,-141.19536 141.19535,0 0,-102.68751 -141.19535,0 0,-141.195364 -102.68751,0 z"
-       id="rect3919"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/ElementImport.svg b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/ElementImport.svg
deleted file mode 100755
index 092e2903e84..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/ElementImport.svg
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1024"
-   height="1024"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="PapyrusDiagram.svg"
-   inkscape:export-filename="C:\Users\LW238780\Desktop\import.png"
-   inkscape:export-xdpi="1.41"
-   inkscape:export-ydpi="1.41">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3976">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3978" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3980" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3940">
-      <stop
-         style="stop-color:#ff6400;stop-opacity:1;"
-         offset="0"
-         id="stop3942" />
-      <stop
-         style="stop-color:#ffd200;stop-opacity:1;"
-         offset="1"
-         id="stop3944" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3783">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3785" />
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="1"
-         id="stop3787" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3765">
-      <stop
-         style="stop-color:#e6e6ff;stop-opacity:1;"
-         offset="0"
-         id="stop3767" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3769" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#aaaaaa;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="444.28577"
-       y1="971.64789"
-       x2="604.28577"
-       y2="163.09605"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3765"
-       id="linearGradient3771"
-       x1="444.28577"
-       y1="971.64789"
-       x2="604.28577"
-       y2="163.09605"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3940"
-       id="radialGradient3946"
-       cx="1127.8128"
-       cy="480.05185"
-       fx="1127.8128"
-       fy="480.05185"
-       r="150"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2835941,0,0,1.2835941,-647.65383,-392.19171)" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.34521484"
-     inkscape:cx="553.90512"
-     inkscape:cy="756.42382"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1370"
-     inkscape:window-height="894"
-     inkscape:window-x="142"
-     inkscape:window-y="116"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Viewpoint"
-     style="display:inline"
-     sodipodi:insensitive="true">
-    <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:#000096;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect3948"
-       width="880"
-       height="780"
-       x="70"
-       y="174" />
-    <rect
-       style="fill:#c8c8ff;fill-opacity:1;stroke:#000096;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="rect3948-5"
-       width="880"
-       height="180"
-       x="70"
-       y="169" />
-    <rect
-       style="fill:#ffc800;fill-opacity:1;stroke:#ff6400;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect3984"
-       width="350"
-       height="150"
-       x="160"
-       y="424" />
-    <rect
-       y="714"
-       x="510"
-       height="150"
-       width="350"
-       id="rect3997"
-       style="fill:#ffc800;fill-opacity:1;stroke:#ff6400;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       style="fill:none;stroke:#505050;stroke-width:20;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 250,574 0,225 260,0"
-       id="path3999"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="Import"
-     style="display:inline">
-    <path
-       style="fill:#009600;fill-opacity:1;stroke:none"
-       d="M 173.66714,313.39139 388.79527,686.00423 761.40811,470.87611 543.52198,437.69126 C 591.25878,259.53507 805.51507,85.617118 1004.9441,32.180244 764.68554,-32.196808 385.4246,134.35246 323.33011,366.09224 z"
-       id="path3012"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="Tool"
-     style="display:none"
-     sodipodi:insensitive="true">
-    <path
-       style="fill:url(#radialGradient3946);fill-opacity:1;stroke:#ff5000;stroke-width:14.92178059;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 748.65625,31.460876 0,141.195364 -141.19536,0 0,102.68751 141.19536,0 0,141.19536 102.68751,0 0,-141.19536 141.19535,0 0,-102.68751 -141.19535,0 0,-141.195364 -102.68751,0 z"
-       id="rect3919"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/ModelRule.svg b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/ModelRule.svg
deleted file mode 100755
index aa5342a2568..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/ModelRule.svg
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1024"
-   height="1024"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="rule_model.svg"
-   inkscape:export-filename="C:\Users\LW238780\Desktop\icons\rule_model_tool.png"
-   inkscape:export-xdpi="1.41"
-   inkscape:export-ydpi="1.41">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3976">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3978" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3980" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3940">
-      <stop
-         style="stop-color:#ff6400;stop-opacity:1;"
-         offset="0"
-         id="stop3942" />
-      <stop
-         style="stop-color:#ffd200;stop-opacity:1;"
-         offset="1"
-         id="stop3944" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3783">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3785" />
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="1"
-         id="stop3787" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3765">
-      <stop
-         style="stop-color:#e6e6ff;stop-opacity:1;"
-         offset="0"
-         id="stop3767" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3769" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#aaaaaa;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="444.28577"
-       y1="971.64789"
-       x2="604.28577"
-       y2="163.09605"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3765"
-       id="linearGradient3771"
-       x1="444.28577"
-       y1="971.64789"
-       x2="604.28577"
-       y2="163.09605"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3940"
-       id="radialGradient3946"
-       cx="1127.8128"
-       cy="480.05185"
-       fx="1127.8128"
-       fy="480.05185"
-       r="150"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2835941,0,0,1.2835941,-647.65383,-392.19171)" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35355339"
-     inkscape:cx="-137.87568"
-     inkscape:cy="740.22194"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer2"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1178"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Element"
-     style="display:inline">
-    <rect
-       style="fill:#c8c8c8;fill-opacity:1;stroke:#505050;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect3014"
-       width="600"
-       height="200"
-       x="70"
-       y="694" />
-    <path
-       style="fill:none;fill-opacity:0.47058823999999999;stroke:#6464ff;stroke-width:10;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 355,364 585,0 -270,330 -600,0 z"
-       id="rect3831"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
-       id="path3834"
-       d="m 355,769 585,0 -270,125 -600,0 z"
-       style="fill:none;fill-opacity:0.47058823999999999;stroke:#6464ff;stroke-width:10;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       style="fill:none;fill-opacity:0.47058823999999999;stroke:#6464ff;stroke-width:10;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 670,694 940,364 940,769 670,894 z"
-       id="path3836"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:none;fill-opacity:0.47058823999999999;stroke:#6464ff;stroke-width:10;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       d="M 70,694 355,364 355,769 70,894 z"
-       id="path3836-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <g
-       style="display:inline;opacity:1"
-       id="g3007"
-       transform="matrix(0.66666667,0,0,0.66666667,310,131.33333)">
-      <rect
-         y="174"
-         x="70"
-         height="780"
-         width="880"
-         id="rect3948"
-         style="fill:#ffffff;fill-opacity:1;stroke:#000096;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <rect
-         y="169"
-         x="70"
-         height="180"
-         width="880"
-         id="rect3948-5"
-         style="fill:#c8c8ff;fill-opacity:1;stroke:#000096;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
-      <rect
-         y="424"
-         x="160"
-         height="150"
-         width="350"
-         id="rect3984"
-         style="fill:#ffc800;fill-opacity:1;stroke:#ff6400;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <rect
-         style="fill:#ffc800;fill-opacity:1;stroke:#ff6400;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="rect3997"
-         width="350"
-         height="150"
-         x="510"
-         y="714" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         id="path3999"
-         d="m 250,574 0,225 260,0"
-         style="fill:none;stroke:#505050;stroke-width:20;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="Tool"
-     style="display:inline">
-    <path
-       style="fill:url(#radialGradient3946);fill-opacity:1;stroke:#ff5000;stroke-width:14.92178059;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 748.65625,31.460876 0,141.195364 -141.19536,0 0,102.68751 141.19536,0 0,141.19536 102.68751,0 0,-141.19536 141.19535,0 0,-102.68751 -141.19535,0 0,-141.195364 -102.68751,0 z"
-       id="rect3919"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/OwningRule.svg b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/OwningRule.svg
deleted file mode 100755
index b9fa186a840..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/OwningRule.svg
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1024"
-   height="1024"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="rule_owning.svg"
-   inkscape:export-filename="C:\Users\LW238780\Desktop\cviewpoint.png"
-   inkscape:export-xdpi="1.41"
-   inkscape:export-ydpi="1.41">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3976">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3978" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3980" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3940">
-      <stop
-         style="stop-color:#ff6400;stop-opacity:1;"
-         offset="0"
-         id="stop3942" />
-      <stop
-         style="stop-color:#ffd200;stop-opacity:1;"
-         offset="1"
-         id="stop3944" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3783">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3785" />
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="1"
-         id="stop3787" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3765">
-      <stop
-         style="stop-color:#e6e6ff;stop-opacity:1;"
-         offset="0"
-         id="stop3767" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3769" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#aaaaaa;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="444.28577"
-       y1="971.64789"
-       x2="604.28577"
-       y2="163.09605"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3765"
-       id="linearGradient3771"
-       x1="444.28577"
-       y1="971.64789"
-       x2="604.28577"
-       y2="163.09605"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3940"
-       id="radialGradient3946"
-       cx="1127.8128"
-       cy="480.05185"
-       fx="1127.8128"
-       fy="480.05185"
-       r="150"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2835941,0,0,1.2835941,-647.65383,-392.19171)" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.34521484"
-     inkscape:cx="502.81712"
-     inkscape:cy="418.7586"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer2"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1370"
-     inkscape:window-height="894"
-     inkscape:window-x="223"
-     inkscape:window-y="84"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Element"
-     style="display:inline">
-    <g
-       id="g3007"
-       transform="matrix(0.55555556,0,0,0.55555556,416.66667,393.47427)">
-      <rect
-         y="174"
-         x="70"
-         height="780"
-         width="880"
-         id="rect3948"
-         style="fill:#ffffff;fill-opacity:1;stroke:#000096;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <rect
-         y="169"
-         x="70"
-         height="180"
-         width="880"
-         id="rect3948-5"
-         style="fill:#c8c8ff;fill-opacity:1;stroke:#000096;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
-      <rect
-         y="424"
-         x="160"
-         height="150"
-         width="350"
-         id="rect3984"
-         style="fill:#ffc800;fill-opacity:1;stroke:#ff6400;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <rect
-         style="fill:#ffc800;fill-opacity:1;stroke:#ff6400;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="rect3997"
-         width="350"
-         height="150"
-         x="510"
-         y="714" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         id="path3999"
-         d="m 250,574 0,225 260,0"
-         style="fill:none;stroke:#505050;stroke-width:20;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    </g>
-    <rect
-       style="fill:#c8c8c8;fill-opacity:1;stroke:#505050;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect3014"
-       width="600"
-       height="200"
-       x="60"
-       y="94" />
-    <path
-       style="fill:none;stroke:#ff5000;stroke-width:60;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:120,60;stroke-dashoffset:0"
-       d="m 150,304 0,520 300,0"
-       id="path3786"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="Tool"
-     style="display:none">
-    <path
-       style="fill:url(#radialGradient3946);fill-opacity:1;stroke:#ff5000;stroke-width:14.92178059;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 748.65625,31.460876 0,141.195364 -141.19536,0 0,102.68751 141.19536,0 0,141.19536 102.68751,0 0,-141.19536 141.19535,0 0,-102.68751 -141.19535,0 0,-141.195364 -102.68751,0 z"
-       id="rect3919"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/PaletteRule.svg b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/PaletteRule.svg
deleted file mode 100755
index fc4678b0f8c..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/PaletteRule.svg
+++ /dev/null
@@ -1,315 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1024"
-   height="1024"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="rule_palette.svg"
-   inkscape:export-filename="C:\Users\LW238780\Desktop\icons\rule_palette.png"
-   inkscape:export-xdpi="1.41"
-   inkscape:export-ydpi="1.41">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3828">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3830" />
-      <stop
-         style="stop-color:#c86400;stop-opacity:1;"
-         offset="1"
-         id="stop3832" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3808">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3810" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop3812" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3976">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3978" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3980" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3940">
-      <stop
-         style="stop-color:#ff6400;stop-opacity:1;"
-         offset="0"
-         id="stop3942" />
-      <stop
-         style="stop-color:#ffd200;stop-opacity:1;"
-         offset="1"
-         id="stop3944" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3783">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3785" />
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="1"
-         id="stop3787" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3765">
-      <stop
-         style="stop-color:#e6e6ff;stop-opacity:1;"
-         offset="0"
-         id="stop3767" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3769" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#aaaaaa;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="444.28577"
-       y1="971.64789"
-       x2="604.28577"
-       y2="163.09605"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3765"
-       id="linearGradient3771"
-       x1="444.28577"
-       y1="971.64789"
-       x2="604.28577"
-       y2="163.09605"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3940"
-       id="radialGradient3946"
-       cx="1127.8128"
-       cy="480.05185"
-       fx="1127.8128"
-       fy="480.05185"
-       r="150"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2835941,0,0,1.2835941,-647.65383,-392.19171)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3808"
-       id="radialGradient3814"
-       cx="726.35925"
-       cy="694.49506"
-       fx="726.35925"
-       fy="694.49506"
-       r="16.656294"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3808"
-       id="radialGradient3821"
-       gradientUnits="userSpaceOnUse"
-       cx="726.35925"
-       cy="694.49506"
-       fx="726.35925"
-       fy="694.49506"
-       r="16.656294" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3828"
-       id="radialGradient3834"
-       cx="432.33946"
-       cy="173.08061"
-       fx="432.33946"
-       fy="173.08061"
-       r="254.18953"
-       gradientTransform="matrix(0.83091287,0,0,0.09232366,-152.14788,832.58053)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3808"
-       id="radialGradient3836"
-       gradientUnits="userSpaceOnUse"
-       cx="726.35925"
-       cy="694.49506"
-       fx="726.35925"
-       fy="694.49506"
-       r="16.656294" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3808"
-       id="radialGradient3844"
-       gradientUnits="userSpaceOnUse"
-       cx="726.35925"
-       cy="694.49506"
-       fx="726.35925"
-       fy="694.49506"
-       r="16.656294" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3828"
-       id="radialGradient3846"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.83091287,0,0,0.09232366,-152.14788,832.58053)"
-       cx="432.33946"
-       cy="173.08061"
-       fx="432.33946"
-       fy="173.08061"
-       r="254.18953" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.69042968"
-     inkscape:cx="339.29467"
-     inkscape:cy="548.40518"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer2"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1178"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Element"
-     style="display:inline">
-    <g
-       style="display:inline"
-       id="g3007"
-       transform="matrix(0.66666667,0,0,0.66666667,21,261.33334)">
-      <rect
-         y="174"
-         x="70"
-         height="780"
-         width="880"
-         id="rect3948"
-         style="fill:#ffffff;fill-opacity:1;stroke:#000096;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <rect
-         y="169"
-         x="70"
-         height="180"
-         width="880"
-         id="rect3948-5"
-         style="fill:#c8c8ff;fill-opacity:1;stroke:#000096;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
-      <rect
-         y="424"
-         x="160"
-         height="150"
-         width="350"
-         id="rect3984"
-         style="fill:#ffc800;fill-opacity:1;stroke:#ff6400;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <rect
-         style="fill:#ffc800;fill-opacity:1;stroke:#ff6400;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="rect3997"
-         width="350"
-         height="150"
-         x="510"
-         y="714" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         id="path3999"
-         d="m 250,574 0,225 260,0"
-         style="fill:none;stroke:#505050;stroke-width:20;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    </g>
-    <g
-       id="g3838"
-       transform="matrix(1.1034962,-0.02308912,0.02308912,1.1034962,-130.58439,-2.2648535)">
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="rect3800"
-         d="m 890.67392,153.77183 c 52.54032,-13.98518 89.85969,24.32661 79.60087,83.75273 l -352.7346,408.7136 c -42.45634,-1.46691 -47.97342,-1.89935 -51.85945,-55.76315 z"
-         style="fill:#c86400;fill-opacity:1;stroke:none" />
-      <path
-         sodipodi:nodetypes="scsss"
-         inkscape:connector-curvature="0"
-         id="path3802"
-         d="m 668.27631,691.68132 c -15.19666,56.7147 -134.54047,191.90845 -191.25517,176.71179 -37.88584,-9.40316 55.27777,-64.53184 27.79618,-190.15209 -12.54823,-57.35882 31.56925,-131.96336 88.28393,-116.7667 56.7147,15.19666 90.37171,73.49232 75.17506,130.207 z"
-         style="fill:#000000;fill-opacity:1;stroke:none" />
-      <path
-         transform="matrix(2.8237478,0.75662094,-0.75662094,2.8237478,-941.22566,-1872.8999)"
-         d="m 743.01555,694.49506 c 0,9.19901 -7.45728,16.65629 -16.6563,16.65629 -9.19901,0 -16.65629,-7.45728 -16.65629,-16.65629 0,-9.19902 7.45728,-16.6563 16.65629,-16.6563 9.19902,0 16.6563,7.45728 16.6563,16.6563 z"
-         sodipodi:ry="16.656294"
-         sodipodi:rx="16.656294"
-         sodipodi:cy="694.49506"
-         sodipodi:cx="726.35925"
-         id="path3806"
-         style="fill:url(#radialGradient3844);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <rect
-         transform="matrix(0.6390587,-0.76915797,0.76915797,0.6390587,0,0)"
-         y="825.09222"
-         x="-4.12082"
-         height="46.935413"
-         width="422.4187"
-         id="rect3826"
-         style="fill:url(#radialGradient3846);fill-opacity:1;stroke:none" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="Tool"
-     style="display:none">
-    <path
-       style="fill:url(#radialGradient3946);fill-opacity:1;stroke:#ff5000;stroke-width:14.92178059;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 748.65625,31.460876 0,141.195364 -141.19536,0 0,102.68751 141.19536,0 0,141.19536 102.68751,0 0,-141.19536 141.19535,0 0,-102.68751 -141.19535,0 0,-141.195364 -102.68751,0 z"
-       id="rect3919"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/PapyrusConfiguration.svg b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/PapyrusConfiguration.svg
deleted file mode 100755
index 644af1201e4..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/PapyrusConfiguration.svg
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1024"
-   height="1024"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="PapyrusConfiguration.svg"
-   inkscape:export-filename="C:\Users\LW238780\Desktop\conf_file.png"
-   inkscape:export-xdpi="1.41"
-   inkscape:export-ydpi="1.41">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3783">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3785" />
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="1"
-         id="stop3787" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3765">
-      <stop
-         style="stop-color:#e6e6ff;stop-opacity:1;"
-         offset="0"
-         id="stop3767" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3769" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#aaaaaa;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="444.28577"
-       y1="971.64789"
-       x2="604.28577"
-       y2="163.09605"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3765"
-       id="linearGradient3771"
-       x1="444.28577"
-       y1="971.64789"
-       x2="604.28577"
-       y2="163.09605"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3774"
-       gradientUnits="userSpaceOnUse"
-       x1="444.28577"
-       y1="971.64789"
-       x2="444.28577"
-       y2="201.53497" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3765"
-       id="linearGradient3776"
-       gradientUnits="userSpaceOnUse"
-       x1="444.28577"
-       y1="971.64789"
-       x2="444.28577"
-       y2="201.53497" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3783"
-       id="linearGradient3789"
-       x1="758.57141"
-       y1="343.79074"
-       x2="948.75952"
-       y2="153.60266"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.25,0,0,1.25,-222.5,-53.090544)" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.49497475"
-     inkscape:cx="295.72055"
-     inkscape:cy="370.72485"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3910"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1370"
-     inkscape:window-height="894"
-     inkscape:window-x="63"
-     inkscape:window-y="351"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="File"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-28.36218)"
-     style="display:inline">
-    <path
-       style="fill:url(#linearGradient3776);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3774);stroke-width:25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 250.55206,152.91425 469.44797,0 229.44797,229.44793 -6e-5,619.44792 -698.89588,0 z"
-       id="rect2985"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
-    <path
-       style="fill:url(#linearGradient3789);fill-opacity:1;stroke:none"
-       d="m 715,137.36218 250,250 -250,0 z"
-       id="rect3780"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Viewpoint"
-     style="display:inline">
-    <g
-       id="g3910">
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="rect3797"
-         d="m 333.91746,576.89245 331.1681,-11.03899 c 12.10305,20.96311 10.59675,36.84058 0,55.19468 l -331.1681,-11.03888 c -6.07195,-10.5169 -7.99455,-19.26985 0,-33.11681 z"
-         inkscape:transform-center-x="-280"
-         style="fill:#9ed000;fill-opacity:1;stroke:#000000;display:inline;stroke-opacity:1;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none" />
-      <path
-         transform="matrix(0.98227829,0,0,0.98227829,-230.56514,-74.217723)"
-         d="m 512.85715,679.71429 a 84.285713,84.285713 0 1 1 -168.57142,0 84.285713,84.285713 0 1 1 168.57142,0 z"
-         sodipodi:ry="84.285713"
-         sodipodi:rx="84.285713"
-         sodipodi:cy="679.71429"
-         sodipodi:cx="428.57144"
-         id="path3027"
-         style="fill:#009ab9;fill-opacity:0.99607843;fill-rule:evenodd;stroke:#000000;display:inline;stroke-opacity:1;stroke-width:10.18041435000000000;stroke-miterlimit:4;stroke-dasharray:none"
-         sodipodi:type="arc" />
-      <path
-         inkscape:transform-center-y="-143.60032"
-         style="fill:#9ed000;fill-opacity:1;stroke:#000000;display:inline;stroke-opacity:1;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none"
-         inkscape:transform-center-x="-243.7231"
-         d="M 306.62797,508.16338 587.90846,333.01926 c 20.96312,12.10306 27.59734,26.60652 27.59734,47.8 L 323.18637,536.84337 c -10.51692,-6.07194 -16.5584,-12.69091 -16.5584,-28.67999 z"
-         id="path3856"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:transform-center-y="-243.72307"
-         style="fill:#9ed000;fill-opacity:1;stroke:#000000;display:inline;stroke-opacity:1;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none"
-         inkscape:transform-center-x="-143.60036"
-         d="m 248.63004,462.28699 156.02398,-292.3195 c 24.20614,0 37.20327,9.24325 47.80001,27.59734 l -175.144,281.28057 c -12.14388,0 -20.68545,-2.71145 -28.67999,-16.55841 z"
-         id="path3862"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:transform-center-y="143.60036"
-         style="fill:#9ed000;fill-opacity:1;stroke:#000000;display:inline;stroke-opacity:1;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none"
-         inkscape:transform-center-x="-243.72307"
-         d="m 323.18631,650.05833 292.31949,156.024 c 0,24.20612 -9.24324,37.20325 -27.59734,47.80001 l -281.28055,-175.144 c -2e-5,-12.14389 2.71144,-20.68545 16.5584,-28.68001 z"
-         id="path3864"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:transform-center-y="243.72308"
-         style="fill:#9ed000;fill-opacity:1;stroke:#000000;display:inline;stroke-opacity:1;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none"
-         inkscape:transform-center-x="-143.60031"
-         d="m 277.30993,708.05626 175.1441,281.28046 c -12.10307,20.96318 -26.60651,27.59738 -47.80001,27.59738 L 248.62992,724.61466 c 6.07194,-10.5169 12.69091,-16.5584 28.68001,-16.5584 z"
-         id="path3866"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-    </g>
-  </g>
-</svg>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/PapyrusDiagram.svg b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/PapyrusDiagram.svg
deleted file mode 100755
index 806b230789b..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/PapyrusDiagram.svg
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1024"
-   height="1024"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="diagram.svg"
-   inkscape:export-filename="C:\Users\LW238780\Desktop\cviewpoint.png"
-   inkscape:export-xdpi="1.41"
-   inkscape:export-ydpi="1.41">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3976">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3978" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3980" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3940">
-      <stop
-         style="stop-color:#ff6400;stop-opacity:1;"
-         offset="0"
-         id="stop3942" />
-      <stop
-         style="stop-color:#ffd200;stop-opacity:1;"
-         offset="1"
-         id="stop3944" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3783">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3785" />
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="1"
-         id="stop3787" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3765">
-      <stop
-         style="stop-color:#e6e6ff;stop-opacity:1;"
-         offset="0"
-         id="stop3767" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3769" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#aaaaaa;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="444.28577"
-       y1="971.64789"
-       x2="604.28577"
-       y2="163.09605"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3765"
-       id="linearGradient3771"
-       x1="444.28577"
-       y1="971.64789"
-       x2="604.28577"
-       y2="163.09605"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3940"
-       id="radialGradient3946"
-       cx="1127.8128"
-       cy="480.05185"
-       fx="1127.8128"
-       fy="480.05185"
-       r="150"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2835941,0,0,1.2835941,-647.65383,-392.19171)" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.34521484"
-     inkscape:cx="544.14833"
-     inkscape:cy="630.68176"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer2"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1370"
-     inkscape:window-height="894"
-     inkscape:window-x="385"
-     inkscape:window-y="114"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Viewpoint"
-     style="display:inline">
-    <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:#000096;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect3948"
-       width="880"
-       height="780"
-       x="70"
-       y="174" />
-    <rect
-       style="fill:#c8c8ff;fill-opacity:1;stroke:#000096;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="rect3948-5"
-       width="880"
-       height="180"
-       x="70"
-       y="169" />
-    <rect
-       style="fill:#ffc800;fill-opacity:1;stroke:#ff6400;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect3984"
-       width="350"
-       height="150"
-       x="160"
-       y="424" />
-    <rect
-       y="714"
-       x="510"
-       height="150"
-       width="350"
-       id="rect3997"
-       style="fill:#ffc800;fill-opacity:1;stroke:#ff6400;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       style="fill:none;stroke:#505050;stroke-width:20;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="m 250,574 0,225 260,0"
-       id="path3999"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="Tool"
-     style="display:none">
-    <path
-       style="fill:url(#radialGradient3946);fill-opacity:1;stroke:#ff5000;stroke-width:14.92178059;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 748.65625,31.460876 0,141.195364 -141.19536,0 0,102.68751 141.19536,0 0,141.19536 102.68751,0 0,-141.19536 141.19535,0 0,-102.68751 -141.19535,0 0,-141.195364 -102.68751,0 z"
-       id="rect3919"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/PapyrusSyncTable.svg b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/PapyrusSyncTable.svg
deleted file mode 100755
index 29364e1449a..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/PapyrusSyncTable.svg
+++ /dev/null
@@ -1,452 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1024"
-   height="1024"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="PapyrusSyncTable.svg"
-   inkscape:export-filename="C:\Users\LW238780\Desktop\PapyrusSyncTable.png"
-   inkscape:export-xdpi="1.41"
-   inkscape:export-ydpi="1.41">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3976">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3978" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3980" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3940">
-      <stop
-         style="stop-color:#ff6400;stop-opacity:1;"
-         offset="0"
-         id="stop3942" />
-      <stop
-         style="stop-color:#ffd200;stop-opacity:1;"
-         offset="1"
-         id="stop3944" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3783">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3785" />
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="1"
-         id="stop3787" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3765">
-      <stop
-         style="stop-color:#e6e6ff;stop-opacity:1;"
-         offset="0"
-         id="stop3767" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3769" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#aaaaaa;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="444.28577"
-       y1="971.64789"
-       x2="604.28577"
-       y2="163.09605"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3765"
-       id="linearGradient3771"
-       x1="444.28577"
-       y1="971.64789"
-       x2="604.28577"
-       y2="163.09605"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3940"
-       id="radialGradient3946"
-       cx="1127.8128"
-       cy="480.05185"
-       fx="1127.8128"
-       fy="480.05185"
-       r="150"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2835941,0,0,1.2835941,-647.65383,-392.19171)" />
-    <radialGradient
-       gradientTransform="matrix(1.2835941,0,0,1.2835941,-647.65383,-392.19171)"
-       gradientUnits="userSpaceOnUse"
-       r="150"
-       fy="480.05185"
-       fx="1127.8128"
-       cy="480.05185"
-       cx="1127.8128"
-       id="radialGradient3946-2"
-       xlink:href="#linearGradient3940-5"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="163.09605"
-       x2="604.28577"
-       y1="971.64789"
-       x1="444.28577"
-       id="linearGradient3771-2"
-       xlink:href="#linearGradient3765-2"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="163.09605"
-       x2="604.28577"
-       y1="971.64789"
-       x1="444.28577"
-       id="linearGradient3763-3"
-       xlink:href="#linearGradient3757-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3757-1">
-      <stop
-         id="stop3759-4"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop3761-2"
-         offset="1"
-         style="stop-color:#aaaaaa;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3765-2">
-      <stop
-         id="stop3767-7"
-         offset="0"
-         style="stop-color:#e6e6ff;stop-opacity:1;" />
-      <stop
-         id="stop3769-6"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3783-1">
-      <stop
-         id="stop3785-1"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop3787-5"
-         offset="1"
-         style="stop-color:#c8c8c8;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3940-5">
-      <stop
-         id="stop3942-1"
-         offset="0"
-         style="stop-color:#ff6400;stop-opacity:1;" />
-      <stop
-         id="stop3944-7"
-         offset="1"
-         style="stop-color:#ffd200;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3976-2">
-      <stop
-         id="stop3978-4"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop3980-5"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(1.2835941,0,0,1.2835941,-647.65383,-392.19171)"
-       gradientUnits="userSpaceOnUse"
-       r="150"
-       fy="480.05185"
-       fx="1127.8128"
-       cy="480.05185"
-       cx="1127.8128"
-       id="radialGradient3946-3"
-       xlink:href="#linearGradient3940-3"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="163.09605"
-       x2="604.28577"
-       y1="971.64789"
-       x1="444.28577"
-       id="linearGradient3771-9"
-       xlink:href="#linearGradient3765-1"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="163.09605"
-       x2="604.28577"
-       y1="971.64789"
-       x1="444.28577"
-       id="linearGradient3763-7"
-       xlink:href="#linearGradient3757-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3757-7">
-      <stop
-         id="stop3759-42"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop3761-7"
-         offset="1"
-         style="stop-color:#aaaaaa;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3765-1">
-      <stop
-         id="stop3767-3"
-         offset="0"
-         style="stop-color:#e6e6ff;stop-opacity:1;" />
-      <stop
-         id="stop3769-8"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3783-3">
-      <stop
-         id="stop3785-4"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop3787-1"
-         offset="1"
-         style="stop-color:#c8c8c8;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3940-3">
-      <stop
-         id="stop3942-12"
-         offset="0"
-         style="stop-color:#ff6400;stop-opacity:1;" />
-      <stop
-         id="stop3944-3"
-         offset="1"
-         style="stop-color:#ffd200;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3976-7">
-      <stop
-         id="stop3978-9"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop3980-54"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(1.25,0,0,1.25,-222.5,-53.090544)"
-       gradientUnits="userSpaceOnUse"
-       y2="153.60266"
-       x2="948.75952"
-       y1="343.79074"
-       x1="758.57141"
-       id="linearGradient3789"
-       xlink:href="#linearGradient3783-5"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="201.53497"
-       x2="444.28577"
-       y1="971.64789"
-       x1="444.28577"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3776"
-       xlink:href="#linearGradient3765-0"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="201.53497"
-       x2="444.28577"
-       y1="971.64789"
-       x1="444.28577"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3774"
-       xlink:href="#linearGradient3757-3"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="163.09605"
-       x2="604.28577"
-       y1="971.64789"
-       x1="444.28577"
-       id="linearGradient3771-4"
-       xlink:href="#linearGradient3765-0"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="163.09605"
-       x2="604.28577"
-       y1="971.64789"
-       x1="444.28577"
-       id="linearGradient3763-34"
-       xlink:href="#linearGradient3757-3"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3757-3">
-      <stop
-         id="stop3759-8"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop3761-9"
-         offset="1"
-         style="stop-color:#aaaaaa;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3765-0">
-      <stop
-         id="stop3767-0"
-         offset="0"
-         style="stop-color:#e6e6ff;stop-opacity:1;" />
-      <stop
-         id="stop3769-61"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3783-5">
-      <stop
-         id="stop3785-0"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop3787-9"
-         offset="1"
-         style="stop-color:#c8c8c8;stop-opacity:1;" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.69042968"
-     inkscape:cx="442.32282"
-     inkscape:cy="483.86327"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer2"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1178"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Viewpoint"
-     style="display:inline">
-    <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:#505050;stroke-width:20;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
-       id="rect3914-9-6-4"
-       width="440"
-       height="602"
-       x="510"
-       y="352" />
-    <rect
-       style="fill:#ffffff;stroke:#505050;stroke-width:20;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;fill-opacity:1"
-       id="rect3914-9-6"
-       width="440"
-       height="602"
-       x="69.26667"
-       y="353" />
-    <rect
-       style="fill:none;stroke:#505050;stroke-width:20;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
-       id="rect3914-9"
-       width="880"
-       height="200"
-       x="70"
-       y="564" />
-    <rect
-       style="fill:none;fill-opacity:1;stroke:#ff3232;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect3948"
-       width="880"
-       height="780"
-       x="70"
-       y="174" />
-    <rect
-       style="fill:#ffc8c8;fill-opacity:1;stroke:#ff3232;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="rect3948-5"
-       width="880"
-       height="180"
-       x="70"
-       y="174" />
-    <path
-       style="fill:#c8c8ff;fill-opacity:1;stroke:#5050ff;stroke-width:23.9427948;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 930.44728,453.79915 -89.78548,0 0,-418.998891 -179.57096,0 0,418.998891 -89.78548,0 179.57096,179.57096 z"
-       id="rect4168"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
-    <path
-       style="fill:#c8c8ff;fill-opacity:1;stroke:#5050ff;stroke-width:23.9427948;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       d="m 451.59139,214.37121 -89.78548,0 0,418.9989 -179.57095,0 0,-418.9989 -89.785484,0 L 272.02043,34.800247 z"
-       id="rect4168-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="Tool"
-     style="display:none">
-    <path
-       style="fill:url(#radialGradient3946);fill-opacity:1;stroke:#ff5000;stroke-width:14.92178059;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 748.65625,31.460876 0,141.195364 -141.19536,0 0,102.68751 141.19536,0 0,141.19536 102.68751,0 0,-141.19536 141.19535,0 0,-102.68751 -141.19535,0 0,-141.195364 -102.68751,0 z"
-       id="rect3919"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/PapyrusTable.svg b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/PapyrusTable.svg
deleted file mode 100755
index 920a202f7ba..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/PapyrusTable.svg
+++ /dev/null
@@ -1,440 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1024"
-   height="1024"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="PapyrusTable.svg"
-   inkscape:export-filename="C:\Users\LW238780\Desktop\PapyrusTable.png"
-   inkscape:export-xdpi="1.41"
-   inkscape:export-ydpi="1.41">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3976">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3978" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3980" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3940">
-      <stop
-         style="stop-color:#ff6400;stop-opacity:1;"
-         offset="0"
-         id="stop3942" />
-      <stop
-         style="stop-color:#ffd200;stop-opacity:1;"
-         offset="1"
-         id="stop3944" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3783">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3785" />
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="1"
-         id="stop3787" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3765">
-      <stop
-         style="stop-color:#e6e6ff;stop-opacity:1;"
-         offset="0"
-         id="stop3767" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3769" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#aaaaaa;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="444.28577"
-       y1="971.64789"
-       x2="604.28577"
-       y2="163.09605"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3765"
-       id="linearGradient3771"
-       x1="444.28577"
-       y1="971.64789"
-       x2="604.28577"
-       y2="163.09605"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3940"
-       id="radialGradient3946"
-       cx="1127.8128"
-       cy="480.05185"
-       fx="1127.8128"
-       fy="480.05185"
-       r="150"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2835941,0,0,1.2835941,-647.65383,-392.19171)" />
-    <radialGradient
-       gradientTransform="matrix(1.2835941,0,0,1.2835941,-647.65383,-392.19171)"
-       gradientUnits="userSpaceOnUse"
-       r="150"
-       fy="480.05185"
-       fx="1127.8128"
-       cy="480.05185"
-       cx="1127.8128"
-       id="radialGradient3946-2"
-       xlink:href="#linearGradient3940-5"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="163.09605"
-       x2="604.28577"
-       y1="971.64789"
-       x1="444.28577"
-       id="linearGradient3771-2"
-       xlink:href="#linearGradient3765-2"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="163.09605"
-       x2="604.28577"
-       y1="971.64789"
-       x1="444.28577"
-       id="linearGradient3763-3"
-       xlink:href="#linearGradient3757-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3757-1">
-      <stop
-         id="stop3759-4"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop3761-2"
-         offset="1"
-         style="stop-color:#aaaaaa;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3765-2">
-      <stop
-         id="stop3767-7"
-         offset="0"
-         style="stop-color:#e6e6ff;stop-opacity:1;" />
-      <stop
-         id="stop3769-6"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3783-1">
-      <stop
-         id="stop3785-1"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop3787-5"
-         offset="1"
-         style="stop-color:#c8c8c8;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3940-5">
-      <stop
-         id="stop3942-1"
-         offset="0"
-         style="stop-color:#ff6400;stop-opacity:1;" />
-      <stop
-         id="stop3944-7"
-         offset="1"
-         style="stop-color:#ffd200;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3976-2">
-      <stop
-         id="stop3978-4"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop3980-5"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(1.2835941,0,0,1.2835941,-647.65383,-392.19171)"
-       gradientUnits="userSpaceOnUse"
-       r="150"
-       fy="480.05185"
-       fx="1127.8128"
-       cy="480.05185"
-       cx="1127.8128"
-       id="radialGradient3946-3"
-       xlink:href="#linearGradient3940-3"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="163.09605"
-       x2="604.28577"
-       y1="971.64789"
-       x1="444.28577"
-       id="linearGradient3771-9"
-       xlink:href="#linearGradient3765-1"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="163.09605"
-       x2="604.28577"
-       y1="971.64789"
-       x1="444.28577"
-       id="linearGradient3763-7"
-       xlink:href="#linearGradient3757-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3757-7">
-      <stop
-         id="stop3759-42"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop3761-7"
-         offset="1"
-         style="stop-color:#aaaaaa;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3765-1">
-      <stop
-         id="stop3767-3"
-         offset="0"
-         style="stop-color:#e6e6ff;stop-opacity:1;" />
-      <stop
-         id="stop3769-8"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3783-3">
-      <stop
-         id="stop3785-4"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop3787-1"
-         offset="1"
-         style="stop-color:#c8c8c8;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3940-3">
-      <stop
-         id="stop3942-12"
-         offset="0"
-         style="stop-color:#ff6400;stop-opacity:1;" />
-      <stop
-         id="stop3944-3"
-         offset="1"
-         style="stop-color:#ffd200;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3976-7">
-      <stop
-         id="stop3978-9"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop3980-54"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(1.25,0,0,1.25,-222.5,-53.090544)"
-       gradientUnits="userSpaceOnUse"
-       y2="153.60266"
-       x2="948.75952"
-       y1="343.79074"
-       x1="758.57141"
-       id="linearGradient3789"
-       xlink:href="#linearGradient3783-5"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="201.53497"
-       x2="444.28577"
-       y1="971.64789"
-       x1="444.28577"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3776"
-       xlink:href="#linearGradient3765-0"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="201.53497"
-       x2="444.28577"
-       y1="971.64789"
-       x1="444.28577"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3774"
-       xlink:href="#linearGradient3757-3"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="163.09605"
-       x2="604.28577"
-       y1="971.64789"
-       x1="444.28577"
-       id="linearGradient3771-4"
-       xlink:href="#linearGradient3765-0"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="163.09605"
-       x2="604.28577"
-       y1="971.64789"
-       x1="444.28577"
-       id="linearGradient3763-34"
-       xlink:href="#linearGradient3757-3"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3757-3">
-      <stop
-         id="stop3759-8"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop3761-9"
-         offset="1"
-         style="stop-color:#aaaaaa;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3765-0">
-      <stop
-         id="stop3767-0"
-         offset="0"
-         style="stop-color:#e6e6ff;stop-opacity:1;" />
-      <stop
-         id="stop3769-61"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3783-5">
-      <stop
-         id="stop3785-0"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop3787-9"
-         offset="1"
-         style="stop-color:#c8c8c8;stop-opacity:1;" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.48820751"
-     inkscape:cx="675.63274"
-     inkscape:cy="458.60193"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer2"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1178"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Viewpoint"
-     style="display:inline">
-    <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:#505050;stroke-width:20;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
-       id="rect3914-9-6-1"
-       width="440"
-       height="602"
-       x="510"
-       y="352" />
-    <rect
-       style="fill:#ffffff;stroke:#505050;stroke-width:20;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;fill-opacity:1"
-       id="rect3914-9-6"
-       width="440"
-       height="602"
-       x="69.26667"
-       y="353" />
-    <rect
-       style="fill:none;stroke:#505050;stroke-width:20;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;fill-opacity:1"
-       id="rect3914-9"
-       width="880"
-       height="200"
-       x="70"
-       y="564" />
-    <rect
-       style="fill:none;fill-opacity:1;stroke:#ff3232;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect3948"
-       width="880"
-       height="780"
-       x="70"
-       y="174" />
-    <rect
-       style="fill:#ffc8c8;fill-opacity:1;stroke:#ff3232;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="rect3948-5"
-       width="880"
-       height="180"
-       x="70"
-       y="174" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="Tool"
-     style="display:none">
-    <path
-       style="fill:url(#radialGradient3946);fill-opacity:1;stroke:#ff5000;stroke-width:14.92178059;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 748.65625,31.460876 0,141.195364 -141.19536,0 0,102.68751 141.19536,0 0,141.19536 102.68751,0 0,-141.19536 141.19535,0 0,-102.68751 -141.19535,0 0,-141.195364 -102.68751,0 z"
-       id="rect3919"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/PapyrusView.svg b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/PapyrusView.svg
deleted file mode 100755
index 35dfe2c70d0..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/PapyrusView.svg
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1024"
-   height="1024"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="view.svg"
-   inkscape:export-filename="C:\Users\LW238780\Desktop\icons\view_tool.png"
-   inkscape:export-xdpi="1.41"
-   inkscape:export-ydpi="1.41">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3976">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3978" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3980" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3940">
-      <stop
-         style="stop-color:#ff6400;stop-opacity:1;"
-         offset="0"
-         id="stop3942" />
-      <stop
-         style="stop-color:#ffd200;stop-opacity:1;"
-         offset="1"
-         id="stop3944" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3783">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3785" />
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="1"
-         id="stop3787" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3765">
-      <stop
-         style="stop-color:#e6e6ff;stop-opacity:1;"
-         offset="0"
-         id="stop3767" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3769" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#aaaaaa;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="444.28577"
-       y1="971.64789"
-       x2="604.28577"
-       y2="163.09605"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3765"
-       id="linearGradient3771"
-       x1="444.28577"
-       y1="971.64789"
-       x2="604.28577"
-       y2="163.09605"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3940"
-       id="radialGradient3946"
-       cx="1127.8128"
-       cy="480.05185"
-       fx="1127.8128"
-       fy="480.05185"
-       r="150"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2835941,0,0,1.2835941,-647.65383,-392.19171)" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.34521484"
-     inkscape:cx="544.14833"
-     inkscape:cy="630.68176"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer2"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1370"
-     inkscape:window-height="894"
-     inkscape:window-x="385"
-     inkscape:window-y="114"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Viewpoint"
-     style="display:inline">
-    <g
-       id="g4001"
-       transform="matrix(0.80568435,0,0,0.80568406,-18.341061,217.32057)">
-      <rect
-         y="174"
-         x="70"
-         height="780"
-         width="880"
-         id="rect3948"
-         style="fill:#ffffff;fill-opacity:1;stroke:#000096;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <rect
-         y="169"
-         x="70"
-         height="180"
-         width="880"
-         id="rect3948-5"
-         style="fill:#c8c8ff;fill-opacity:1;stroke:#000096;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
-      <rect
-         y="424"
-         x="160"
-         height="150"
-         width="350"
-         id="rect3984"
-         style="fill:#ffc800;fill-opacity:1;stroke:#ff6400;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <rect
-         style="fill:#ffc800;fill-opacity:1;stroke:#ff6400;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="rect3997"
-         width="350"
-         height="150"
-         x="510"
-         y="714" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         id="path3999"
-         d="m 250,574 0,225 260,0"
-         style="fill:none;stroke:#505050;stroke-width:20;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    </g>
-    <g
-       transform="matrix(0.80568435,0,0,0.80568406,101.65899,97.320558)"
-       id="g4008">
-      <rect
-         style="fill:#ffffff;fill-opacity:1;stroke:#000096;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="rect4010"
-         width="880"
-         height="780"
-         x="70"
-         y="174" />
-      <rect
-         style="fill:#c8c8ff;fill-opacity:1;stroke:#000096;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         id="rect4012"
-         width="880"
-         height="180"
-         x="70"
-         y="169" />
-      <rect
-         style="fill:#ffc800;fill-opacity:1;stroke:#ff6400;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="rect4014"
-         width="350"
-         height="150"
-         x="160"
-         y="424" />
-      <rect
-         y="714"
-         x="510"
-         height="150"
-         width="350"
-         id="rect4016"
-         style="fill:#ffc800;fill-opacity:1;stroke:#ff6400;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         style="fill:none;stroke:#505050;stroke-width:20;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 250,574 0,225 260,0"
-         id="path4018"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-    </g>
-    <g
-       id="g4020"
-       transform="matrix(0.80568435,0,0,0.80568406,221.65903,-22.679442)">
-      <rect
-         y="174"
-         x="70"
-         height="780"
-         width="880"
-         id="rect4022"
-         style="fill:#ffffff;fill-opacity:1;stroke:#000096;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <rect
-         y="169"
-         x="70"
-         height="180"
-         width="880"
-         id="rect4024"
-         style="fill:#c8c8ff;fill-opacity:1;stroke:#000096;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
-      <rect
-         y="424"
-         x="160"
-         height="150"
-         width="350"
-         id="rect4026"
-         style="fill:#ffc800;fill-opacity:1;stroke:#ff6400;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <rect
-         style="fill:#ffc800;fill-opacity:1;stroke:#ff6400;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="rect4028"
-         width="350"
-         height="150"
-         x="510"
-         y="714" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         id="path4030"
-         d="m 250,574 0,225 260,0"
-         style="fill:none;stroke:#505050;stroke-width:20;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="Tool"
-     style="display:none">
-    <path
-       style="fill:url(#radialGradient3946);fill-opacity:1;stroke:#ff5000;stroke-width:14.92178059;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 748.65625,31.460876 0,141.195364 -141.19536,0 0,102.68751 141.19536,0 0,141.19536 102.68751,0 0,-141.19536 141.19535,0 0,-102.68751 -141.19535,0 0,-141.195364 -102.68751,0 z"
-       id="rect3919"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/PapyrusViewpoint.svg b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/PapyrusViewpoint.svg
deleted file mode 100755
index 6fb3b973a23..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/PapyrusViewpoint.svg
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1024"
-   height="1024"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="PapyrusViewpoint.svg"
-   inkscape:export-filename="C:\Users\LW238780\Desktop\cviewpoint.png"
-   inkscape:export-xdpi="1.41"
-   inkscape:export-ydpi="1.41">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3940">
-      <stop
-         style="stop-color:#ff6400;stop-opacity:1;"
-         offset="0"
-         id="stop3942" />
-      <stop
-         style="stop-color:#ffd200;stop-opacity:1;"
-         offset="1"
-         id="stop3944" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3783">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3785" />
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="1"
-         id="stop3787" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3765">
-      <stop
-         style="stop-color:#e6e6ff;stop-opacity:1;"
-         offset="0"
-         id="stop3767" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3769" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#aaaaaa;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="444.28577"
-       y1="971.64789"
-       x2="604.28577"
-       y2="163.09605"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3765"
-       id="linearGradient3771"
-       x1="444.28577"
-       y1="971.64789"
-       x2="604.28577"
-       y2="163.09605"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3940"
-       id="radialGradient3946"
-       cx="1127.8128"
-       cy="480.05185"
-       fx="1127.8128"
-       fy="480.05185"
-       r="150"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2835941,0,0,1.2835941,-647.65383,-392.19171)" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.64"
-     inkscape:cx="535.76668"
-     inkscape:cy="498.83542"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3910"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="1178"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Viewpoint"
-     style="display:inline">
-    <g
-       id="g3910"
-       transform="matrix(1.1085613,0,0,1.1085613,86.240263,-133.87659)">
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="rect3797"
-         d="m 333.91746,576.89245 331.1681,-11.03899 c 12.10305,20.96311 10.59675,36.84058 0,55.19468 l -331.1681,-11.03888 c -6.07195,-10.5169 -7.99455,-19.26985 0,-33.11681 z"
-         inkscape:transform-center-x="-280"
-         style="fill:#9ed000;fill-opacity:1;stroke:#000000;stroke-width:10;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
-      <path
-         transform="matrix(0.98227829,0,0,0.98227829,-230.56514,-74.217723)"
-         d="m 512.85715,679.71429 c 0,46.54972 -37.73599,84.28572 -84.28571,84.28572 -46.54971,0 -84.28571,-37.736 -84.28571,-84.28572 0,-46.54971 37.736,-84.28571 84.28571,-84.28571 46.54972,0 84.28571,37.736 84.28571,84.28571 z"
-         sodipodi:ry="84.285713"
-         sodipodi:rx="84.285713"
-         sodipodi:cy="679.71429"
-         sodipodi:cx="428.57144"
-         id="path3027"
-         style="fill:#009ab9;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:10.18041420000000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         sodipodi:type="arc" />
-      <path
-         inkscape:transform-center-y="-143.60032"
-         style="fill:#9ed000;fill-opacity:1;stroke:#000000;stroke-width:10;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         inkscape:transform-center-x="-243.7231"
-         d="M 306.62797,508.16338 587.90846,333.01926 c 20.96312,12.10306 27.59734,26.60652 27.59734,47.8 L 323.18637,536.84337 c -10.51692,-6.07194 -16.5584,-12.69091 -16.5584,-28.67999 z"
-         id="path3856"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:transform-center-y="-243.72307"
-         style="fill:#9ed000;fill-opacity:1;stroke:#000000;stroke-width:10;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         inkscape:transform-center-x="-143.60036"
-         d="m 248.63004,462.28699 156.02398,-292.3195 c 24.20614,0 37.20327,9.24325 47.80001,27.59734 l -175.144,281.28057 c -12.14388,0 -20.68545,-2.71145 -28.67999,-16.55841 z"
-         id="path3862"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:transform-center-y="143.60036"
-         style="fill:#9ed000;fill-opacity:1;stroke:#000000;stroke-width:10;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         inkscape:transform-center-x="-243.72307"
-         d="m 323.18631,650.05833 292.31949,156.024 c 0,24.20612 -9.24324,37.20325 -27.59734,47.80001 l -281.28055,-175.144 c -2e-5,-12.14389 2.71144,-20.68545 16.5584,-28.68001 z"
-         id="path3864"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         inkscape:transform-center-y="243.72308"
-         style="fill:#9ed000;fill-opacity:1;stroke:#000000;stroke-width:10;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         inkscape:transform-center-x="-143.60031"
-         d="m 277.30993,708.05626 175.1441,281.28046 c -12.10307,20.96318 -26.60651,27.59738 -47.80001,27.59738 L 248.62992,724.61466 c 6.07194,-10.5169 12.69091,-16.5584 28.68001,-16.5584 z"
-         id="path3866"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="Tool"
-     style="display:none">
-    <path
-       style="fill:url(#radialGradient3946);fill-opacity:1;stroke:#ff5000;stroke-width:14.92178059;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 748.65625,31.460876 0,141.195364 -141.19536,0 0,102.68751 141.19536,0 0,141.19536 102.68751,0 0,-141.19536 141.19535,0 0,-102.68751 -141.19535,0 0,-141.195364 -102.68751,0 z"
-       id="rect3919"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/PathElement.svg b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/PathElement.svg
deleted file mode 100755
index b660cd491e0..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/PathElement.svg
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1024"
-   height="1024"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="path.svg"
-   inkscape:export-filename="C:\Users\LW238780\Desktop\icons\path_tool.png"
-   inkscape:export-xdpi="1.41"
-   inkscape:export-ydpi="1.41">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3976">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3978" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3980" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3940">
-      <stop
-         style="stop-color:#ff6400;stop-opacity:1;"
-         offset="0"
-         id="stop3942" />
-      <stop
-         style="stop-color:#ffd200;stop-opacity:1;"
-         offset="1"
-         id="stop3944" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3783">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3785" />
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="1"
-         id="stop3787" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3765">
-      <stop
-         style="stop-color:#e6e6ff;stop-opacity:1;"
-         offset="0"
-         id="stop3767" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3769" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#aaaaaa;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="444.28577"
-       y1="971.64789"
-       x2="604.28577"
-       y2="163.09605"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3765"
-       id="linearGradient3771"
-       x1="444.28577"
-       y1="971.64789"
-       x2="604.28577"
-       y2="163.09605"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3940"
-       id="radialGradient3946"
-       cx="1127.8128"
-       cy="480.05185"
-       fx="1127.8128"
-       fy="480.05185"
-       r="150"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2835941,0,0,1.2835941,-647.65383,-392.19171)" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.34521484"
-     inkscape:cx="544.14833"
-     inkscape:cy="630.68176"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer4"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1370"
-     inkscape:window-height="894"
-     inkscape:window-x="236"
-     inkscape:window-y="77"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="Element">
-    <rect
-       style="fill:#64c8ff;fill-opacity:1;stroke:#6464ff;stroke-width:25;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="rect3984"
-       width="437.5"
-       height="187.5"
-       x="82.5"
-       y="261.50003" />
-    <rect
-       y="624"
-       x="520"
-       height="187.5"
-       width="437.5"
-       id="rect3997"
-       style="fill:#64c8ff;fill-opacity:1;stroke:#6464ff;stroke-width:25;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
-    <path
-       style="fill:none;stroke:#505050;stroke-width:25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       d="m 195.00001,449.00003 0,281.25 325,0"
-       id="path3999"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="Tool"
-     style="display:none">
-    <path
-       style="fill:url(#radialGradient3946);fill-opacity:1;stroke:#ff5000;stroke-width:14.92178059;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 748.65625,31.460876 0,141.195364 -141.19536,0 0,102.68751 141.19536,0 0,141.19536 102.68751,0 0,-141.19536 141.19535,0 0,-102.68751 -141.19535,0 0,-141.195364 -102.68751,0 z"
-       id="rect3919"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/Stakeholder.svg b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/Stakeholder.svg
deleted file mode 100755
index f123888b125..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/icons/svg/Stakeholder.svg
+++ /dev/null
@@ -1,320 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1024"
-   height="1024"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="stakeholder.svg"
-   inkscape:export-filename="C:\Users\LW238780\Desktop\icons\stakeholder_tool.png"
-   inkscape:export-xdpi="1.41"
-   inkscape:export-ydpi="1.41">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3828">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3830" />
-      <stop
-         style="stop-color:#c86400;stop-opacity:1;"
-         offset="1"
-         id="stop3832" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3808">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3810" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop3812" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3976">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3978" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3980" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3940">
-      <stop
-         style="stop-color:#ff6400;stop-opacity:1;"
-         offset="0"
-         id="stop3942" />
-      <stop
-         style="stop-color:#ffd200;stop-opacity:1;"
-         offset="1"
-         id="stop3944" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3783">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3785" />
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="1"
-         id="stop3787" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3765">
-      <stop
-         style="stop-color:#e6e6ff;stop-opacity:1;"
-         offset="0"
-         id="stop3767" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3769" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#aaaaaa;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="444.28577"
-       y1="971.64789"
-       x2="604.28577"
-       y2="163.09605"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3765"
-       id="linearGradient3771"
-       x1="444.28577"
-       y1="971.64789"
-       x2="604.28577"
-       y2="163.09605"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3940"
-       id="radialGradient3946"
-       cx="1127.8128"
-       cy="480.05185"
-       fx="1127.8128"
-       fy="480.05185"
-       r="150"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2835941,0,0,1.2835941,-647.65383,-392.19171)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3808"
-       id="radialGradient3814"
-       cx="726.35925"
-       cy="694.49506"
-       fx="726.35925"
-       fy="694.49506"
-       r="16.656294"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3808"
-       id="radialGradient3821"
-       gradientUnits="userSpaceOnUse"
-       cx="726.35925"
-       cy="694.49506"
-       fx="726.35925"
-       fy="694.49506"
-       r="16.656294" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3828"
-       id="radialGradient3834"
-       cx="432.33946"
-       cy="173.08061"
-       fx="432.33946"
-       fy="173.08061"
-       r="254.18953"
-       gradientTransform="matrix(0.83091287,0,0,0.09232366,-152.14788,832.58053)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3808"
-       id="radialGradient3836"
-       gradientUnits="userSpaceOnUse"
-       cx="726.35925"
-       cy="694.49506"
-       fx="726.35925"
-       fy="694.49506"
-       r="16.656294" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3808"
-       id="radialGradient3844"
-       gradientUnits="userSpaceOnUse"
-       cx="726.35925"
-       cy="694.49506"
-       fx="726.35925"
-       fy="694.49506"
-       r="16.656294" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3828"
-       id="radialGradient3846"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.83091287,0,0,0.09232366,-152.14788,832.58053)"
-       cx="432.33946"
-       cy="173.08061"
-       fx="432.33946"
-       fy="173.08061"
-       r="254.18953" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.69042968"
-     inkscape:cx="113.34842"
-     inkscape:cy="548.79841"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer2"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1178"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Element"
-     style="display:inline">
-    <g
-       id="g3838"
-       transform="matrix(0.20865205,0.84939318,0.84939318,-0.20865205,130.38284,25.1294)">
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="rect3800"
-         d="m 890.67392,153.77183 c 52.54032,-13.98518 89.85969,24.32661 79.60087,83.75273 l -352.7346,408.7136 c -42.45634,-1.46691 -47.97342,-1.89935 -51.85945,-55.76315 z"
-         style="fill:#c86400;fill-opacity:1;stroke:none" />
-      <path
-         sodipodi:nodetypes="scsss"
-         inkscape:connector-curvature="0"
-         id="path3802"
-         d="m 668.27631,691.68132 c -15.19666,56.7147 -134.54047,191.90845 -191.25517,176.71179 -37.88584,-9.40316 55.27777,-64.53184 27.79618,-190.15209 -12.54823,-57.35882 31.56925,-131.96336 88.28393,-116.7667 56.7147,15.19666 90.37171,73.49232 75.17506,130.207 z"
-         style="fill:#000000;fill-opacity:1;stroke:none" />
-      <path
-         transform="matrix(2.8237478,0.75662094,-0.75662094,2.8237478,-941.22566,-1872.8999)"
-         d="m 743.01555,694.49506 c 0,9.19901 -7.45728,16.65629 -16.6563,16.65629 -9.19901,0 -16.65629,-7.45728 -16.65629,-16.65629 0,-9.19902 7.45728,-16.6563 16.65629,-16.6563 9.19902,0 16.6563,7.45728 16.6563,16.6563 z"
-         sodipodi:ry="16.656294"
-         sodipodi:rx="16.656294"
-         sodipodi:cy="694.49506"
-         sodipodi:cx="726.35925"
-         id="path3806"
-         style="fill:url(#radialGradient3844);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <rect
-         transform="matrix(0.6390587,-0.76915797,0.76915797,0.6390587,0,0)"
-         y="825.09222"
-         x="-4.12082"
-         height="46.935413"
-         width="422.4187"
-         id="rect3826"
-         style="fill:url(#radialGradient3846);fill-opacity:1;stroke:none" />
-    </g>
-    <g
-       id="g3809"
-       transform="matrix(1.0795454,0,0,1.0795454,-157.67046,-78.670449)">
-      <path
-         transform="matrix(1.3717145,0,0,1.3717145,-232.11912,-15.072822)"
-         d="m 643.07779,210.73833 c 0,60.39355 -48.95865,109.3522 -109.3522,109.3522 -60.39356,0 -109.35221,-48.95865 -109.35221,-109.3522 0,-60.39356 48.95865,-109.35221 109.35221,-109.35221 60.39355,0 109.3522,48.95865 109.3522,109.35221 z"
-         sodipodi:ry="109.3522"
-         sodipodi:rx="109.3522"
-         sodipodi:cy="210.73833"
-         sodipodi:cx="533.72559"
-         id="path3025"
-         style="fill:none;stroke:#000000;stroke-width:21.87043953;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path3027"
-         d="m 500,424 0,400"
-         style="fill:none;stroke:#000000;stroke-width:30;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path3033"
-         d="M 500,474 300,624"
-         style="fill:none;stroke:#000000;stroke-width:30;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path3035"
-         d="M 500,474 700,624"
-         style="fill:none;stroke:#000000;stroke-width:30;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path3037"
-         d="M 500,824 300,974"
-         style="fill:none;stroke:#000000;stroke-width:30;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path3039"
-         d="M 500,824 700,974"
-         style="fill:none;stroke:#000000;stroke-width:30;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="Tool"
-     style="display:inline">
-    <path
-       style="fill:url(#radialGradient3946);fill-opacity:1;stroke:#ff5000;stroke-width:14.92178059;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 748.65625,31.460876 0,141.195364 -141.19536,0 0,102.68751 141.19536,0 0,141.19536 102.68751,0 0,-141.19536 141.19535,0 0,-102.68751 -141.19535,0 0,-141.195364 -102.68751,0 z"
-       id="rect3919"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/model/configuration.ecore b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/model/configuration.ecore
deleted file mode 100755
index 50363972818..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/model/configuration.ecore
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="configuration" nsURI="http://www.eclipse.org/papyrus/infra/viewpoints/configuration"
-    nsPrefix="configuration">
-  <eClassifiers xsi:type="ecore:EClass" name="PapyrusConfiguration" eSuperTypes="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.iso42010/model/iso42010.ecore#//ArchitectureFramework">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="defaultStakeholder" lowerBound="1"
-        eType="ecore:EClass platform:/plugin/org.eclipse.papyrus.infra.viewpoints.iso42010/model/iso42010.ecore#//Stakeholder"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="metamodel" lowerBound="1"
-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EPackage"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="categories" upperBound="-1"
-        eType="#//Category" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PapyrusViewpoint" eSuperTypes="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.iso42010/model/iso42010.ecore#//ArchitectureViewpoint">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parent" eType="#//PapyrusViewpoint"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PapyrusView" eSuperTypes="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.iso42010/model/iso42010.ecore#//ModelKind">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="icon" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parent" eType="#//PapyrusView"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="profiles" upperBound="-1"
-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EPackage"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="modelRules" lowerBound="1"
-        upperBound="-1" eType="#//ModelRule" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="These rules determine which model elements can be the semantic element behind this diagram"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="owningRules" lowerBound="1"
-        upperBound="-1" eType="#//OwningRule" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="These rules determine which elements can be the syntactic owner of this diagram"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="implementationID" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="categories" upperBound="-1"
-        eType="#//Category"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PapyrusDiagram" eSuperTypes="#//PapyrusView">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="customPalette" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="customStyle" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="childRules" upperBound="-1"
-        eType="#//ChildRule" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="These rules determine which model elements can be added as child of the origin through this diagram"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="paletteRules" upperBound="-1"
-        eType="#//PaletteRule" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="These rules determine which palette elements should be available for this diagram"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="assistantRules" upperBound="-1"
-        eType="#//AssistantRule" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="These rules determine which modeling assistants should be presented in this diagram"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PapyrusSyncTable" eSuperTypes="#//PapyrusView"/>
-  <eClassifiers xsi:type="ecore:EClass" name="PapyrusTable" eSuperTypes="#//PapyrusView">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="configuration" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Rule" abstract="true">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="permit" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ModelRule" eSuperTypes="#//Rule platform:/plugin/org.eclipse.papyrus.infra.constraints/Model/Constraints.ecore#//DisplayUnit">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="element" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="stereotypes" upperBound="-1"
-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="multiplicity" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" defaultValueLiteral="-1"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="OwningRule" eSuperTypes="#//Rule">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="element" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="stereotypes" upperBound="-1"
-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="multiplicity" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" defaultValueLiteral="-1"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="newModelPath" upperBound="-1"
-        eType="#//ModelAutoCreate" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="selectDiagramRoot" upperBound="-1"
-        eType="#//RootAutoSelect" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ChildRule" eSuperTypes="#//Rule">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="element" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="stereotypes" upperBound="-1"
-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="origin" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="insertionPath" upperBound="-1"
-        eType="#//PathElement" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PaletteRule" eSuperTypes="#//Rule">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="element" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PathElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="feature" lowerBound="1"
-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EReference"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="origin" lowerBound="1"
-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass" changeable="false"
-        volatile="true" transient="true" derived="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"
-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass" changeable="false"
-        volatile="true" transient="true" derived="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Category">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ModelAutoCreate">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="feature" lowerBound="1"
-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EReference"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="origin" lowerBound="1"
-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass" changeable="false"
-        volatile="true" transient="true" derived="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="creationType" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="RootAutoSelect">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="feature" lowerBound="1"
-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EReference"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AssistantRule" eSuperTypes="#//Rule">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A rule that permits or forbids one or more modeling assistants by element type ID."/>
-    </eAnnotations>
-    <eOperations name="matches" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Queries whether I match a given &lt;tt>elementType&lt;/tt>."/>
-      </eAnnotations>
-      <eParameters name="elementType" lowerBound="1" eType="#//ElementType"/>
-    </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="elementTypeID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="&lt;p>&#xA;Modeling assistants are identified by the ID of the element type that they create.&#xA;This element type ID supports very simple wildcard patterns:  an asterisk (&lt;tt>*&lt;/tt>)&#xA;may be used to match any substring, including the empty substring.  This is&#xA;particularly useful to match an entire family of related element types by namespace&#xA;prefix, using a terminal asterisk.&#xA;&lt;/p>&lt;p>&#xA;If the element type ID is omitted, then the rule applies to all element types&#xA;(universal wildcard).&#xA;&lt;/p>"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="ElementType" instanceClassName="org.eclipse.gmf.runtime.emf.type.core.IElementType"/>
-</ecore:EPackage>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/model/configuration.genmodel b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/model/configuration.genmodel
deleted file mode 100644
index c21da7a6c59..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/model/configuration.genmodel
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2015 CEA LIST and others.&#xD;&#xA;&#xD;&#xA; All rights reserved. This program and the accompanying materials&#xD;&#xA; are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA; which accompanies this distribution, and is available at&#xD;&#xA; http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA; &#xD;&#xA; Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation&#xD;&#xA; &#xD;&#xA;"
-    modelDirectory="/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen" creationIcons="false"
-    editDirectory="/org.eclipse.papyrus.infra.viewpoints.configuration.edit/src-gen"
-    editorDirectory="/org.eclipse.papyrus.infra.viewpoints.configuration.editor/src-gen"
-    modelPluginID="org.eclipse.papyrus.infra.viewpoints.configuration" modelName="Configuration"
-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" codeFormatting="true"
-    testsDirectory="/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen"
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="6.0" copyrightFields="false"
-    usedGenPackages="../../org.eclipse.papyrus.infra.constraints/Model/Constraints.genmodel#//constraints platform:/plugin/org.eclipse.papyrus.infra.viewpoints.iso42010/model/iso42010.genmodel#//iso42010"
-    operationReflection="true" importOrganizing="true" cleanup="true">
-  <foreignModel>configuration.ecore</foreignModel>
-  <genPackages prefix="Configuration" basePackage="org.eclipse.papyrus.infra.viewpoints"
-      disposableProviderFactory="true" generateExampleClass="false" extensibleProviderFactory="true"
-      childCreationExtenders="true" ecorePackage="configuration.ecore#/">
-    <genDataTypes ecoreDataType="configuration.ecore#//ElementType"/>
-    <genClasses ecoreClass="configuration.ecore#//PapyrusConfiguration">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference configuration.ecore#//PapyrusConfiguration/defaultStakeholder"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference configuration.ecore#//PapyrusConfiguration/metamodel"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference configuration.ecore#//PapyrusConfiguration/categories"/>
-    </genClasses>
-    <genClasses ecoreClass="configuration.ecore#//PapyrusViewpoint">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference configuration.ecore#//PapyrusViewpoint/parent"/>
-    </genClasses>
-    <genClasses ecoreClass="configuration.ecore#//PapyrusView">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute configuration.ecore#//PapyrusView/icon"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference configuration.ecore#//PapyrusView/parent"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference configuration.ecore#//PapyrusView/profiles"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference configuration.ecore#//PapyrusView/modelRules"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference configuration.ecore#//PapyrusView/owningRules"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute configuration.ecore#//PapyrusView/implementationID"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference configuration.ecore#//PapyrusView/categories"/>
-    </genClasses>
-    <genClasses ecoreClass="configuration.ecore#//PapyrusDiagram">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute configuration.ecore#//PapyrusDiagram/customPalette"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute configuration.ecore#//PapyrusDiagram/customStyle"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference configuration.ecore#//PapyrusDiagram/childRules"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference configuration.ecore#//PapyrusDiagram/paletteRules"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference configuration.ecore#//PapyrusDiagram/assistantRules"/>
-    </genClasses>
-    <genClasses ecoreClass="configuration.ecore#//PapyrusSyncTable"/>
-    <genClasses ecoreClass="configuration.ecore#//PapyrusTable">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute configuration.ecore#//PapyrusTable/configuration"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="configuration.ecore#//Rule">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute configuration.ecore#//Rule/permit"/>
-    </genClasses>
-    <genClasses ecoreClass="configuration.ecore#//ModelRule">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference configuration.ecore#//ModelRule/element"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference configuration.ecore#//ModelRule/stereotypes"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute configuration.ecore#//ModelRule/multiplicity"/>
-    </genClasses>
-    <genClasses ecoreClass="configuration.ecore#//OwningRule">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference configuration.ecore#//OwningRule/element"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference configuration.ecore#//OwningRule/stereotypes"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute configuration.ecore#//OwningRule/multiplicity"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference configuration.ecore#//OwningRule/newModelPath"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference configuration.ecore#//OwningRule/selectDiagramRoot"/>
-    </genClasses>
-    <genClasses ecoreClass="configuration.ecore#//ChildRule">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference configuration.ecore#//ChildRule/element"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference configuration.ecore#//ChildRule/stereotypes"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference configuration.ecore#//ChildRule/origin"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference configuration.ecore#//ChildRule/insertionPath"/>
-    </genClasses>
-    <genClasses ecoreClass="configuration.ecore#//PaletteRule">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute configuration.ecore#//PaletteRule/element"/>
-    </genClasses>
-    <genClasses ecoreClass="configuration.ecore#//PathElement">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference configuration.ecore#//PathElement/feature"/>
-      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference configuration.ecore#//PathElement/origin"/>
-      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference configuration.ecore#//PathElement/target"/>
-    </genClasses>
-    <genClasses ecoreClass="configuration.ecore#//Category">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute configuration.ecore#//Category/name"/>
-    </genClasses>
-    <genClasses ecoreClass="configuration.ecore#//ModelAutoCreate">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference configuration.ecore#//ModelAutoCreate/feature"/>
-      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference configuration.ecore#//ModelAutoCreate/origin"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute configuration.ecore#//ModelAutoCreate/creationType"/>
-    </genClasses>
-    <genClasses ecoreClass="configuration.ecore#//RootAutoSelect">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference configuration.ecore#//RootAutoSelect/feature"/>
-    </genClasses>
-    <genClasses ecoreClass="configuration.ecore#//AssistantRule">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute configuration.ecore#//AssistantRule/elementTypeID"/>
-      <genOperations ecoreOperation="configuration.ecore#//AssistantRule/matches">
-        <genParameters ecoreParameter="configuration.ecore#//AssistantRule/matches/elementType"/>
-      </genOperations>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/plugin.properties b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/plugin.properties
deleted file mode 100755
index 5d578b8fcc6..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-##########################################################################################

-# Copyright (c) 2013 CEA LIST.

-# 

-#     

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#  Laurent Wouters (CEA LIST) laurent.wouters@cea.fr - Initial API and implementation

-#

-########################################################################################

-

-pluginName = Papyrus Viewpoints Configuration

-providerName = Eclipse Modeling Project

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/plugin.xml b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/plugin.xml
deleted file mode 100644
index 11904e07372..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/plugin.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- Copyright (c) 2013 CEA LIST.
- 
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Public License v1.0
-  which accompanies this distribution, and is available at
-  http://www.eclipse.org/legal/epl-v10.html
-  
-  Contributors:
-  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
-  
- 
--->
-
-<plugin>
-
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated configuration -->
-      <package
-            uri="http://www.eclipse.org/papyrus/infra/viewpoints/configuration"
-            class="org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage"
-            genModel="model/configuration.genmodel"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.ecore.extension_parser">
-      <!-- @generated NOT configuration -->
-      <parser
-            type="configuration"
-            class="org.eclipse.papyrus.infra.viewpoints.configuration.util.ConfigurationResourceFactoryCustomImpl"/>
-   </extension>
-   
-   <extension
-         point="org.eclipse.emf.ecore.factory_override">
-      <factory
-            uri="http://www.eclipse.org/papyrus/infra/viewpoints/configuration"
-            class="org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationFactoryCustomImpl">
-      </factory>
-   </extension>
-
-
-
-</plugin>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/pom.xml b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/pom.xml
deleted file mode 100644
index 3443298f360..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/pom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus.infra-viewpoints</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.infra.viewpoints.configuration</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/Category.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/Category.java
deleted file mode 100644
index 38b999b2079..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/Category.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Copyright (c) 2013 CEA LIST.
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  
- * 
- */
-package org.eclipse.papyrus.infra.viewpoints.configuration;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Category</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.Category#getName <em>Name</em>}</li>
- * </ul>
- *
- * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getCategory()
- * @model
- * @generated
- */
-public interface Category 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.infra.viewpoints.configuration.ConfigurationPackage#getCategory_Name()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.Category#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);
-
-} // Category
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/ConfigurationFactory.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/ConfigurationFactory.java
deleted file mode 100644
index d9a59dcbffc..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/ConfigurationFactory.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/**
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- *
- *  Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *
- */
-package org.eclipse.papyrus.infra.viewpoints.configuration;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage
- * @generated
- */
-public interface ConfigurationFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	ConfigurationFactory eINSTANCE = org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Papyrus Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Papyrus Configuration</em>'.
-	 * @generated
-	 */
-	PapyrusConfiguration createPapyrusConfiguration();
-
-	/**
-	 * Returns a new object of class '<em>Papyrus Viewpoint</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Papyrus Viewpoint</em>'.
-	 * @generated
-	 */
-	PapyrusViewpoint createPapyrusViewpoint();
-
-	/**
-	 * Returns a new object of class '<em>Papyrus View</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Papyrus View</em>'.
-	 * @generated
-	 */
-	PapyrusView createPapyrusView();
-
-	/**
-	 * Returns a new object of class '<em>Papyrus Diagram</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Papyrus Diagram</em>'.
-	 * @generated
-	 */
-	PapyrusDiagram createPapyrusDiagram();
-
-	/**
-	 * Returns a new object of class '<em>Papyrus Sync Table</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Papyrus Sync Table</em>'.
-	 * @generated
-	 */
-	PapyrusSyncTable createPapyrusSyncTable();
-
-	/**
-	 * Returns a new object of class '<em>Papyrus Table</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Papyrus Table</em>'.
-	 * @generated
-	 */
-	PapyrusTable createPapyrusTable();
-
-	/**
-	 * Returns a new object of class '<em>Model Rule</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Model Rule</em>'.
-	 * @generated
-	 */
-	ModelRule createModelRule();
-
-	/**
-	 * Returns a new object of class '<em>Owning Rule</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Owning Rule</em>'.
-	 * @generated
-	 */
-	OwningRule createOwningRule();
-
-	/**
-	 * Returns a new object of class '<em>Child Rule</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Child Rule</em>'.
-	 * @generated
-	 */
-	ChildRule createChildRule();
-
-	/**
-	 * Returns a new object of class '<em>Palette Rule</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Palette Rule</em>'.
-	 * @generated
-	 */
-	PaletteRule createPaletteRule();
-
-	/**
-	 * Returns a new object of class '<em>Path Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Path Element</em>'.
-	 * @generated
-	 */
-	PathElement createPathElement();
-
-	/**
-	 * Returns a new object of class '<em>Category</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Category</em>'.
-	 * @generated
-	 */
-	Category createCategory();
-
-	/**
-	 * Returns a new object of class '<em>Model Auto Create</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Model Auto Create</em>'.
-	 * @generated
-	 */
-	ModelAutoCreate createModelAutoCreate();
-
-	/**
-	 * Returns a new object of class '<em>Root Auto Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Root Auto Select</em>'.
-	 * @generated
-	 */
-	RootAutoSelect createRootAutoSelect();
-
-	/**
-	 * Returns a new object of class '<em>Assistant Rule</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Assistant Rule</em>'.
-	 * @generated
-	 */
-	AssistantRule createAssistantRule();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	ConfigurationPackage getConfigurationPackage();
-
-} //ConfigurationFactory
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/ConfigurationPackage.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/ConfigurationPackage.java
deleted file mode 100644
index bd6417c3a8d..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/ConfigurationPackage.java
+++ /dev/null
@@ -1,2526 +0,0 @@
-/**
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- *
- *  Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *
- */
-package org.eclipse.papyrus.infra.viewpoints.configuration;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each operation of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationFactory
- * @model kind="package"
- * @generated
- */
-public interface ConfigurationPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "configuration";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.eclipse.org/papyrus/infra/viewpoints/configuration";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "configuration";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	ConfigurationPackage eINSTANCE = org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusConfigurationImpl <em>Papyrus Configuration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getPapyrusConfiguration()
-	 * @generated
-	 */
-	int PAPYRUS_CONFIGURATION = 0;
-
-	/**
-	 * The feature id for the '<em><b>Stakeholders</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_CONFIGURATION__STAKEHOLDERS = Iso42010Package.ARCHITECTURE_FRAMEWORK__STAKEHOLDERS;
-
-	/**
-	 * The feature id for the '<em><b>Viewpoints</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_CONFIGURATION__VIEWPOINTS = Iso42010Package.ARCHITECTURE_FRAMEWORK__VIEWPOINTS;
-
-	/**
-	 * The feature id for the '<em><b>Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_CONFIGURATION__RULES = Iso42010Package.ARCHITECTURE_FRAMEWORK__RULES;
-
-	/**
-	 * The feature id for the '<em><b>Concerns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_CONFIGURATION__CONCERNS = Iso42010Package.ARCHITECTURE_FRAMEWORK__CONCERNS;
-
-	/**
-	 * The feature id for the '<em><b>Default Stakeholder</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_CONFIGURATION__DEFAULT_STAKEHOLDER = Iso42010Package.ARCHITECTURE_FRAMEWORK_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Metamodel</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_CONFIGURATION__METAMODEL = Iso42010Package.ARCHITECTURE_FRAMEWORK_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Categories</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_CONFIGURATION__CATEGORIES = Iso42010Package.ARCHITECTURE_FRAMEWORK_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Papyrus Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_CONFIGURATION_FEATURE_COUNT = Iso42010Package.ARCHITECTURE_FRAMEWORK_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of operations of the '<em>Papyrus Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_CONFIGURATION_OPERATION_COUNT = Iso42010Package.ARCHITECTURE_FRAMEWORK_OPERATION_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusViewpointImpl <em>Papyrus Viewpoint</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusViewpointImpl
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getPapyrusViewpoint()
-	 * @generated
-	 */
-	int PAPYRUS_VIEWPOINT = 1;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_VIEWPOINT__NAME = Iso42010Package.ARCHITECTURE_VIEWPOINT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Affected By</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_VIEWPOINT__AFFECTED_BY = Iso42010Package.ARCHITECTURE_VIEWPOINT__AFFECTED_BY;
-
-	/**
-	 * The feature id for the '<em><b>Model Kinds</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_VIEWPOINT__MODEL_KINDS = Iso42010Package.ARCHITECTURE_VIEWPOINT__MODEL_KINDS;
-
-	/**
-	 * The feature id for the '<em><b>Governs</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_VIEWPOINT__GOVERNS = Iso42010Package.ARCHITECTURE_VIEWPOINT__GOVERNS;
-
-	/**
-	 * The feature id for the '<em><b>Frames</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_VIEWPOINT__FRAMES = Iso42010Package.ARCHITECTURE_VIEWPOINT__FRAMES;
-
-	/**
-	 * The feature id for the '<em><b>Parent</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_VIEWPOINT__PARENT = Iso42010Package.ARCHITECTURE_VIEWPOINT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Papyrus Viewpoint</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_VIEWPOINT_FEATURE_COUNT = Iso42010Package.ARCHITECTURE_VIEWPOINT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of operations of the '<em>Papyrus Viewpoint</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_VIEWPOINT_OPERATION_COUNT = Iso42010Package.ARCHITECTURE_VIEWPOINT_OPERATION_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusViewImpl <em>Papyrus View</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusViewImpl
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getPapyrusView()
-	 * @generated
-	 */
-	int PAPYRUS_VIEW = 2;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_VIEW__NAME = Iso42010Package.MODEL_KIND__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Affected By</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_VIEW__AFFECTED_BY = Iso42010Package.MODEL_KIND__AFFECTED_BY;
-
-	/**
-	 * The feature id for the '<em><b>Governs</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_VIEW__GOVERNS = Iso42010Package.MODEL_KIND__GOVERNS;
-
-	/**
-	 * The feature id for the '<em><b>Viewpoint</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_VIEW__VIEWPOINT = Iso42010Package.MODEL_KIND__VIEWPOINT;
-
-	/**
-	 * The feature id for the '<em><b>Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_VIEW__ICON = Iso42010Package.MODEL_KIND_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Parent</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_VIEW__PARENT = Iso42010Package.MODEL_KIND_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Profiles</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_VIEW__PROFILES = Iso42010Package.MODEL_KIND_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Model Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_VIEW__MODEL_RULES = Iso42010Package.MODEL_KIND_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Owning Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_VIEW__OWNING_RULES = Iso42010Package.MODEL_KIND_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Implementation ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_VIEW__IMPLEMENTATION_ID = Iso42010Package.MODEL_KIND_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Categories</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_VIEW__CATEGORIES = Iso42010Package.MODEL_KIND_FEATURE_COUNT + 6;
-
-	/**
-	 * The number of structural features of the '<em>Papyrus View</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_VIEW_FEATURE_COUNT = Iso42010Package.MODEL_KIND_FEATURE_COUNT + 7;
-
-	/**
-	 * The number of operations of the '<em>Papyrus View</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_VIEW_OPERATION_COUNT = Iso42010Package.MODEL_KIND_OPERATION_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusDiagramImpl <em>Papyrus Diagram</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusDiagramImpl
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getPapyrusDiagram()
-	 * @generated
-	 */
-	int PAPYRUS_DIAGRAM = 3;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_DIAGRAM__NAME = PAPYRUS_VIEW__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Affected By</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_DIAGRAM__AFFECTED_BY = PAPYRUS_VIEW__AFFECTED_BY;
-
-	/**
-	 * The feature id for the '<em><b>Governs</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_DIAGRAM__GOVERNS = PAPYRUS_VIEW__GOVERNS;
-
-	/**
-	 * The feature id for the '<em><b>Viewpoint</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_DIAGRAM__VIEWPOINT = PAPYRUS_VIEW__VIEWPOINT;
-
-	/**
-	 * The feature id for the '<em><b>Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_DIAGRAM__ICON = PAPYRUS_VIEW__ICON;
-
-	/**
-	 * The feature id for the '<em><b>Parent</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_DIAGRAM__PARENT = PAPYRUS_VIEW__PARENT;
-
-	/**
-	 * The feature id for the '<em><b>Profiles</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_DIAGRAM__PROFILES = PAPYRUS_VIEW__PROFILES;
-
-	/**
-	 * The feature id for the '<em><b>Model Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_DIAGRAM__MODEL_RULES = PAPYRUS_VIEW__MODEL_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Owning Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_DIAGRAM__OWNING_RULES = PAPYRUS_VIEW__OWNING_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Implementation ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_DIAGRAM__IMPLEMENTATION_ID = PAPYRUS_VIEW__IMPLEMENTATION_ID;
-
-	/**
-	 * The feature id for the '<em><b>Categories</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_DIAGRAM__CATEGORIES = PAPYRUS_VIEW__CATEGORIES;
-
-	/**
-	 * The feature id for the '<em><b>Custom Palette</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_DIAGRAM__CUSTOM_PALETTE = PAPYRUS_VIEW_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Custom Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_DIAGRAM__CUSTOM_STYLE = PAPYRUS_VIEW_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Child Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_DIAGRAM__CHILD_RULES = PAPYRUS_VIEW_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Palette Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_DIAGRAM__PALETTE_RULES = PAPYRUS_VIEW_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Assistant Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_DIAGRAM__ASSISTANT_RULES = PAPYRUS_VIEW_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the '<em>Papyrus Diagram</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_DIAGRAM_FEATURE_COUNT = PAPYRUS_VIEW_FEATURE_COUNT + 5;
-
-	/**
-	 * The number of operations of the '<em>Papyrus Diagram</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_DIAGRAM_OPERATION_COUNT = PAPYRUS_VIEW_OPERATION_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusSyncTableImpl <em>Papyrus Sync Table</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusSyncTableImpl
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getPapyrusSyncTable()
-	 * @generated
-	 */
-	int PAPYRUS_SYNC_TABLE = 4;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_SYNC_TABLE__NAME = PAPYRUS_VIEW__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Affected By</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_SYNC_TABLE__AFFECTED_BY = PAPYRUS_VIEW__AFFECTED_BY;
-
-	/**
-	 * The feature id for the '<em><b>Governs</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_SYNC_TABLE__GOVERNS = PAPYRUS_VIEW__GOVERNS;
-
-	/**
-	 * The feature id for the '<em><b>Viewpoint</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_SYNC_TABLE__VIEWPOINT = PAPYRUS_VIEW__VIEWPOINT;
-
-	/**
-	 * The feature id for the '<em><b>Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_SYNC_TABLE__ICON = PAPYRUS_VIEW__ICON;
-
-	/**
-	 * The feature id for the '<em><b>Parent</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_SYNC_TABLE__PARENT = PAPYRUS_VIEW__PARENT;
-
-	/**
-	 * The feature id for the '<em><b>Profiles</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_SYNC_TABLE__PROFILES = PAPYRUS_VIEW__PROFILES;
-
-	/**
-	 * The feature id for the '<em><b>Model Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_SYNC_TABLE__MODEL_RULES = PAPYRUS_VIEW__MODEL_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Owning Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_SYNC_TABLE__OWNING_RULES = PAPYRUS_VIEW__OWNING_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Implementation ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_SYNC_TABLE__IMPLEMENTATION_ID = PAPYRUS_VIEW__IMPLEMENTATION_ID;
-
-	/**
-	 * The feature id for the '<em><b>Categories</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_SYNC_TABLE__CATEGORIES = PAPYRUS_VIEW__CATEGORIES;
-
-	/**
-	 * The number of structural features of the '<em>Papyrus Sync Table</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_SYNC_TABLE_FEATURE_COUNT = PAPYRUS_VIEW_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of operations of the '<em>Papyrus Sync Table</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_SYNC_TABLE_OPERATION_COUNT = PAPYRUS_VIEW_OPERATION_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusTableImpl <em>Papyrus Table</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusTableImpl
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getPapyrusTable()
-	 * @generated
-	 */
-	int PAPYRUS_TABLE = 5;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_TABLE__NAME = PAPYRUS_VIEW__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Affected By</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_TABLE__AFFECTED_BY = PAPYRUS_VIEW__AFFECTED_BY;
-
-	/**
-	 * The feature id for the '<em><b>Governs</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_TABLE__GOVERNS = PAPYRUS_VIEW__GOVERNS;
-
-	/**
-	 * The feature id for the '<em><b>Viewpoint</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_TABLE__VIEWPOINT = PAPYRUS_VIEW__VIEWPOINT;
-
-	/**
-	 * The feature id for the '<em><b>Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_TABLE__ICON = PAPYRUS_VIEW__ICON;
-
-	/**
-	 * The feature id for the '<em><b>Parent</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_TABLE__PARENT = PAPYRUS_VIEW__PARENT;
-
-	/**
-	 * The feature id for the '<em><b>Profiles</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_TABLE__PROFILES = PAPYRUS_VIEW__PROFILES;
-
-	/**
-	 * The feature id for the '<em><b>Model Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_TABLE__MODEL_RULES = PAPYRUS_VIEW__MODEL_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Owning Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_TABLE__OWNING_RULES = PAPYRUS_VIEW__OWNING_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Implementation ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_TABLE__IMPLEMENTATION_ID = PAPYRUS_VIEW__IMPLEMENTATION_ID;
-
-	/**
-	 * The feature id for the '<em><b>Categories</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_TABLE__CATEGORIES = PAPYRUS_VIEW__CATEGORIES;
-
-	/**
-	 * The feature id for the '<em><b>Configuration</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_TABLE__CONFIGURATION = PAPYRUS_VIEW_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Papyrus Table</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_TABLE_FEATURE_COUNT = PAPYRUS_VIEW_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of operations of the '<em>Papyrus Table</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PAPYRUS_TABLE_OPERATION_COUNT = PAPYRUS_VIEW_OPERATION_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.RuleImpl <em>Rule</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.RuleImpl
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getRule()
-	 * @generated
-	 */
-	int RULE = 6;
-
-	/**
-	 * The feature id for the '<em><b>Permit</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RULE__PERMIT = 0;
-
-	/**
-	 * The number of structural features of the '<em>Rule</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RULE_FEATURE_COUNT = 1;
-
-	/**
-	 * The number of operations of the '<em>Rule</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RULE_OPERATION_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.ModelRuleImpl <em>Model Rule</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ModelRuleImpl
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getModelRule()
-	 * @generated
-	 */
-	int MODEL_RULE = 7;
-
-	/**
-	 * The feature id for the '<em><b>Permit</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MODEL_RULE__PERMIT = RULE__PERMIT;
-
-	/**
-	 * The feature id for the '<em><b>Constraints</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MODEL_RULE__CONSTRAINTS = RULE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Element Multiplicity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MODEL_RULE__ELEMENT_MULTIPLICITY = RULE_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MODEL_RULE__ELEMENT = RULE_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Stereotypes</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MODEL_RULE__STEREOTYPES = RULE_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Multiplicity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MODEL_RULE__MULTIPLICITY = RULE_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the '<em>Model Rule</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MODEL_RULE_FEATURE_COUNT = RULE_FEATURE_COUNT + 5;
-
-	/**
-	 * The number of operations of the '<em>Model Rule</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MODEL_RULE_OPERATION_COUNT = RULE_OPERATION_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.OwningRuleImpl <em>Owning Rule</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.OwningRuleImpl
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getOwningRule()
-	 * @generated
-	 */
-	int OWNING_RULE = 8;
-
-	/**
-	 * The feature id for the '<em><b>Permit</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OWNING_RULE__PERMIT = RULE__PERMIT;
-
-	/**
-	 * The feature id for the '<em><b>Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OWNING_RULE__ELEMENT = RULE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Stereotypes</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OWNING_RULE__STEREOTYPES = RULE_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Multiplicity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OWNING_RULE__MULTIPLICITY = RULE_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>New Model Path</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OWNING_RULE__NEW_MODEL_PATH = RULE_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Select Diagram Root</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OWNING_RULE__SELECT_DIAGRAM_ROOT = RULE_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the '<em>Owning Rule</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OWNING_RULE_FEATURE_COUNT = RULE_FEATURE_COUNT + 5;
-
-	/**
-	 * The number of operations of the '<em>Owning Rule</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OWNING_RULE_OPERATION_COUNT = RULE_OPERATION_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.ChildRuleImpl <em>Child Rule</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ChildRuleImpl
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getChildRule()
-	 * @generated
-	 */
-	int CHILD_RULE = 9;
-
-	/**
-	 * The feature id for the '<em><b>Permit</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHILD_RULE__PERMIT = RULE__PERMIT;
-
-	/**
-	 * The feature id for the '<em><b>Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHILD_RULE__ELEMENT = RULE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Stereotypes</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHILD_RULE__STEREOTYPES = RULE_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Origin</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHILD_RULE__ORIGIN = RULE_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Insertion Path</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHILD_RULE__INSERTION_PATH = RULE_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Child Rule</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHILD_RULE_FEATURE_COUNT = RULE_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of operations of the '<em>Child Rule</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHILD_RULE_OPERATION_COUNT = RULE_OPERATION_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PaletteRuleImpl <em>Palette Rule</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.PaletteRuleImpl
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getPaletteRule()
-	 * @generated
-	 */
-	int PALETTE_RULE = 10;
-
-	/**
-	 * The feature id for the '<em><b>Permit</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PALETTE_RULE__PERMIT = RULE__PERMIT;
-
-	/**
-	 * The feature id for the '<em><b>Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PALETTE_RULE__ELEMENT = RULE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Palette Rule</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PALETTE_RULE_FEATURE_COUNT = RULE_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of operations of the '<em>Palette Rule</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PALETTE_RULE_OPERATION_COUNT = RULE_OPERATION_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PathElementImpl <em>Path Element</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.PathElementImpl
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getPathElement()
-	 * @generated
-	 */
-	int PATH_ELEMENT = 11;
-
-	/**
-	 * The feature id for the '<em><b>Feature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PATH_ELEMENT__FEATURE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Origin</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PATH_ELEMENT__ORIGIN = 1;
-
-	/**
-	 * The feature id for the '<em><b>Target</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PATH_ELEMENT__TARGET = 2;
-
-	/**
-	 * The number of structural features of the '<em>Path Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PATH_ELEMENT_FEATURE_COUNT = 3;
-
-	/**
-	 * The number of operations of the '<em>Path Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PATH_ELEMENT_OPERATION_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.CategoryImpl <em>Category</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.CategoryImpl
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getCategory()
-	 * @generated
-	 */
-	int CATEGORY = 12;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CATEGORY__NAME = 0;
-
-	/**
-	 * The number of structural features of the '<em>Category</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CATEGORY_FEATURE_COUNT = 1;
-
-	/**
-	 * The number of operations of the '<em>Category</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CATEGORY_OPERATION_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.ModelAutoCreateImpl <em>Model Auto Create</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ModelAutoCreateImpl
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getModelAutoCreate()
-	 * @generated
-	 */
-	int MODEL_AUTO_CREATE = 13;
-
-	/**
-	 * The feature id for the '<em><b>Feature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MODEL_AUTO_CREATE__FEATURE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Origin</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MODEL_AUTO_CREATE__ORIGIN = 1;
-
-	/**
-	 * The feature id for the '<em><b>Creation Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MODEL_AUTO_CREATE__CREATION_TYPE = 2;
-
-	/**
-	 * The number of structural features of the '<em>Model Auto Create</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MODEL_AUTO_CREATE_FEATURE_COUNT = 3;
-
-	/**
-	 * The number of operations of the '<em>Model Auto Create</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MODEL_AUTO_CREATE_OPERATION_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.RootAutoSelectImpl <em>Root Auto Select</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.RootAutoSelectImpl
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getRootAutoSelect()
-	 * @generated
-	 */
-	int ROOT_AUTO_SELECT = 14;
-
-	/**
-	 * The feature id for the '<em><b>Feature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROOT_AUTO_SELECT__FEATURE = 0;
-
-	/**
-	 * The number of structural features of the '<em>Root Auto Select</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROOT_AUTO_SELECT_FEATURE_COUNT = 1;
-
-	/**
-	 * The number of operations of the '<em>Root Auto Select</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROOT_AUTO_SELECT_OPERATION_COUNT = 0;
-
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.AssistantRuleImpl <em>Assistant Rule</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.AssistantRuleImpl
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getAssistantRule()
-	 * @generated
-	 */
-	int ASSISTANT_RULE = 15;
-
-	/**
-	 * The feature id for the '<em><b>Permit</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSISTANT_RULE__PERMIT = RULE__PERMIT;
-
-	/**
-	 * The feature id for the '<em><b>Element Type ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSISTANT_RULE__ELEMENT_TYPE_ID = RULE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Assistant Rule</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSISTANT_RULE_FEATURE_COUNT = RULE_FEATURE_COUNT + 1;
-
-	/**
-	 * The operation id for the '<em>Matches</em>' operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSISTANT_RULE___MATCHES__IELEMENTTYPE = RULE_OPERATION_COUNT + 0;
-
-	/**
-	 * The number of operations of the '<em>Assistant Rule</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSISTANT_RULE_OPERATION_COUNT = RULE_OPERATION_COUNT + 1;
-
-
-	/**
-	 * The meta object id for the '<em>Element Type</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.gmf.runtime.emf.type.core.IElementType
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getElementType()
-	 * @generated
-	 */
-	int ELEMENT_TYPE = 16;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusConfiguration <em>Papyrus Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Papyrus Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusConfiguration
-	 * @generated
-	 */
-	EClass getPapyrusConfiguration();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusConfiguration#getDefaultStakeholder <em>Default Stakeholder</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Default Stakeholder</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusConfiguration#getDefaultStakeholder()
-	 * @see #getPapyrusConfiguration()
-	 * @generated
-	 */
-	EReference getPapyrusConfiguration_DefaultStakeholder();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusConfiguration#getMetamodel <em>Metamodel</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Metamodel</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusConfiguration#getMetamodel()
-	 * @see #getPapyrusConfiguration()
-	 * @generated
-	 */
-	EReference getPapyrusConfiguration_Metamodel();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusConfiguration#getCategories <em>Categories</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Categories</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusConfiguration#getCategories()
-	 * @see #getPapyrusConfiguration()
-	 * @generated
-	 */
-	EReference getPapyrusConfiguration_Categories();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusViewpoint <em>Papyrus Viewpoint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Papyrus Viewpoint</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusViewpoint
-	 * @generated
-	 */
-	EClass getPapyrusViewpoint();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusViewpoint#getParent <em>Parent</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Parent</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusViewpoint#getParent()
-	 * @see #getPapyrusViewpoint()
-	 * @generated
-	 */
-	EReference getPapyrusViewpoint_Parent();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView <em>Papyrus View</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Papyrus View</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView
-	 * @generated
-	 */
-	EClass getPapyrusView();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView#getIcon <em>Icon</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Icon</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView#getIcon()
-	 * @see #getPapyrusView()
-	 * @generated
-	 */
-	EAttribute getPapyrusView_Icon();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView#getParent <em>Parent</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Parent</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView#getParent()
-	 * @see #getPapyrusView()
-	 * @generated
-	 */
-	EReference getPapyrusView_Parent();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView#getProfiles <em>Profiles</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Profiles</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView#getProfiles()
-	 * @see #getPapyrusView()
-	 * @generated
-	 */
-	EReference getPapyrusView_Profiles();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView#getModelRules <em>Model Rules</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Model Rules</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView#getModelRules()
-	 * @see #getPapyrusView()
-	 * @generated
-	 */
-	EReference getPapyrusView_ModelRules();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView#getOwningRules <em>Owning Rules</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Owning Rules</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView#getOwningRules()
-	 * @see #getPapyrusView()
-	 * @generated
-	 */
-	EReference getPapyrusView_OwningRules();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView#getImplementationID <em>Implementation ID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Implementation ID</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView#getImplementationID()
-	 * @see #getPapyrusView()
-	 * @generated
-	 */
-	EAttribute getPapyrusView_ImplementationID();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView#getCategories <em>Categories</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Categories</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView#getCategories()
-	 * @see #getPapyrusView()
-	 * @generated
-	 */
-	EReference getPapyrusView_Categories();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram <em>Papyrus Diagram</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Papyrus Diagram</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram
-	 * @generated
-	 */
-	EClass getPapyrusDiagram();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram#getCustomPalette <em>Custom Palette</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Custom Palette</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram#getCustomPalette()
-	 * @see #getPapyrusDiagram()
-	 * @generated
-	 */
-	EAttribute getPapyrusDiagram_CustomPalette();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram#getCustomStyle <em>Custom Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Custom Style</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram#getCustomStyle()
-	 * @see #getPapyrusDiagram()
-	 * @generated
-	 */
-	EAttribute getPapyrusDiagram_CustomStyle();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram#getChildRules <em>Child Rules</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Child Rules</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram#getChildRules()
-	 * @see #getPapyrusDiagram()
-	 * @generated
-	 */
-	EReference getPapyrusDiagram_ChildRules();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram#getPaletteRules <em>Palette Rules</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Palette Rules</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram#getPaletteRules()
-	 * @see #getPapyrusDiagram()
-	 * @generated
-	 */
-	EReference getPapyrusDiagram_PaletteRules();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram#getAssistantRules <em>Assistant Rules</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Assistant Rules</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram#getAssistantRules()
-	 * @see #getPapyrusDiagram()
-	 * @generated
-	 */
-	EReference getPapyrusDiagram_AssistantRules();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusSyncTable <em>Papyrus Sync Table</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Papyrus Sync Table</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusSyncTable
-	 * @generated
-	 */
-	EClass getPapyrusSyncTable();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusTable <em>Papyrus Table</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Papyrus Table</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusTable
-	 * @generated
-	 */
-	EClass getPapyrusTable();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusTable#getConfiguration <em>Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusTable#getConfiguration()
-	 * @see #getPapyrusTable()
-	 * @generated
-	 */
-	EAttribute getPapyrusTable_Configuration();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.Rule <em>Rule</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Rule</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.Rule
-	 * @generated
-	 */
-	EClass getRule();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.viewpoints.configuration.Rule#isPermit <em>Permit</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Permit</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.Rule#isPermit()
-	 * @see #getRule()
-	 * @generated
-	 */
-	EAttribute getRule_Permit();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.ModelRule <em>Model Rule</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Model Rule</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ModelRule
-	 * @generated
-	 */
-	EClass getModelRule();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.viewpoints.configuration.ModelRule#getElement <em>Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Element</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ModelRule#getElement()
-	 * @see #getModelRule()
-	 * @generated
-	 */
-	EReference getModelRule_Element();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.viewpoints.configuration.ModelRule#getStereotypes <em>Stereotypes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Stereotypes</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ModelRule#getStereotypes()
-	 * @see #getModelRule()
-	 * @generated
-	 */
-	EReference getModelRule_Stereotypes();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.viewpoints.configuration.ModelRule#getMultiplicity <em>Multiplicity</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Multiplicity</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ModelRule#getMultiplicity()
-	 * @see #getModelRule()
-	 * @generated
-	 */
-	EAttribute getModelRule_Multiplicity();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.OwningRule <em>Owning Rule</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Owning Rule</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.OwningRule
-	 * @generated
-	 */
-	EClass getOwningRule();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.viewpoints.configuration.OwningRule#getElement <em>Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Element</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.OwningRule#getElement()
-	 * @see #getOwningRule()
-	 * @generated
-	 */
-	EReference getOwningRule_Element();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.viewpoints.configuration.OwningRule#getStereotypes <em>Stereotypes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Stereotypes</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.OwningRule#getStereotypes()
-	 * @see #getOwningRule()
-	 * @generated
-	 */
-	EReference getOwningRule_Stereotypes();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.viewpoints.configuration.OwningRule#getMultiplicity <em>Multiplicity</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Multiplicity</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.OwningRule#getMultiplicity()
-	 * @see #getOwningRule()
-	 * @generated
-	 */
-	EAttribute getOwningRule_Multiplicity();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.viewpoints.configuration.OwningRule#getNewModelPath <em>New Model Path</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>New Model Path</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.OwningRule#getNewModelPath()
-	 * @see #getOwningRule()
-	 * @generated
-	 */
-	EReference getOwningRule_NewModelPath();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.viewpoints.configuration.OwningRule#getSelectDiagramRoot <em>Select Diagram Root</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Select Diagram Root</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.OwningRule#getSelectDiagramRoot()
-	 * @see #getOwningRule()
-	 * @generated
-	 */
-	EReference getOwningRule_SelectDiagramRoot();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.ChildRule <em>Child Rule</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Child Rule</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ChildRule
-	 * @generated
-	 */
-	EClass getChildRule();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.viewpoints.configuration.ChildRule#getElement <em>Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Element</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ChildRule#getElement()
-	 * @see #getChildRule()
-	 * @generated
-	 */
-	EReference getChildRule_Element();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.viewpoints.configuration.ChildRule#getStereotypes <em>Stereotypes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Stereotypes</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ChildRule#getStereotypes()
-	 * @see #getChildRule()
-	 * @generated
-	 */
-	EReference getChildRule_Stereotypes();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.viewpoints.configuration.ChildRule#getOrigin <em>Origin</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Origin</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ChildRule#getOrigin()
-	 * @see #getChildRule()
-	 * @generated
-	 */
-	EReference getChildRule_Origin();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.viewpoints.configuration.ChildRule#getInsertionPath <em>Insertion Path</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Insertion Path</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ChildRule#getInsertionPath()
-	 * @see #getChildRule()
-	 * @generated
-	 */
-	EReference getChildRule_InsertionPath();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PaletteRule <em>Palette Rule</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Palette Rule</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PaletteRule
-	 * @generated
-	 */
-	EClass getPaletteRule();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PaletteRule#getElement <em>Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Element</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PaletteRule#getElement()
-	 * @see #getPaletteRule()
-	 * @generated
-	 */
-	EAttribute getPaletteRule_Element();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PathElement <em>Path Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Path Element</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PathElement
-	 * @generated
-	 */
-	EClass getPathElement();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PathElement#getFeature <em>Feature</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Feature</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PathElement#getFeature()
-	 * @see #getPathElement()
-	 * @generated
-	 */
-	EReference getPathElement_Feature();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PathElement#getOrigin <em>Origin</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Origin</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PathElement#getOrigin()
-	 * @see #getPathElement()
-	 * @generated
-	 */
-	EReference getPathElement_Origin();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PathElement#getTarget <em>Target</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Target</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PathElement#getTarget()
-	 * @see #getPathElement()
-	 * @generated
-	 */
-	EReference getPathElement_Target();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.Category <em>Category</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Category</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.Category
-	 * @generated
-	 */
-	EClass getCategory();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.viewpoints.configuration.Category#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.Category#getName()
-	 * @see #getCategory()
-	 * @generated
-	 */
-	EAttribute getCategory_Name();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.ModelAutoCreate <em>Model Auto Create</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Model Auto Create</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ModelAutoCreate
-	 * @generated
-	 */
-	EClass getModelAutoCreate();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.viewpoints.configuration.ModelAutoCreate#getFeature <em>Feature</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Feature</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ModelAutoCreate#getFeature()
-	 * @see #getModelAutoCreate()
-	 * @generated
-	 */
-	EReference getModelAutoCreate_Feature();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.viewpoints.configuration.ModelAutoCreate#getOrigin <em>Origin</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Origin</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ModelAutoCreate#getOrigin()
-	 * @see #getModelAutoCreate()
-	 * @generated
-	 */
-	EReference getModelAutoCreate_Origin();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.viewpoints.configuration.ModelAutoCreate#getCreationType <em>Creation Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Creation Type</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ModelAutoCreate#getCreationType()
-	 * @see #getModelAutoCreate()
-	 * @generated
-	 */
-	EAttribute getModelAutoCreate_CreationType();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.RootAutoSelect <em>Root Auto Select</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Root Auto Select</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.RootAutoSelect
-	 * @generated
-	 */
-	EClass getRootAutoSelect();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.viewpoints.configuration.RootAutoSelect#getFeature <em>Feature</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Feature</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.RootAutoSelect#getFeature()
-	 * @see #getRootAutoSelect()
-	 * @generated
-	 */
-	EReference getRootAutoSelect_Feature();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.AssistantRule <em>Assistant Rule</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Assistant Rule</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.AssistantRule
-	 * @generated
-	 */
-	EClass getAssistantRule();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.viewpoints.configuration.AssistantRule#getElementTypeID <em>Element Type ID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Element Type ID</em>'.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.AssistantRule#getElementTypeID()
-	 * @see #getAssistantRule()
-	 * @generated
-	 */
-	EAttribute getAssistantRule_ElementTypeID();
-
-	/**
-	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.AssistantRule#matches(org.eclipse.gmf.runtime.emf.type.core.IElementType) <em>Matches</em>}' operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the '<em>Matches</em>' operation.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.AssistantRule#matches(org.eclipse.gmf.runtime.emf.type.core.IElementType)
-	 * @generated
-	 */
-	EOperation getAssistantRule__Matches__IElementType();
-
-	/**
-	 * Returns the meta object for data type '{@link org.eclipse.gmf.runtime.emf.type.core.IElementType <em>Element Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Element Type</em>'.
-	 * @see org.eclipse.gmf.runtime.emf.type.core.IElementType
-	 * @model instanceClass="org.eclipse.gmf.runtime.emf.type.core.IElementType"
-	 * @generated
-	 */
-	EDataType getElementType();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	ConfigurationFactory getConfigurationFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each operation of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusConfigurationImpl <em>Papyrus Configuration</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusConfigurationImpl
-		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getPapyrusConfiguration()
-		 * @generated
-		 */
-		EClass PAPYRUS_CONFIGURATION = eINSTANCE.getPapyrusConfiguration();
-
-		/**
-		 * The meta object literal for the '<em><b>Default Stakeholder</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PAPYRUS_CONFIGURATION__DEFAULT_STAKEHOLDER = eINSTANCE.getPapyrusConfiguration_DefaultStakeholder();
-
-		/**
-		 * The meta object literal for the '<em><b>Metamodel</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PAPYRUS_CONFIGURATION__METAMODEL = eINSTANCE.getPapyrusConfiguration_Metamodel();
-
-		/**
-		 * The meta object literal for the '<em><b>Categories</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PAPYRUS_CONFIGURATION__CATEGORIES = eINSTANCE.getPapyrusConfiguration_Categories();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusViewpointImpl <em>Papyrus Viewpoint</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusViewpointImpl
-		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getPapyrusViewpoint()
-		 * @generated
-		 */
-		EClass PAPYRUS_VIEWPOINT = eINSTANCE.getPapyrusViewpoint();
-
-		/**
-		 * The meta object literal for the '<em><b>Parent</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PAPYRUS_VIEWPOINT__PARENT = eINSTANCE.getPapyrusViewpoint_Parent();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusViewImpl <em>Papyrus View</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusViewImpl
-		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getPapyrusView()
-		 * @generated
-		 */
-		EClass PAPYRUS_VIEW = eINSTANCE.getPapyrusView();
-
-		/**
-		 * The meta object literal for the '<em><b>Icon</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PAPYRUS_VIEW__ICON = eINSTANCE.getPapyrusView_Icon();
-
-		/**
-		 * The meta object literal for the '<em><b>Parent</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PAPYRUS_VIEW__PARENT = eINSTANCE.getPapyrusView_Parent();
-
-		/**
-		 * The meta object literal for the '<em><b>Profiles</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PAPYRUS_VIEW__PROFILES = eINSTANCE.getPapyrusView_Profiles();
-
-		/**
-		 * The meta object literal for the '<em><b>Model Rules</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PAPYRUS_VIEW__MODEL_RULES = eINSTANCE.getPapyrusView_ModelRules();
-
-		/**
-		 * The meta object literal for the '<em><b>Owning Rules</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PAPYRUS_VIEW__OWNING_RULES = eINSTANCE.getPapyrusView_OwningRules();
-
-		/**
-		 * The meta object literal for the '<em><b>Implementation ID</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PAPYRUS_VIEW__IMPLEMENTATION_ID = eINSTANCE.getPapyrusView_ImplementationID();
-
-		/**
-		 * The meta object literal for the '<em><b>Categories</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PAPYRUS_VIEW__CATEGORIES = eINSTANCE.getPapyrusView_Categories();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusDiagramImpl <em>Papyrus Diagram</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusDiagramImpl
-		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getPapyrusDiagram()
-		 * @generated
-		 */
-		EClass PAPYRUS_DIAGRAM = eINSTANCE.getPapyrusDiagram();
-
-		/**
-		 * The meta object literal for the '<em><b>Custom Palette</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PAPYRUS_DIAGRAM__CUSTOM_PALETTE = eINSTANCE.getPapyrusDiagram_CustomPalette();
-
-		/**
-		 * The meta object literal for the '<em><b>Custom Style</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PAPYRUS_DIAGRAM__CUSTOM_STYLE = eINSTANCE.getPapyrusDiagram_CustomStyle();
-
-		/**
-		 * The meta object literal for the '<em><b>Child Rules</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PAPYRUS_DIAGRAM__CHILD_RULES = eINSTANCE.getPapyrusDiagram_ChildRules();
-
-		/**
-		 * The meta object literal for the '<em><b>Palette Rules</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PAPYRUS_DIAGRAM__PALETTE_RULES = eINSTANCE.getPapyrusDiagram_PaletteRules();
-
-		/**
-		 * The meta object literal for the '<em><b>Assistant Rules</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PAPYRUS_DIAGRAM__ASSISTANT_RULES = eINSTANCE.getPapyrusDiagram_AssistantRules();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusSyncTableImpl <em>Papyrus Sync Table</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusSyncTableImpl
-		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getPapyrusSyncTable()
-		 * @generated
-		 */
-		EClass PAPYRUS_SYNC_TABLE = eINSTANCE.getPapyrusSyncTable();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusTableImpl <em>Papyrus Table</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusTableImpl
-		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getPapyrusTable()
-		 * @generated
-		 */
-		EClass PAPYRUS_TABLE = eINSTANCE.getPapyrusTable();
-
-		/**
-		 * The meta object literal for the '<em><b>Configuration</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PAPYRUS_TABLE__CONFIGURATION = eINSTANCE.getPapyrusTable_Configuration();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.RuleImpl <em>Rule</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.RuleImpl
-		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getRule()
-		 * @generated
-		 */
-		EClass RULE = eINSTANCE.getRule();
-
-		/**
-		 * The meta object literal for the '<em><b>Permit</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute RULE__PERMIT = eINSTANCE.getRule_Permit();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.ModelRuleImpl <em>Model Rule</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ModelRuleImpl
-		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getModelRule()
-		 * @generated
-		 */
-		EClass MODEL_RULE = eINSTANCE.getModelRule();
-
-		/**
-		 * The meta object literal for the '<em><b>Element</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MODEL_RULE__ELEMENT = eINSTANCE.getModelRule_Element();
-
-		/**
-		 * The meta object literal for the '<em><b>Stereotypes</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MODEL_RULE__STEREOTYPES = eINSTANCE.getModelRule_Stereotypes();
-
-		/**
-		 * The meta object literal for the '<em><b>Multiplicity</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MODEL_RULE__MULTIPLICITY = eINSTANCE.getModelRule_Multiplicity();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.OwningRuleImpl <em>Owning Rule</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.OwningRuleImpl
-		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getOwningRule()
-		 * @generated
-		 */
-		EClass OWNING_RULE = eINSTANCE.getOwningRule();
-
-		/**
-		 * The meta object literal for the '<em><b>Element</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference OWNING_RULE__ELEMENT = eINSTANCE.getOwningRule_Element();
-
-		/**
-		 * The meta object literal for the '<em><b>Stereotypes</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference OWNING_RULE__STEREOTYPES = eINSTANCE.getOwningRule_Stereotypes();
-
-		/**
-		 * The meta object literal for the '<em><b>Multiplicity</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute OWNING_RULE__MULTIPLICITY = eINSTANCE.getOwningRule_Multiplicity();
-
-		/**
-		 * The meta object literal for the '<em><b>New Model Path</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference OWNING_RULE__NEW_MODEL_PATH = eINSTANCE.getOwningRule_NewModelPath();
-
-		/**
-		 * The meta object literal for the '<em><b>Select Diagram Root</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference OWNING_RULE__SELECT_DIAGRAM_ROOT = eINSTANCE.getOwningRule_SelectDiagramRoot();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.ChildRuleImpl <em>Child Rule</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ChildRuleImpl
-		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getChildRule()
-		 * @generated
-		 */
-		EClass CHILD_RULE = eINSTANCE.getChildRule();
-
-		/**
-		 * The meta object literal for the '<em><b>Element</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CHILD_RULE__ELEMENT = eINSTANCE.getChildRule_Element();
-
-		/**
-		 * The meta object literal for the '<em><b>Stereotypes</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CHILD_RULE__STEREOTYPES = eINSTANCE.getChildRule_Stereotypes();
-
-		/**
-		 * The meta object literal for the '<em><b>Origin</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CHILD_RULE__ORIGIN = eINSTANCE.getChildRule_Origin();
-
-		/**
-		 * The meta object literal for the '<em><b>Insertion Path</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CHILD_RULE__INSERTION_PATH = eINSTANCE.getChildRule_InsertionPath();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PaletteRuleImpl <em>Palette Rule</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.PaletteRuleImpl
-		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getPaletteRule()
-		 * @generated
-		 */
-		EClass PALETTE_RULE = eINSTANCE.getPaletteRule();
-
-		/**
-		 * The meta object literal for the '<em><b>Element</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PALETTE_RULE__ELEMENT = eINSTANCE.getPaletteRule_Element();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PathElementImpl <em>Path Element</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.PathElementImpl
-		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getPathElement()
-		 * @generated
-		 */
-		EClass PATH_ELEMENT = eINSTANCE.getPathElement();
-
-		/**
-		 * The meta object literal for the '<em><b>Feature</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PATH_ELEMENT__FEATURE = eINSTANCE.getPathElement_Feature();
-
-		/**
-		 * The meta object literal for the '<em><b>Origin</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PATH_ELEMENT__ORIGIN = eINSTANCE.getPathElement_Origin();
-
-		/**
-		 * The meta object literal for the '<em><b>Target</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PATH_ELEMENT__TARGET = eINSTANCE.getPathElement_Target();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.CategoryImpl <em>Category</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.CategoryImpl
-		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getCategory()
-		 * @generated
-		 */
-		EClass CATEGORY = eINSTANCE.getCategory();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CATEGORY__NAME = eINSTANCE.getCategory_Name();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.ModelAutoCreateImpl <em>Model Auto Create</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ModelAutoCreateImpl
-		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getModelAutoCreate()
-		 * @generated
-		 */
-		EClass MODEL_AUTO_CREATE = eINSTANCE.getModelAutoCreate();
-
-		/**
-		 * The meta object literal for the '<em><b>Feature</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MODEL_AUTO_CREATE__FEATURE = eINSTANCE.getModelAutoCreate_Feature();
-
-		/**
-		 * The meta object literal for the '<em><b>Origin</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MODEL_AUTO_CREATE__ORIGIN = eINSTANCE.getModelAutoCreate_Origin();
-
-		/**
-		 * The meta object literal for the '<em><b>Creation Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MODEL_AUTO_CREATE__CREATION_TYPE = eINSTANCE.getModelAutoCreate_CreationType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.RootAutoSelectImpl <em>Root Auto Select</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.RootAutoSelectImpl
-		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getRootAutoSelect()
-		 * @generated
-		 */
-		EClass ROOT_AUTO_SELECT = eINSTANCE.getRootAutoSelect();
-
-		/**
-		 * The meta object literal for the '<em><b>Feature</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ROOT_AUTO_SELECT__FEATURE = eINSTANCE.getRootAutoSelect_Feature();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.AssistantRuleImpl <em>Assistant Rule</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.AssistantRuleImpl
-		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getAssistantRule()
-		 * @generated
-		 */
-		EClass ASSISTANT_RULE = eINSTANCE.getAssistantRule();
-
-		/**
-		 * The meta object literal for the '<em><b>Element Type ID</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ASSISTANT_RULE__ELEMENT_TYPE_ID = eINSTANCE.getAssistantRule_ElementTypeID();
-
-		/**
-		 * The meta object literal for the '<em><b>Matches</b></em>' operation.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EOperation ASSISTANT_RULE___MATCHES__IELEMENTTYPE = eINSTANCE.getAssistantRule__Matches__IElementType();
-
-		/**
-		 * The meta object literal for the '<em>Element Type</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.gmf.runtime.emf.type.core.IElementType
-		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getElementType()
-		 * @generated
-		 */
-		EDataType ELEMENT_TYPE = eINSTANCE.getElementType();
-
-	}
-
-} //ConfigurationPackage
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/PapyrusConfiguration.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/PapyrusConfiguration.java
deleted file mode 100644
index 1a0b9a44092..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/PapyrusConfiguration.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- * Copyright (c) 2013 CEA LIST.
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  
- * 
- */
-package org.eclipse.papyrus.infra.viewpoints.configuration;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureFramework;
-import org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Papyrus Configuration</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusConfiguration#getDefaultStakeholder <em>Default Stakeholder</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusConfiguration#getMetamodel <em>Metamodel</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusConfiguration#getCategories <em>Categories</em>}</li>
- * </ul>
- *
- * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getPapyrusConfiguration()
- * @model
- * @generated
- */
-public interface PapyrusConfiguration extends ArchitectureFramework {
-	/**
-	 * Returns the value of the '<em><b>Default Stakeholder</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Default Stakeholder</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Default Stakeholder</em>' reference.
-	 * @see #setDefaultStakeholder(Stakeholder)
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getPapyrusConfiguration_DefaultStakeholder()
-	 * @model required="true"
-	 * @generated
-	 */
-	Stakeholder getDefaultStakeholder();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusConfiguration#getDefaultStakeholder <em>Default Stakeholder</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default Stakeholder</em>' reference.
-	 * @see #getDefaultStakeholder()
-	 * @generated
-	 */
-	void setDefaultStakeholder(Stakeholder value);
-
-	/**
-	 * Returns the value of the '<em><b>Metamodel</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Metamodel</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Metamodel</em>' reference.
-	 * @see #setMetamodel(EPackage)
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getPapyrusConfiguration_Metamodel()
-	 * @model required="true"
-	 * @generated
-	 */
-	EPackage getMetamodel();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusConfiguration#getMetamodel <em>Metamodel</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Metamodel</em>' reference.
-	 * @see #getMetamodel()
-	 * @generated
-	 */
-	void setMetamodel(EPackage value);
-
-	/**
-	 * Returns the value of the '<em><b>Categories</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.configuration.Category}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Categories</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>Categories</em>' containment reference list.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getPapyrusConfiguration_Categories()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<Category> getCategories();
-
-} // PapyrusConfiguration
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/PapyrusView.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/PapyrusView.java
deleted file mode 100644
index abedef47f9e..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/PapyrusView.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/**
- * Copyright (c) 2013 CEA LIST.
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  
- * 
- */
-package org.eclipse.papyrus.infra.viewpoints.configuration;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.papyrus.infra.viewpoints.iso42010.ModelKind;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Papyrus View</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView#getIcon <em>Icon</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView#getParent <em>Parent</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView#getProfiles <em>Profiles</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView#getModelRules <em>Model Rules</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView#getOwningRules <em>Owning Rules</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView#getImplementationID <em>Implementation ID</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView#getCategories <em>Categories</em>}</li>
- * </ul>
- *
- * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getPapyrusView()
- * @model
- * @generated
- */
-public interface PapyrusView extends ModelKind {
-	/**
-	 * 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.infra.viewpoints.configuration.ConfigurationPackage#getPapyrusView_Icon()
-	 * @model
-	 * @generated
-	 */
-	String getIcon();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView#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);
-
-	/**
-	 * Returns the value of the '<em><b>Parent</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Parent</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Parent</em>' reference.
-	 * @see #setParent(PapyrusView)
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getPapyrusView_Parent()
-	 * @model
-	 * @generated
-	 */
-	PapyrusView getParent();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView#getParent <em>Parent</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Parent</em>' reference.
-	 * @see #getParent()
-	 * @generated
-	 */
-	void setParent(PapyrusView value);
-
-	/**
-	 * Returns the value of the '<em><b>Profiles</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.EPackage}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Profiles</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>Profiles</em>' reference list.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getPapyrusView_Profiles()
-	 * @model
-	 * @generated
-	 */
-	EList<EPackage> getProfiles();
-
-	/**
-	 * Returns the value of the '<em><b>Model Rules</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.configuration.ModelRule}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * These rules determine which model elements can be the semantic element behind this diagram
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Model Rules</em>' containment reference list.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getPapyrusView_ModelRules()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	EList<ModelRule> getModelRules();
-
-	/**
-	 * Returns the value of the '<em><b>Owning Rules</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.configuration.OwningRule}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * These rules determine which elements can be the syntactic owner of this diagram
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Owning Rules</em>' containment reference list.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getPapyrusView_OwningRules()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	EList<OwningRule> getOwningRules();
-
-	/**
-	 * Returns the value of the '<em><b>Implementation ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Implementation 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>Implementation ID</em>' attribute.
-	 * @see #setImplementationID(String)
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getPapyrusView_ImplementationID()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getImplementationID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView#getImplementationID <em>Implementation ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Implementation ID</em>' attribute.
-	 * @see #getImplementationID()
-	 * @generated
-	 */
-	void setImplementationID(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Categories</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.configuration.Category}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Categories</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>Categories</em>' reference list.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getPapyrusView_Categories()
-	 * @model
-	 * @generated
-	 */
-	EList<Category> getCategories();
-
-} // PapyrusView
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/PapyrusViewpoint.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/PapyrusViewpoint.java
deleted file mode 100644
index 2bebe92da89..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/PapyrusViewpoint.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Copyright (c) 2013 CEA LIST.
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  
- * 
- */
-package org.eclipse.papyrus.infra.viewpoints.configuration;
-
-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Papyrus Viewpoint</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusViewpoint#getParent <em>Parent</em>}</li>
- * </ul>
- *
- * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getPapyrusViewpoint()
- * @model
- * @generated
- */
-public interface PapyrusViewpoint extends ArchitectureViewpoint {
-	/**
-	 * Returns the value of the '<em><b>Parent</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Parent</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Parent</em>' reference.
-	 * @see #setParent(PapyrusViewpoint)
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getPapyrusViewpoint_Parent()
-	 * @model
-	 * @generated
-	 */
-	PapyrusViewpoint getParent();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusViewpoint#getParent <em>Parent</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Parent</em>' reference.
-	 * @see #getParent()
-	 * @generated
-	 */
-	void setParent(PapyrusViewpoint value);
-
-} // PapyrusViewpoint
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/ConfigurationFactoryImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/ConfigurationFactoryImpl.java
deleted file mode 100644
index f1255498509..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/ConfigurationFactoryImpl.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/**
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- *
- *  Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *
- */
-package org.eclipse.papyrus.infra.viewpoints.configuration.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.infra.viewpoints.configuration.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class ConfigurationFactoryImpl extends EFactoryImpl implements ConfigurationFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ConfigurationFactory init() {
-		try {
-			ConfigurationFactory theConfigurationFactory = (ConfigurationFactory) EPackage.Registry.INSTANCE.getEFactory(ConfigurationPackage.eNS_URI);
-			if (theConfigurationFactory != null) {
-				return theConfigurationFactory;
-			}
-		} catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new ConfigurationFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ConfigurationFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-		case ConfigurationPackage.PAPYRUS_CONFIGURATION:
-			return createPapyrusConfiguration();
-		case ConfigurationPackage.PAPYRUS_VIEWPOINT:
-			return createPapyrusViewpoint();
-		case ConfigurationPackage.PAPYRUS_VIEW:
-			return createPapyrusView();
-		case ConfigurationPackage.PAPYRUS_DIAGRAM:
-			return createPapyrusDiagram();
-		case ConfigurationPackage.PAPYRUS_SYNC_TABLE:
-			return createPapyrusSyncTable();
-		case ConfigurationPackage.PAPYRUS_TABLE:
-			return createPapyrusTable();
-		case ConfigurationPackage.MODEL_RULE:
-			return createModelRule();
-		case ConfigurationPackage.OWNING_RULE:
-			return createOwningRule();
-		case ConfigurationPackage.CHILD_RULE:
-			return createChildRule();
-		case ConfigurationPackage.PALETTE_RULE:
-			return createPaletteRule();
-		case ConfigurationPackage.PATH_ELEMENT:
-			return createPathElement();
-		case ConfigurationPackage.CATEGORY:
-			return createCategory();
-		case ConfigurationPackage.MODEL_AUTO_CREATE:
-			return createModelAutoCreate();
-		case ConfigurationPackage.ROOT_AUTO_SELECT:
-			return createRootAutoSelect();
-		case ConfigurationPackage.ASSISTANT_RULE:
-			return createAssistantRule();
-		default:
-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-		case ConfigurationPackage.ELEMENT_TYPE:
-			return createElementTypeFromString(eDataType, initialValue);
-		default:
-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-		case ConfigurationPackage.ELEMENT_TYPE:
-			return convertElementTypeToString(eDataType, instanceValue);
-		default:
-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PapyrusConfiguration createPapyrusConfiguration() {
-		PapyrusConfigurationImpl papyrusConfiguration = new PapyrusConfigurationImpl();
-		return papyrusConfiguration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PapyrusViewpoint createPapyrusViewpoint() {
-		PapyrusViewpointImpl papyrusViewpoint = new PapyrusViewpointImpl();
-		return papyrusViewpoint;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PapyrusView createPapyrusView() {
-		PapyrusViewImpl papyrusView = new PapyrusViewImpl();
-		return papyrusView;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PapyrusDiagram createPapyrusDiagram() {
-		PapyrusDiagramImpl papyrusDiagram = new PapyrusDiagramImpl();
-		return papyrusDiagram;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PapyrusSyncTable createPapyrusSyncTable() {
-		PapyrusSyncTableImpl papyrusSyncTable = new PapyrusSyncTableImpl();
-		return papyrusSyncTable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PapyrusTable createPapyrusTable() {
-		PapyrusTableImpl papyrusTable = new PapyrusTableImpl();
-		return papyrusTable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ModelRule createModelRule() {
-		ModelRuleImpl modelRule = new ModelRuleImpl();
-		return modelRule;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public OwningRule createOwningRule() {
-		OwningRuleImpl owningRule = new OwningRuleImpl();
-		return owningRule;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ChildRule createChildRule() {
-		ChildRuleImpl childRule = new ChildRuleImpl();
-		return childRule;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PaletteRule createPaletteRule() {
-		PaletteRuleImpl paletteRule = new PaletteRuleImpl();
-		return paletteRule;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PathElement createPathElement() {
-		PathElementImpl pathElement = new PathElementImpl();
-		return pathElement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Category createCategory() {
-		CategoryImpl category = new CategoryImpl();
-		return category;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ModelAutoCreate createModelAutoCreate() {
-		ModelAutoCreateImpl modelAutoCreate = new ModelAutoCreateImpl();
-		return modelAutoCreate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RootAutoSelect createRootAutoSelect() {
-		RootAutoSelectImpl rootAutoSelect = new RootAutoSelectImpl();
-		return rootAutoSelect;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AssistantRule createAssistantRule() {
-		AssistantRuleImpl assistantRule = new AssistantRuleImpl();
-		return assistantRule;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public IElementType createElementTypeFromString(EDataType eDataType, String initialValue) {
-		return (IElementType) super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertElementTypeToString(EDataType eDataType, Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ConfigurationPackage getConfigurationPackage() {
-		return (ConfigurationPackage) getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static ConfigurationPackage getPackage() {
-		return ConfigurationPackage.eINSTANCE;
-	}
-
-} //ConfigurationFactoryImpl
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/ConfigurationPackageImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/ConfigurationPackageImpl.java
deleted file mode 100644
index 11953533667..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/ConfigurationPackageImpl.java
+++ /dev/null
@@ -1,1014 +0,0 @@
-/**
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- *
- *  Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *
- */
-package org.eclipse.papyrus.infra.viewpoints.configuration.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
-
-import org.eclipse.papyrus.infra.viewpoints.configuration.AssistantRule;
-import org.eclipse.papyrus.infra.viewpoints.configuration.Category;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ChildRule;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationFactory;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ModelAutoCreate;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ModelRule;
-import org.eclipse.papyrus.infra.viewpoints.configuration.OwningRule;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PaletteRule;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusConfiguration;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusSyncTable;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusTable;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusViewpoint;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PathElement;
-import org.eclipse.papyrus.infra.viewpoints.configuration.RootAutoSelect;
-import org.eclipse.papyrus.infra.viewpoints.configuration.Rule;
-
-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class ConfigurationPackageImpl extends EPackageImpl implements ConfigurationPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass papyrusConfigurationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass papyrusViewpointEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass papyrusViewEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass papyrusDiagramEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass papyrusSyncTableEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass papyrusTableEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ruleEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass modelRuleEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass owningRuleEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass childRuleEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass paletteRuleEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass pathElementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass categoryEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass modelAutoCreateEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass rootAutoSelectEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass assistantRuleEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType elementTypeEDataType = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private ConfigurationPackageImpl() {
-		super(eNS_URI, ConfigurationFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 *
-	 * <p>This method is used to initialize {@link ConfigurationPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static ConfigurationPackage init() {
-		if (isInited) {
-			return (ConfigurationPackage) EPackage.Registry.INSTANCE.getEPackage(ConfigurationPackage.eNS_URI);
-		}
-
-		// Obtain or create and register package
-		ConfigurationPackageImpl theConfigurationPackage = (ConfigurationPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ConfigurationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ConfigurationPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		ConstraintsPackage.eINSTANCE.eClass();
-		Iso42010Package.eINSTANCE.eClass();
-
-		// Create package meta-data objects
-		theConfigurationPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theConfigurationPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theConfigurationPackage.freeze();
-
-
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(ConfigurationPackage.eNS_URI, theConfigurationPackage);
-		return theConfigurationPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPapyrusConfiguration() {
-		return papyrusConfigurationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPapyrusConfiguration_DefaultStakeholder() {
-		return (EReference) papyrusConfigurationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPapyrusConfiguration_Metamodel() {
-		return (EReference) papyrusConfigurationEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPapyrusConfiguration_Categories() {
-		return (EReference) papyrusConfigurationEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPapyrusViewpoint() {
-		return papyrusViewpointEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPapyrusViewpoint_Parent() {
-		return (EReference) papyrusViewpointEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPapyrusView() {
-		return papyrusViewEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPapyrusView_Icon() {
-		return (EAttribute) papyrusViewEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPapyrusView_Parent() {
-		return (EReference) papyrusViewEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPapyrusView_Profiles() {
-		return (EReference) papyrusViewEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPapyrusView_ModelRules() {
-		return (EReference) papyrusViewEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPapyrusView_OwningRules() {
-		return (EReference) papyrusViewEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPapyrusView_ImplementationID() {
-		return (EAttribute) papyrusViewEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPapyrusView_Categories() {
-		return (EReference) papyrusViewEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPapyrusDiagram() {
-		return papyrusDiagramEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPapyrusDiagram_CustomPalette() {
-		return (EAttribute) papyrusDiagramEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPapyrusDiagram_CustomStyle() {
-		return (EAttribute) papyrusDiagramEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPapyrusDiagram_ChildRules() {
-		return (EReference) papyrusDiagramEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPapyrusDiagram_PaletteRules() {
-		return (EReference) papyrusDiagramEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPapyrusDiagram_AssistantRules() {
-		return (EReference) papyrusDiagramEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPapyrusSyncTable() {
-		return papyrusSyncTableEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPapyrusTable() {
-		return papyrusTableEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPapyrusTable_Configuration() {
-		return (EAttribute) papyrusTableEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getRule() {
-		return ruleEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRule_Permit() {
-		return (EAttribute) ruleEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getModelRule() {
-		return modelRuleEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getModelRule_Element() {
-		return (EReference) modelRuleEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getModelRule_Stereotypes() {
-		return (EReference) modelRuleEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getModelRule_Multiplicity() {
-		return (EAttribute) modelRuleEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getOwningRule() {
-		return owningRuleEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getOwningRule_Element() {
-		return (EReference) owningRuleEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getOwningRule_Stereotypes() {
-		return (EReference) owningRuleEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getOwningRule_Multiplicity() {
-		return (EAttribute) owningRuleEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getOwningRule_NewModelPath() {
-		return (EReference) owningRuleEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getOwningRule_SelectDiagramRoot() {
-		return (EReference) owningRuleEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getChildRule() {
-		return childRuleEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getChildRule_Element() {
-		return (EReference) childRuleEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getChildRule_Stereotypes() {
-		return (EReference) childRuleEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getChildRule_Origin() {
-		return (EReference) childRuleEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getChildRule_InsertionPath() {
-		return (EReference) childRuleEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPaletteRule() {
-		return paletteRuleEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPaletteRule_Element() {
-		return (EAttribute) paletteRuleEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPathElement() {
-		return pathElementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPathElement_Feature() {
-		return (EReference) pathElementEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPathElement_Origin() {
-		return (EReference) pathElementEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPathElement_Target() {
-		return (EReference) pathElementEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCategory() {
-		return categoryEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCategory_Name() {
-		return (EAttribute) categoryEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getModelAutoCreate() {
-		return modelAutoCreateEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getModelAutoCreate_Feature() {
-		return (EReference) modelAutoCreateEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getModelAutoCreate_Origin() {
-		return (EReference) modelAutoCreateEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getModelAutoCreate_CreationType() {
-		return (EAttribute) modelAutoCreateEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getRootAutoSelect() {
-		return rootAutoSelectEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getRootAutoSelect_Feature() {
-		return (EReference) rootAutoSelectEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getAssistantRule() {
-		return assistantRuleEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAssistantRule_ElementTypeID() {
-		return (EAttribute) assistantRuleEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EOperation getAssistantRule__Matches__IElementType() {
-		return assistantRuleEClass.getEOperations().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getElementType() {
-		return elementTypeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ConfigurationFactory getConfigurationFactory() {
-		return (ConfigurationFactory) getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) {
-			return;
-		}
-		isCreated = true;
-
-		// Create classes and their features
-		papyrusConfigurationEClass = createEClass(PAPYRUS_CONFIGURATION);
-		createEReference(papyrusConfigurationEClass, PAPYRUS_CONFIGURATION__DEFAULT_STAKEHOLDER);
-		createEReference(papyrusConfigurationEClass, PAPYRUS_CONFIGURATION__METAMODEL);
-		createEReference(papyrusConfigurationEClass, PAPYRUS_CONFIGURATION__CATEGORIES);
-
-		papyrusViewpointEClass = createEClass(PAPYRUS_VIEWPOINT);
-		createEReference(papyrusViewpointEClass, PAPYRUS_VIEWPOINT__PARENT);
-
-		papyrusViewEClass = createEClass(PAPYRUS_VIEW);
-		createEAttribute(papyrusViewEClass, PAPYRUS_VIEW__ICON);
-		createEReference(papyrusViewEClass, PAPYRUS_VIEW__PARENT);
-		createEReference(papyrusViewEClass, PAPYRUS_VIEW__PROFILES);
-		createEReference(papyrusViewEClass, PAPYRUS_VIEW__MODEL_RULES);
-		createEReference(papyrusViewEClass, PAPYRUS_VIEW__OWNING_RULES);
-		createEAttribute(papyrusViewEClass, PAPYRUS_VIEW__IMPLEMENTATION_ID);
-		createEReference(papyrusViewEClass, PAPYRUS_VIEW__CATEGORIES);
-
-		papyrusDiagramEClass = createEClass(PAPYRUS_DIAGRAM);
-		createEAttribute(papyrusDiagramEClass, PAPYRUS_DIAGRAM__CUSTOM_PALETTE);
-		createEAttribute(papyrusDiagramEClass, PAPYRUS_DIAGRAM__CUSTOM_STYLE);
-		createEReference(papyrusDiagramEClass, PAPYRUS_DIAGRAM__CHILD_RULES);
-		createEReference(papyrusDiagramEClass, PAPYRUS_DIAGRAM__PALETTE_RULES);
-		createEReference(papyrusDiagramEClass, PAPYRUS_DIAGRAM__ASSISTANT_RULES);
-
-		papyrusSyncTableEClass = createEClass(PAPYRUS_SYNC_TABLE);
-
-		papyrusTableEClass = createEClass(PAPYRUS_TABLE);
-		createEAttribute(papyrusTableEClass, PAPYRUS_TABLE__CONFIGURATION);
-
-		ruleEClass = createEClass(RULE);
-		createEAttribute(ruleEClass, RULE__PERMIT);
-
-		modelRuleEClass = createEClass(MODEL_RULE);
-		createEReference(modelRuleEClass, MODEL_RULE__ELEMENT);
-		createEReference(modelRuleEClass, MODEL_RULE__STEREOTYPES);
-		createEAttribute(modelRuleEClass, MODEL_RULE__MULTIPLICITY);
-
-		owningRuleEClass = createEClass(OWNING_RULE);
-		createEReference(owningRuleEClass, OWNING_RULE__ELEMENT);
-		createEReference(owningRuleEClass, OWNING_RULE__STEREOTYPES);
-		createEAttribute(owningRuleEClass, OWNING_RULE__MULTIPLICITY);
-		createEReference(owningRuleEClass, OWNING_RULE__NEW_MODEL_PATH);
-		createEReference(owningRuleEClass, OWNING_RULE__SELECT_DIAGRAM_ROOT);
-
-		childRuleEClass = createEClass(CHILD_RULE);
-		createEReference(childRuleEClass, CHILD_RULE__ELEMENT);
-		createEReference(childRuleEClass, CHILD_RULE__STEREOTYPES);
-		createEReference(childRuleEClass, CHILD_RULE__ORIGIN);
-		createEReference(childRuleEClass, CHILD_RULE__INSERTION_PATH);
-
-		paletteRuleEClass = createEClass(PALETTE_RULE);
-		createEAttribute(paletteRuleEClass, PALETTE_RULE__ELEMENT);
-
-		pathElementEClass = createEClass(PATH_ELEMENT);
-		createEReference(pathElementEClass, PATH_ELEMENT__FEATURE);
-		createEReference(pathElementEClass, PATH_ELEMENT__ORIGIN);
-		createEReference(pathElementEClass, PATH_ELEMENT__TARGET);
-
-		categoryEClass = createEClass(CATEGORY);
-		createEAttribute(categoryEClass, CATEGORY__NAME);
-
-		modelAutoCreateEClass = createEClass(MODEL_AUTO_CREATE);
-		createEReference(modelAutoCreateEClass, MODEL_AUTO_CREATE__FEATURE);
-		createEReference(modelAutoCreateEClass, MODEL_AUTO_CREATE__ORIGIN);
-		createEAttribute(modelAutoCreateEClass, MODEL_AUTO_CREATE__CREATION_TYPE);
-
-		rootAutoSelectEClass = createEClass(ROOT_AUTO_SELECT);
-		createEReference(rootAutoSelectEClass, ROOT_AUTO_SELECT__FEATURE);
-
-		assistantRuleEClass = createEClass(ASSISTANT_RULE);
-		createEAttribute(assistantRuleEClass, ASSISTANT_RULE__ELEMENT_TYPE_ID);
-		createEOperation(assistantRuleEClass, ASSISTANT_RULE___MATCHES__IELEMENTTYPE);
-
-		// Create data types
-		elementTypeEDataType = createEDataType(ELEMENT_TYPE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) {
-			return;
-		}
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		Iso42010Package theIso42010Package = (Iso42010Package) EPackage.Registry.INSTANCE.getEPackage(Iso42010Package.eNS_URI);
-		ConstraintsPackage theConstraintsPackage = (ConstraintsPackage) EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		papyrusConfigurationEClass.getESuperTypes().add(theIso42010Package.getArchitectureFramework());
-		papyrusViewpointEClass.getESuperTypes().add(theIso42010Package.getArchitectureViewpoint());
-		papyrusViewEClass.getESuperTypes().add(theIso42010Package.getModelKind());
-		papyrusDiagramEClass.getESuperTypes().add(this.getPapyrusView());
-		papyrusSyncTableEClass.getESuperTypes().add(this.getPapyrusView());
-		papyrusTableEClass.getESuperTypes().add(this.getPapyrusView());
-		modelRuleEClass.getESuperTypes().add(this.getRule());
-		modelRuleEClass.getESuperTypes().add(theConstraintsPackage.getDisplayUnit());
-		owningRuleEClass.getESuperTypes().add(this.getRule());
-		childRuleEClass.getESuperTypes().add(this.getRule());
-		paletteRuleEClass.getESuperTypes().add(this.getRule());
-		assistantRuleEClass.getESuperTypes().add(this.getRule());
-
-		// Initialize classes, features, and operations; add parameters
-		initEClass(papyrusConfigurationEClass, PapyrusConfiguration.class, "PapyrusConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getPapyrusConfiguration_DefaultStakeholder(), theIso42010Package.getStakeholder(), null, "defaultStakeholder", null, 1, 1, PapyrusConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPapyrusConfiguration_Metamodel(), ecorePackage.getEPackage(), null, "metamodel", null, 1, 1, PapyrusConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-				!IS_DERIVED, IS_ORDERED);
-		initEReference(getPapyrusConfiguration_Categories(), this.getCategory(), null, "categories", null, 0, -1, PapyrusConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-				IS_ORDERED);
-
-		initEClass(papyrusViewpointEClass, PapyrusViewpoint.class, "PapyrusViewpoint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getPapyrusViewpoint_Parent(), this.getPapyrusViewpoint(), null, "parent", null, 0, 1, PapyrusViewpoint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-				IS_ORDERED);
-
-		initEClass(papyrusViewEClass, PapyrusView.class, "PapyrusView", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPapyrusView_Icon(), ecorePackage.getEString(), "icon", null, 0, 1, PapyrusView.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPapyrusView_Parent(), this.getPapyrusView(), null, "parent", null, 0, 1, PapyrusView.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPapyrusView_Profiles(), ecorePackage.getEPackage(), null, "profiles", null, 0, -1, PapyrusView.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPapyrusView_ModelRules(), this.getModelRule(), null, "modelRules", null, 1, -1, PapyrusView.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPapyrusView_OwningRules(), this.getOwningRule(), null, "owningRules", null, 1, -1, PapyrusView.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPapyrusView_ImplementationID(), ecorePackage.getEString(), "implementationID", null, 1, 1, PapyrusView.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPapyrusView_Categories(), this.getCategory(), null, "categories", null, 0, -1, PapyrusView.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(papyrusDiagramEClass, PapyrusDiagram.class, "PapyrusDiagram", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPapyrusDiagram_CustomPalette(), ecorePackage.getEString(), "customPalette", null, 0, 1, PapyrusDiagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPapyrusDiagram_CustomStyle(), ecorePackage.getEString(), "customStyle", null, 0, 1, PapyrusDiagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPapyrusDiagram_ChildRules(), this.getChildRule(), null, "childRules", null, 0, -1, PapyrusDiagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-				IS_ORDERED);
-		initEReference(getPapyrusDiagram_PaletteRules(), this.getPaletteRule(), null, "paletteRules", null, 0, -1, PapyrusDiagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-				IS_ORDERED);
-		initEReference(getPapyrusDiagram_AssistantRules(), this.getAssistantRule(), null, "assistantRules", null, 0, -1, PapyrusDiagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-				!IS_DERIVED, IS_ORDERED);
-
-		initEClass(papyrusSyncTableEClass, PapyrusSyncTable.class, "PapyrusSyncTable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(papyrusTableEClass, PapyrusTable.class, "PapyrusTable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPapyrusTable_Configuration(), ecorePackage.getEString(), "configuration", null, 1, 1, PapyrusTable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(ruleEClass, Rule.class, "Rule", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getRule_Permit(), ecorePackage.getEBoolean(), "permit", "true", 1, 1, Rule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(modelRuleEClass, ModelRule.class, "ModelRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getModelRule_Element(), ecorePackage.getEClass(), null, "element", null, 0, 1, ModelRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getModelRule_Stereotypes(), ecorePackage.getEClass(), null, "stereotypes", null, 0, -1, ModelRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getModelRule_Multiplicity(), ecorePackage.getEInt(), "multiplicity", "-1", 1, 1, ModelRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(owningRuleEClass, OwningRule.class, "OwningRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getOwningRule_Element(), ecorePackage.getEClass(), null, "element", null, 0, 1, OwningRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getOwningRule_Stereotypes(), ecorePackage.getEClass(), null, "stereotypes", null, 0, -1, OwningRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-				IS_ORDERED);
-		initEAttribute(getOwningRule_Multiplicity(), ecorePackage.getEInt(), "multiplicity", "-1", 1, 1, OwningRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getOwningRule_NewModelPath(), this.getModelAutoCreate(), null, "newModelPath", null, 0, -1, OwningRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-				IS_ORDERED);
-		initEReference(getOwningRule_SelectDiagramRoot(), this.getRootAutoSelect(), null, "selectDiagramRoot", null, 0, -1, OwningRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-				IS_ORDERED);
-
-		initEClass(childRuleEClass, ChildRule.class, "ChildRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getChildRule_Element(), ecorePackage.getEClass(), null, "element", null, 0, 1, ChildRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getChildRule_Stereotypes(), ecorePackage.getEClass(), null, "stereotypes", null, 0, -1, ChildRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getChildRule_Origin(), ecorePackage.getEClass(), null, "origin", null, 0, 1, ChildRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getChildRule_InsertionPath(), this.getPathElement(), null, "insertionPath", null, 0, -1, ChildRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(paletteRuleEClass, PaletteRule.class, "PaletteRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPaletteRule_Element(), ecorePackage.getEString(), "element", null, 0, 1, PaletteRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(pathElementEClass, PathElement.class, "PathElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getPathElement_Feature(), ecorePackage.getEReference(), null, "feature", null, 1, 1, PathElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPathElement_Origin(), ecorePackage.getEClass(), null, "origin", null, 1, 1, PathElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEReference(getPathElement_Target(), ecorePackage.getEClass(), null, "target", null, 1, 1, PathElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-		initEClass(categoryEClass, Category.class, "Category", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getCategory_Name(), ecorePackage.getEString(), "name", null, 1, 1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(modelAutoCreateEClass, ModelAutoCreate.class, "ModelAutoCreate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getModelAutoCreate_Feature(), ecorePackage.getEReference(), null, "feature", null, 1, 1, ModelAutoCreate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-				IS_ORDERED);
-		initEReference(getModelAutoCreate_Origin(), ecorePackage.getEClass(), null, "origin", null, 1, 1, ModelAutoCreate.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getModelAutoCreate_CreationType(), ecorePackage.getEString(), "creationType", null, 1, 1, ModelAutoCreate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(rootAutoSelectEClass, RootAutoSelect.class, "RootAutoSelect", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getRootAutoSelect_Feature(), ecorePackage.getEReference(), null, "feature", null, 1, 1, RootAutoSelect.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-				IS_ORDERED);
-
-		initEClass(assistantRuleEClass, AssistantRule.class, "AssistantRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getAssistantRule_ElementTypeID(), ecorePackage.getEString(), "elementTypeID", null, 0, 1, AssistantRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		EOperation op = initEOperation(getAssistantRule__Matches__IElementType(), ecorePackage.getEBoolean(), "matches", 1, 1, IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, this.getElementType(), "elementType", 1, 1, IS_UNIQUE, IS_ORDERED);
-
-		// Initialize data types
-		initEDataType(elementTypeEDataType, IElementType.class, "ElementType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} //ConfigurationPackageImpl
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/PapyrusConfigurationImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/PapyrusConfigurationImpl.java
deleted file mode 100644
index 4fd7c3567f5..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/PapyrusConfigurationImpl.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/**
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- *
- *  Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *
- */
-package org.eclipse.papyrus.infra.viewpoints.configuration.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.EPackage;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.papyrus.infra.viewpoints.configuration.Category;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusConfiguration;
-
-import org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder;
-
-import org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureFrameworkImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Papyrus Configuration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusConfigurationImpl#getDefaultStakeholder <em>Default Stakeholder</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusConfigurationImpl#getMetamodel <em>Metamodel</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusConfigurationImpl#getCategories <em>Categories</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class PapyrusConfigurationImpl extends ArchitectureFrameworkImpl implements PapyrusConfiguration {
-	/**
-	 * The cached value of the '{@link #getDefaultStakeholder() <em>Default Stakeholder</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefaultStakeholder()
-	 * @generated
-	 * @ordered
-	 */
-	protected Stakeholder defaultStakeholder;
-
-	/**
-	 * The cached value of the '{@link #getMetamodel() <em>Metamodel</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMetamodel()
-	 * @generated
-	 * @ordered
-	 */
-	protected EPackage metamodel;
-
-	/**
-	 * The cached value of the '{@link #getCategories() <em>Categories</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCategories()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Category> categories;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PapyrusConfigurationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ConfigurationPackage.Literals.PAPYRUS_CONFIGURATION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Stakeholder getDefaultStakeholder() {
-		if (defaultStakeholder != null && defaultStakeholder.eIsProxy()) {
-			InternalEObject oldDefaultStakeholder = (InternalEObject) defaultStakeholder;
-			defaultStakeholder = (Stakeholder) eResolveProxy(oldDefaultStakeholder);
-			if (defaultStakeholder != oldDefaultStakeholder) {
-				if (eNotificationRequired()) {
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ConfigurationPackage.PAPYRUS_CONFIGURATION__DEFAULT_STAKEHOLDER, oldDefaultStakeholder, defaultStakeholder));
-				}
-			}
-		}
-		return defaultStakeholder;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Stakeholder basicGetDefaultStakeholder() {
-		return defaultStakeholder;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDefaultStakeholder(Stakeholder newDefaultStakeholder) {
-		Stakeholder oldDefaultStakeholder = defaultStakeholder;
-		defaultStakeholder = newDefaultStakeholder;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ConfigurationPackage.PAPYRUS_CONFIGURATION__DEFAULT_STAKEHOLDER, oldDefaultStakeholder, defaultStakeholder));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EPackage getMetamodel() {
-		if (metamodel != null && metamodel.eIsProxy()) {
-			InternalEObject oldMetamodel = (InternalEObject) metamodel;
-			metamodel = (EPackage) eResolveProxy(oldMetamodel);
-			if (metamodel != oldMetamodel) {
-				if (eNotificationRequired()) {
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ConfigurationPackage.PAPYRUS_CONFIGURATION__METAMODEL, oldMetamodel, metamodel));
-				}
-			}
-		}
-		return metamodel;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EPackage basicGetMetamodel() {
-		return metamodel;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMetamodel(EPackage newMetamodel) {
-		EPackage oldMetamodel = metamodel;
-		metamodel = newMetamodel;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ConfigurationPackage.PAPYRUS_CONFIGURATION__METAMODEL, oldMetamodel, metamodel));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<Category> getCategories() {
-		if (categories == null) {
-			categories = new EObjectContainmentEList<Category>(Category.class, this, ConfigurationPackage.PAPYRUS_CONFIGURATION__CATEGORIES);
-		}
-		return categories;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case ConfigurationPackage.PAPYRUS_CONFIGURATION__CATEGORIES:
-			return ((InternalEList<?>) getCategories()).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 ConfigurationPackage.PAPYRUS_CONFIGURATION__DEFAULT_STAKEHOLDER:
-			if (resolve) {
-				return getDefaultStakeholder();
-			}
-			return basicGetDefaultStakeholder();
-		case ConfigurationPackage.PAPYRUS_CONFIGURATION__METAMODEL:
-			if (resolve) {
-				return getMetamodel();
-			}
-			return basicGetMetamodel();
-		case ConfigurationPackage.PAPYRUS_CONFIGURATION__CATEGORIES:
-			return getCategories();
-		}
-		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 ConfigurationPackage.PAPYRUS_CONFIGURATION__DEFAULT_STAKEHOLDER:
-			setDefaultStakeholder((Stakeholder) newValue);
-			return;
-		case ConfigurationPackage.PAPYRUS_CONFIGURATION__METAMODEL:
-			setMetamodel((EPackage) newValue);
-			return;
-		case ConfigurationPackage.PAPYRUS_CONFIGURATION__CATEGORIES:
-			getCategories().clear();
-			getCategories().addAll((Collection<? extends Category>) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case ConfigurationPackage.PAPYRUS_CONFIGURATION__DEFAULT_STAKEHOLDER:
-			setDefaultStakeholder((Stakeholder) null);
-			return;
-		case ConfigurationPackage.PAPYRUS_CONFIGURATION__METAMODEL:
-			setMetamodel((EPackage) null);
-			return;
-		case ConfigurationPackage.PAPYRUS_CONFIGURATION__CATEGORIES:
-			getCategories().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case ConfigurationPackage.PAPYRUS_CONFIGURATION__DEFAULT_STAKEHOLDER:
-			return defaultStakeholder != null;
-		case ConfigurationPackage.PAPYRUS_CONFIGURATION__METAMODEL:
-			return metamodel != null;
-		case ConfigurationPackage.PAPYRUS_CONFIGURATION__CATEGORIES:
-			return categories != null && !categories.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //PapyrusConfigurationImpl
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/PapyrusDiagramImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/PapyrusDiagramImpl.java
deleted file mode 100644
index 853ac886547..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/PapyrusDiagramImpl.java
+++ /dev/null
@@ -1,365 +0,0 @@
-/**
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- *
- *  Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *
- */
-package org.eclipse.papyrus.infra.viewpoints.configuration.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.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.papyrus.infra.viewpoints.configuration.AssistantRule;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ChildRule;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PaletteRule;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Papyrus Diagram</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusDiagramImpl#getCustomPalette <em>Custom Palette</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusDiagramImpl#getCustomStyle <em>Custom Style</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusDiagramImpl#getChildRules <em>Child Rules</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusDiagramImpl#getPaletteRules <em>Palette Rules</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusDiagramImpl#getAssistantRules <em>Assistant Rules</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class PapyrusDiagramImpl extends PapyrusViewImpl implements PapyrusDiagram {
-	/**
-	 * The default value of the '{@link #getCustomPalette() <em>Custom Palette</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCustomPalette()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CUSTOM_PALETTE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCustomPalette() <em>Custom Palette</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCustomPalette()
-	 * @generated
-	 * @ordered
-	 */
-	protected String customPalette = CUSTOM_PALETTE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCustomStyle() <em>Custom Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCustomStyle()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CUSTOM_STYLE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCustomStyle() <em>Custom Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCustomStyle()
-	 * @generated
-	 * @ordered
-	 */
-	protected String customStyle = CUSTOM_STYLE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getChildRules() <em>Child Rules</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getChildRules()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<ChildRule> childRules;
-
-	/**
-	 * The cached value of the '{@link #getPaletteRules() <em>Palette Rules</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPaletteRules()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<PaletteRule> paletteRules;
-
-	/**
-	 * The cached value of the '{@link #getAssistantRules() <em>Assistant Rules</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAssistantRules()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<AssistantRule> assistantRules;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PapyrusDiagramImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ConfigurationPackage.Literals.PAPYRUS_DIAGRAM;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCustomPalette() {
-		return customPalette;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCustomPalette(String newCustomPalette) {
-		String oldCustomPalette = customPalette;
-		customPalette = newCustomPalette;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ConfigurationPackage.PAPYRUS_DIAGRAM__CUSTOM_PALETTE, oldCustomPalette, customPalette));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCustomStyle() {
-		return customStyle;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCustomStyle(String newCustomStyle) {
-		String oldCustomStyle = customStyle;
-		customStyle = newCustomStyle;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ConfigurationPackage.PAPYRUS_DIAGRAM__CUSTOM_STYLE, oldCustomStyle, customStyle));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<ChildRule> getChildRules() {
-		if (childRules == null) {
-			childRules = new EObjectContainmentEList<ChildRule>(ChildRule.class, this, ConfigurationPackage.PAPYRUS_DIAGRAM__CHILD_RULES);
-		}
-		return childRules;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<PaletteRule> getPaletteRules() {
-		if (paletteRules == null) {
-			paletteRules = new EObjectContainmentEList<PaletteRule>(PaletteRule.class, this, ConfigurationPackage.PAPYRUS_DIAGRAM__PALETTE_RULES);
-		}
-		return paletteRules;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<AssistantRule> getAssistantRules() {
-		if (assistantRules == null) {
-			assistantRules = new EObjectContainmentEList<AssistantRule>(AssistantRule.class, this, ConfigurationPackage.PAPYRUS_DIAGRAM__ASSISTANT_RULES);
-		}
-		return assistantRules;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case ConfigurationPackage.PAPYRUS_DIAGRAM__CHILD_RULES:
-			return ((InternalEList<?>) getChildRules()).basicRemove(otherEnd, msgs);
-		case ConfigurationPackage.PAPYRUS_DIAGRAM__PALETTE_RULES:
-			return ((InternalEList<?>) getPaletteRules()).basicRemove(otherEnd, msgs);
-		case ConfigurationPackage.PAPYRUS_DIAGRAM__ASSISTANT_RULES:
-			return ((InternalEList<?>) getAssistantRules()).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 ConfigurationPackage.PAPYRUS_DIAGRAM__CUSTOM_PALETTE:
-			return getCustomPalette();
-		case ConfigurationPackage.PAPYRUS_DIAGRAM__CUSTOM_STYLE:
-			return getCustomStyle();
-		case ConfigurationPackage.PAPYRUS_DIAGRAM__CHILD_RULES:
-			return getChildRules();
-		case ConfigurationPackage.PAPYRUS_DIAGRAM__PALETTE_RULES:
-			return getPaletteRules();
-		case ConfigurationPackage.PAPYRUS_DIAGRAM__ASSISTANT_RULES:
-			return getAssistantRules();
-		}
-		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 ConfigurationPackage.PAPYRUS_DIAGRAM__CUSTOM_PALETTE:
-			setCustomPalette((String) newValue);
-			return;
-		case ConfigurationPackage.PAPYRUS_DIAGRAM__CUSTOM_STYLE:
-			setCustomStyle((String) newValue);
-			return;
-		case ConfigurationPackage.PAPYRUS_DIAGRAM__CHILD_RULES:
-			getChildRules().clear();
-			getChildRules().addAll((Collection<? extends ChildRule>) newValue);
-			return;
-		case ConfigurationPackage.PAPYRUS_DIAGRAM__PALETTE_RULES:
-			getPaletteRules().clear();
-			getPaletteRules().addAll((Collection<? extends PaletteRule>) newValue);
-			return;
-		case ConfigurationPackage.PAPYRUS_DIAGRAM__ASSISTANT_RULES:
-			getAssistantRules().clear();
-			getAssistantRules().addAll((Collection<? extends AssistantRule>) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case ConfigurationPackage.PAPYRUS_DIAGRAM__CUSTOM_PALETTE:
-			setCustomPalette(CUSTOM_PALETTE_EDEFAULT);
-			return;
-		case ConfigurationPackage.PAPYRUS_DIAGRAM__CUSTOM_STYLE:
-			setCustomStyle(CUSTOM_STYLE_EDEFAULT);
-			return;
-		case ConfigurationPackage.PAPYRUS_DIAGRAM__CHILD_RULES:
-			getChildRules().clear();
-			return;
-		case ConfigurationPackage.PAPYRUS_DIAGRAM__PALETTE_RULES:
-			getPaletteRules().clear();
-			return;
-		case ConfigurationPackage.PAPYRUS_DIAGRAM__ASSISTANT_RULES:
-			getAssistantRules().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case ConfigurationPackage.PAPYRUS_DIAGRAM__CUSTOM_PALETTE:
-			return CUSTOM_PALETTE_EDEFAULT == null ? customPalette != null : !CUSTOM_PALETTE_EDEFAULT.equals(customPalette);
-		case ConfigurationPackage.PAPYRUS_DIAGRAM__CUSTOM_STYLE:
-			return CUSTOM_STYLE_EDEFAULT == null ? customStyle != null : !CUSTOM_STYLE_EDEFAULT.equals(customStyle);
-		case ConfigurationPackage.PAPYRUS_DIAGRAM__CHILD_RULES:
-			return childRules != null && !childRules.isEmpty();
-		case ConfigurationPackage.PAPYRUS_DIAGRAM__PALETTE_RULES:
-			return paletteRules != null && !paletteRules.isEmpty();
-		case ConfigurationPackage.PAPYRUS_DIAGRAM__ASSISTANT_RULES:
-			return assistantRules != null && !assistantRules.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(" (customPalette: ");
-		result.append(customPalette);
-		result.append(", customStyle: ");
-		result.append(customStyle);
-		result.append(')');
-		return result.toString();
-	}
-
-} //PapyrusDiagramImpl
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/PapyrusViewImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/PapyrusViewImpl.java
deleted file mode 100644
index 2640c93d16f..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/PapyrusViewImpl.java
+++ /dev/null
@@ -1,465 +0,0 @@
-/**
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- *
- *  Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *
- */
-package org.eclipse.papyrus.infra.viewpoints.configuration.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.EPackage;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.papyrus.infra.viewpoints.configuration.Category;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ModelRule;
-import org.eclipse.papyrus.infra.viewpoints.configuration.OwningRule;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView;
-
-import org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ModelKindImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Papyrus View</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusViewImpl#getIcon <em>Icon</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusViewImpl#getParent <em>Parent</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusViewImpl#getProfiles <em>Profiles</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusViewImpl#getModelRules <em>Model Rules</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusViewImpl#getOwningRules <em>Owning Rules</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusViewImpl#getImplementationID <em>Implementation ID</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusViewImpl#getCategories <em>Categories</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class PapyrusViewImpl extends ModelKindImpl implements PapyrusView {
-	/**
-	 * 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;
-
-	/**
-	 * The cached value of the '{@link #getParent() <em>Parent</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParent()
-	 * @generated
-	 * @ordered
-	 */
-	protected PapyrusView parent;
-
-	/**
-	 * The cached value of the '{@link #getProfiles() <em>Profiles</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProfiles()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<EPackage> profiles;
-
-	/**
-	 * The cached value of the '{@link #getModelRules() <em>Model Rules</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getModelRules()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<ModelRule> modelRules;
-
-	/**
-	 * The cached value of the '{@link #getOwningRules() <em>Owning Rules</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOwningRules()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<OwningRule> owningRules;
-
-	/**
-	 * The default value of the '{@link #getImplementationID() <em>Implementation ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getImplementationID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String IMPLEMENTATION_ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getImplementationID() <em>Implementation ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getImplementationID()
-	 * @generated
-	 * @ordered
-	 */
-	protected String implementationID = IMPLEMENTATION_ID_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getCategories() <em>Categories</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCategories()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Category> categories;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PapyrusViewImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ConfigurationPackage.Literals.PAPYRUS_VIEW;
-	}
-
-	/**
-	 * <!-- 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, ConfigurationPackage.PAPYRUS_VIEW__ICON, oldIcon, icon));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PapyrusView getParent() {
-		if (parent != null && parent.eIsProxy()) {
-			InternalEObject oldParent = (InternalEObject) parent;
-			parent = (PapyrusView) eResolveProxy(oldParent);
-			if (parent != oldParent) {
-				if (eNotificationRequired()) {
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ConfigurationPackage.PAPYRUS_VIEW__PARENT, oldParent, parent));
-				}
-			}
-		}
-		return parent;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PapyrusView basicGetParent() {
-		return parent;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setParent(PapyrusView newParent) {
-		PapyrusView oldParent = parent;
-		parent = newParent;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ConfigurationPackage.PAPYRUS_VIEW__PARENT, oldParent, parent));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<EPackage> getProfiles() {
-		if (profiles == null) {
-			profiles = new EObjectResolvingEList<EPackage>(EPackage.class, this, ConfigurationPackage.PAPYRUS_VIEW__PROFILES);
-		}
-		return profiles;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<ModelRule> getModelRules() {
-		if (modelRules == null) {
-			modelRules = new EObjectContainmentEList<ModelRule>(ModelRule.class, this, ConfigurationPackage.PAPYRUS_VIEW__MODEL_RULES);
-		}
-		return modelRules;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<OwningRule> getOwningRules() {
-		if (owningRules == null) {
-			owningRules = new EObjectContainmentEList<OwningRule>(OwningRule.class, this, ConfigurationPackage.PAPYRUS_VIEW__OWNING_RULES);
-		}
-		return owningRules;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getImplementationID() {
-		return implementationID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setImplementationID(String newImplementationID) {
-		String oldImplementationID = implementationID;
-		implementationID = newImplementationID;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ConfigurationPackage.PAPYRUS_VIEW__IMPLEMENTATION_ID, oldImplementationID, implementationID));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<Category> getCategories() {
-		if (categories == null) {
-			categories = new EObjectResolvingEList<Category>(Category.class, this, ConfigurationPackage.PAPYRUS_VIEW__CATEGORIES);
-		}
-		return categories;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case ConfigurationPackage.PAPYRUS_VIEW__MODEL_RULES:
-			return ((InternalEList<?>) getModelRules()).basicRemove(otherEnd, msgs);
-		case ConfigurationPackage.PAPYRUS_VIEW__OWNING_RULES:
-			return ((InternalEList<?>) getOwningRules()).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 ConfigurationPackage.PAPYRUS_VIEW__ICON:
-			return getIcon();
-		case ConfigurationPackage.PAPYRUS_VIEW__PARENT:
-			if (resolve) {
-				return getParent();
-			}
-			return basicGetParent();
-		case ConfigurationPackage.PAPYRUS_VIEW__PROFILES:
-			return getProfiles();
-		case ConfigurationPackage.PAPYRUS_VIEW__MODEL_RULES:
-			return getModelRules();
-		case ConfigurationPackage.PAPYRUS_VIEW__OWNING_RULES:
-			return getOwningRules();
-		case ConfigurationPackage.PAPYRUS_VIEW__IMPLEMENTATION_ID:
-			return getImplementationID();
-		case ConfigurationPackage.PAPYRUS_VIEW__CATEGORIES:
-			return getCategories();
-		}
-		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 ConfigurationPackage.PAPYRUS_VIEW__ICON:
-			setIcon((String) newValue);
-			return;
-		case ConfigurationPackage.PAPYRUS_VIEW__PARENT:
-			setParent((PapyrusView) newValue);
-			return;
-		case ConfigurationPackage.PAPYRUS_VIEW__PROFILES:
-			getProfiles().clear();
-			getProfiles().addAll((Collection<? extends EPackage>) newValue);
-			return;
-		case ConfigurationPackage.PAPYRUS_VIEW__MODEL_RULES:
-			getModelRules().clear();
-			getModelRules().addAll((Collection<? extends ModelRule>) newValue);
-			return;
-		case ConfigurationPackage.PAPYRUS_VIEW__OWNING_RULES:
-			getOwningRules().clear();
-			getOwningRules().addAll((Collection<? extends OwningRule>) newValue);
-			return;
-		case ConfigurationPackage.PAPYRUS_VIEW__IMPLEMENTATION_ID:
-			setImplementationID((String) newValue);
-			return;
-		case ConfigurationPackage.PAPYRUS_VIEW__CATEGORIES:
-			getCategories().clear();
-			getCategories().addAll((Collection<? extends Category>) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case ConfigurationPackage.PAPYRUS_VIEW__ICON:
-			setIcon(ICON_EDEFAULT);
-			return;
-		case ConfigurationPackage.PAPYRUS_VIEW__PARENT:
-			setParent((PapyrusView) null);
-			return;
-		case ConfigurationPackage.PAPYRUS_VIEW__PROFILES:
-			getProfiles().clear();
-			return;
-		case ConfigurationPackage.PAPYRUS_VIEW__MODEL_RULES:
-			getModelRules().clear();
-			return;
-		case ConfigurationPackage.PAPYRUS_VIEW__OWNING_RULES:
-			getOwningRules().clear();
-			return;
-		case ConfigurationPackage.PAPYRUS_VIEW__IMPLEMENTATION_ID:
-			setImplementationID(IMPLEMENTATION_ID_EDEFAULT);
-			return;
-		case ConfigurationPackage.PAPYRUS_VIEW__CATEGORIES:
-			getCategories().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case ConfigurationPackage.PAPYRUS_VIEW__ICON:
-			return ICON_EDEFAULT == null ? icon != null : !ICON_EDEFAULT.equals(icon);
-		case ConfigurationPackage.PAPYRUS_VIEW__PARENT:
-			return parent != null;
-		case ConfigurationPackage.PAPYRUS_VIEW__PROFILES:
-			return profiles != null && !profiles.isEmpty();
-		case ConfigurationPackage.PAPYRUS_VIEW__MODEL_RULES:
-			return modelRules != null && !modelRules.isEmpty();
-		case ConfigurationPackage.PAPYRUS_VIEW__OWNING_RULES:
-			return owningRules != null && !owningRules.isEmpty();
-		case ConfigurationPackage.PAPYRUS_VIEW__IMPLEMENTATION_ID:
-			return IMPLEMENTATION_ID_EDEFAULT == null ? implementationID != null : !IMPLEMENTATION_ID_EDEFAULT.equals(implementationID);
-		case ConfigurationPackage.PAPYRUS_VIEW__CATEGORIES:
-			return categories != null && !categories.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(" (icon: ");
-		result.append(icon);
-		result.append(", implementationID: ");
-		result.append(implementationID);
-		result.append(')');
-		return result.toString();
-	}
-
-} //PapyrusViewImpl
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/PapyrusViewpointImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/PapyrusViewpointImpl.java
deleted file mode 100644
index 94532f79088..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/PapyrusViewpointImpl.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/**
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- *
- *  Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *
- */
-package org.eclipse.papyrus.infra.viewpoints.configuration.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusViewpoint;
-
-import org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureViewpointImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Papyrus Viewpoint</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusViewpointImpl#getParent <em>Parent</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class PapyrusViewpointImpl extends ArchitectureViewpointImpl implements PapyrusViewpoint {
-	/**
-	 * The cached value of the '{@link #getParent() <em>Parent</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParent()
-	 * @generated
-	 * @ordered
-	 */
-	protected PapyrusViewpoint parent;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PapyrusViewpointImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ConfigurationPackage.Literals.PAPYRUS_VIEWPOINT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PapyrusViewpoint getParent() {
-		if (parent != null && parent.eIsProxy()) {
-			InternalEObject oldParent = (InternalEObject) parent;
-			parent = (PapyrusViewpoint) eResolveProxy(oldParent);
-			if (parent != oldParent) {
-				if (eNotificationRequired()) {
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ConfigurationPackage.PAPYRUS_VIEWPOINT__PARENT, oldParent, parent));
-				}
-			}
-		}
-		return parent;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PapyrusViewpoint basicGetParent() {
-		return parent;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setParent(PapyrusViewpoint newParent) {
-		PapyrusViewpoint oldParent = parent;
-		parent = newParent;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ConfigurationPackage.PAPYRUS_VIEWPOINT__PARENT, oldParent, parent));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case ConfigurationPackage.PAPYRUS_VIEWPOINT__PARENT:
-			if (resolve) {
-				return getParent();
-			}
-			return basicGetParent();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case ConfigurationPackage.PAPYRUS_VIEWPOINT__PARENT:
-			setParent((PapyrusViewpoint) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case ConfigurationPackage.PAPYRUS_VIEWPOINT__PARENT:
-			setParent((PapyrusViewpoint) null);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case ConfigurationPackage.PAPYRUS_VIEWPOINT__PARENT:
-			return parent != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //PapyrusViewpointImpl
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/util/ConfigurationAdapterFactory.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/util/ConfigurationAdapterFactory.java
deleted file mode 100644
index 38701fd37d6..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/util/ConfigurationAdapterFactory.java
+++ /dev/null
@@ -1,519 +0,0 @@
-/**
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- *
- *  Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *
- */
-package org.eclipse.papyrus.infra.viewpoints.configuration.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.infra.constraints.DisplayUnit;
-
-import org.eclipse.papyrus.infra.viewpoints.configuration.*;
-
-import org.eclipse.papyrus.infra.viewpoints.iso42010.ADElement;
-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureFramework;
-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint;
-import org.eclipse.papyrus.infra.viewpoints.iso42010.ModelKind;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage
- * @generated
- */
-public class ConfigurationAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static ConfigurationPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ConfigurationAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = ConfigurationPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject) object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ConfigurationSwitch<Adapter> modelSwitch = new ConfigurationSwitch<Adapter>() {
-		@Override
-		public Adapter casePapyrusConfiguration(PapyrusConfiguration object) {
-			return createPapyrusConfigurationAdapter();
-		}
-
-		@Override
-		public Adapter casePapyrusViewpoint(PapyrusViewpoint object) {
-			return createPapyrusViewpointAdapter();
-		}
-
-		@Override
-		public Adapter casePapyrusView(PapyrusView object) {
-			return createPapyrusViewAdapter();
-		}
-
-		@Override
-		public Adapter casePapyrusDiagram(PapyrusDiagram object) {
-			return createPapyrusDiagramAdapter();
-		}
-
-		@Override
-		public Adapter casePapyrusSyncTable(PapyrusSyncTable object) {
-			return createPapyrusSyncTableAdapter();
-		}
-
-		@Override
-		public Adapter casePapyrusTable(PapyrusTable object) {
-			return createPapyrusTableAdapter();
-		}
-
-		@Override
-		public Adapter caseRule(Rule object) {
-			return createRuleAdapter();
-		}
-
-		@Override
-		public Adapter caseModelRule(ModelRule object) {
-			return createModelRuleAdapter();
-		}
-
-		@Override
-		public Adapter caseOwningRule(OwningRule object) {
-			return createOwningRuleAdapter();
-		}
-
-		@Override
-		public Adapter caseChildRule(ChildRule object) {
-			return createChildRuleAdapter();
-		}
-
-		@Override
-		public Adapter casePaletteRule(PaletteRule object) {
-			return createPaletteRuleAdapter();
-		}
-
-		@Override
-		public Adapter casePathElement(PathElement object) {
-			return createPathElementAdapter();
-		}
-
-		@Override
-		public Adapter caseCategory(Category object) {
-			return createCategoryAdapter();
-		}
-
-		@Override
-		public Adapter caseModelAutoCreate(ModelAutoCreate object) {
-			return createModelAutoCreateAdapter();
-		}
-
-		@Override
-		public Adapter caseRootAutoSelect(RootAutoSelect object) {
-			return createRootAutoSelectAdapter();
-		}
-
-		@Override
-		public Adapter caseAssistantRule(AssistantRule object) {
-			return createAssistantRuleAdapter();
-		}
-
-		@Override
-		public Adapter caseArchitectureFramework(ArchitectureFramework object) {
-			return createArchitectureFrameworkAdapter();
-		}
-
-		@Override
-		public Adapter caseADElement(ADElement object) {
-			return createADElementAdapter();
-		}
-
-		@Override
-		public Adapter caseArchitectureViewpoint(ArchitectureViewpoint object) {
-			return createArchitectureViewpointAdapter();
-		}
-
-		@Override
-		public Adapter caseModelKind(ModelKind object) {
-			return createModelKindAdapter();
-		}
-
-		@Override
-		public Adapter caseDisplayUnit(DisplayUnit object) {
-			return createDisplayUnitAdapter();
-		}
-
-		@Override
-		public Adapter defaultCase(EObject object) {
-			return createEObjectAdapter();
-		}
-	};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject) target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusConfiguration <em>Papyrus Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusConfiguration
-	 * @generated
-	 */
-	public Adapter createPapyrusConfigurationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusViewpoint <em>Papyrus Viewpoint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusViewpoint
-	 * @generated
-	 */
-	public Adapter createPapyrusViewpointAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView <em>Papyrus View</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView
-	 * @generated
-	 */
-	public Adapter createPapyrusViewAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram <em>Papyrus Diagram</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram
-	 * @generated
-	 */
-	public Adapter createPapyrusDiagramAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusSyncTable <em>Papyrus Sync Table</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusSyncTable
-	 * @generated
-	 */
-	public Adapter createPapyrusSyncTableAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusTable <em>Papyrus Table</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusTable
-	 * @generated
-	 */
-	public Adapter createPapyrusTableAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.Rule <em>Rule</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.Rule
-	 * @generated
-	 */
-	public Adapter createRuleAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.ModelRule <em>Model Rule</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ModelRule
-	 * @generated
-	 */
-	public Adapter createModelRuleAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.OwningRule <em>Owning Rule</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.OwningRule
-	 * @generated
-	 */
-	public Adapter createOwningRuleAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.ChildRule <em>Child Rule</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ChildRule
-	 * @generated
-	 */
-	public Adapter createChildRuleAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PaletteRule <em>Palette Rule</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PaletteRule
-	 * @generated
-	 */
-	public Adapter createPaletteRuleAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PathElement <em>Path Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PathElement
-	 * @generated
-	 */
-	public Adapter createPathElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.Category <em>Category</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.Category
-	 * @generated
-	 */
-	public Adapter createCategoryAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.ModelAutoCreate <em>Model Auto Create</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ModelAutoCreate
-	 * @generated
-	 */
-	public Adapter createModelAutoCreateAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.RootAutoSelect <em>Root Auto Select</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.RootAutoSelect
-	 * @generated
-	 */
-	public Adapter createRootAutoSelectAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.AssistantRule <em>Assistant Rule</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.AssistantRule
-	 * @generated
-	 */
-	public Adapter createAssistantRuleAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureFramework <em>Architecture Framework</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureFramework
-	 * @generated
-	 */
-	public Adapter createArchitectureFrameworkAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ADElement <em>AD Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ADElement
-	 * @generated
-	 */
-	public Adapter createADElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint <em>Architecture Viewpoint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint
-	 * @generated
-	 */
-	public Adapter createArchitectureViewpointAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ModelKind <em>Model Kind</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ModelKind
-	 * @generated
-	 */
-	public Adapter createModelKindAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.constraints.DisplayUnit <em>Display Unit</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.constraints.DisplayUnit
-	 * @generated
-	 */
-	public Adapter createDisplayUnitAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //ConfigurationAdapterFactory
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/util/ConfigurationSwitch.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/util/ConfigurationSwitch.java
deleted file mode 100644
index 2e5d9ee1cc5..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/util/ConfigurationSwitch.java
+++ /dev/null
@@ -1,612 +0,0 @@
-/**
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- *
- *  Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *
- */
-package org.eclipse.papyrus.infra.viewpoints.configuration.util;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.util.Switch;
-
-import org.eclipse.papyrus.infra.constraints.DisplayUnit;
-
-import org.eclipse.papyrus.infra.viewpoints.configuration.*;
-
-import org.eclipse.papyrus.infra.viewpoints.iso42010.ADElement;
-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureFramework;
-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint;
-import org.eclipse.papyrus.infra.viewpoints.iso42010.ModelKind;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage
- * @generated
- */
-public class ConfigurationSwitch<T> extends Switch<T> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static ConfigurationPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ConfigurationSwitch() {
-		if (modelPackage == null) {
-			modelPackage = ConfigurationPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param ePackage the package in question.
-	 * @return whether this is a switch for the given package.
-	 * @generated
-	 */
-	@Override
-	protected boolean isSwitchFor(EPackage ePackage) {
-		return ePackage == modelPackage;
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-		case ConfigurationPackage.PAPYRUS_CONFIGURATION: {
-			PapyrusConfiguration papyrusConfiguration = (PapyrusConfiguration) theEObject;
-			T result = casePapyrusConfiguration(papyrusConfiguration);
-			if (result == null) {
-				result = caseArchitectureFramework(papyrusConfiguration);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case ConfigurationPackage.PAPYRUS_VIEWPOINT: {
-			PapyrusViewpoint papyrusViewpoint = (PapyrusViewpoint) theEObject;
-			T result = casePapyrusViewpoint(papyrusViewpoint);
-			if (result == null) {
-				result = caseArchitectureViewpoint(papyrusViewpoint);
-			}
-			if (result == null) {
-				result = caseADElement(papyrusViewpoint);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case ConfigurationPackage.PAPYRUS_VIEW: {
-			PapyrusView papyrusView = (PapyrusView) theEObject;
-			T result = casePapyrusView(papyrusView);
-			if (result == null) {
-				result = caseModelKind(papyrusView);
-			}
-			if (result == null) {
-				result = caseADElement(papyrusView);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case ConfigurationPackage.PAPYRUS_DIAGRAM: {
-			PapyrusDiagram papyrusDiagram = (PapyrusDiagram) theEObject;
-			T result = casePapyrusDiagram(papyrusDiagram);
-			if (result == null) {
-				result = casePapyrusView(papyrusDiagram);
-			}
-			if (result == null) {
-				result = caseModelKind(papyrusDiagram);
-			}
-			if (result == null) {
-				result = caseADElement(papyrusDiagram);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case ConfigurationPackage.PAPYRUS_SYNC_TABLE: {
-			PapyrusSyncTable papyrusSyncTable = (PapyrusSyncTable) theEObject;
-			T result = casePapyrusSyncTable(papyrusSyncTable);
-			if (result == null) {
-				result = casePapyrusView(papyrusSyncTable);
-			}
-			if (result == null) {
-				result = caseModelKind(papyrusSyncTable);
-			}
-			if (result == null) {
-				result = caseADElement(papyrusSyncTable);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case ConfigurationPackage.PAPYRUS_TABLE: {
-			PapyrusTable papyrusTable = (PapyrusTable) theEObject;
-			T result = casePapyrusTable(papyrusTable);
-			if (result == null) {
-				result = casePapyrusView(papyrusTable);
-			}
-			if (result == null) {
-				result = caseModelKind(papyrusTable);
-			}
-			if (result == null) {
-				result = caseADElement(papyrusTable);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case ConfigurationPackage.RULE: {
-			Rule rule = (Rule) theEObject;
-			T result = caseRule(rule);
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case ConfigurationPackage.MODEL_RULE: {
-			ModelRule modelRule = (ModelRule) theEObject;
-			T result = caseModelRule(modelRule);
-			if (result == null) {
-				result = caseRule(modelRule);
-			}
-			if (result == null) {
-				result = caseDisplayUnit(modelRule);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case ConfigurationPackage.OWNING_RULE: {
-			OwningRule owningRule = (OwningRule) theEObject;
-			T result = caseOwningRule(owningRule);
-			if (result == null) {
-				result = caseRule(owningRule);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case ConfigurationPackage.CHILD_RULE: {
-			ChildRule childRule = (ChildRule) theEObject;
-			T result = caseChildRule(childRule);
-			if (result == null) {
-				result = caseRule(childRule);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case ConfigurationPackage.PALETTE_RULE: {
-			PaletteRule paletteRule = (PaletteRule) theEObject;
-			T result = casePaletteRule(paletteRule);
-			if (result == null) {
-				result = caseRule(paletteRule);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case ConfigurationPackage.PATH_ELEMENT: {
-			PathElement pathElement = (PathElement) theEObject;
-			T result = casePathElement(pathElement);
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case ConfigurationPackage.CATEGORY: {
-			Category category = (Category) theEObject;
-			T result = caseCategory(category);
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case ConfigurationPackage.MODEL_AUTO_CREATE: {
-			ModelAutoCreate modelAutoCreate = (ModelAutoCreate) theEObject;
-			T result = caseModelAutoCreate(modelAutoCreate);
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case ConfigurationPackage.ROOT_AUTO_SELECT: {
-			RootAutoSelect rootAutoSelect = (RootAutoSelect) theEObject;
-			T result = caseRootAutoSelect(rootAutoSelect);
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case ConfigurationPackage.ASSISTANT_RULE: {
-			AssistantRule assistantRule = (AssistantRule) theEObject;
-			T result = caseAssistantRule(assistantRule);
-			if (result == null) {
-				result = caseRule(assistantRule);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		default:
-			return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Papyrus Configuration</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>Papyrus Configuration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T casePapyrusConfiguration(PapyrusConfiguration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Papyrus Viewpoint</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>Papyrus Viewpoint</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T casePapyrusViewpoint(PapyrusViewpoint object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Papyrus View</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>Papyrus View</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T casePapyrusView(PapyrusView object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Papyrus Diagram</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>Papyrus Diagram</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T casePapyrusDiagram(PapyrusDiagram object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Papyrus Sync Table</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>Papyrus Sync Table</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T casePapyrusSyncTable(PapyrusSyncTable object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Papyrus Table</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>Papyrus Table</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T casePapyrusTable(PapyrusTable object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Rule</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>Rule</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseRule(Rule object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Model Rule</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>Model Rule</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseModelRule(ModelRule object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Owning Rule</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>Owning Rule</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseOwningRule(OwningRule object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Child Rule</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>Child Rule</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseChildRule(ChildRule object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Palette Rule</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>Palette Rule</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T casePaletteRule(PaletteRule object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Path Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Path Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T casePathElement(PathElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Category</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>Category</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseCategory(Category object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Model Auto Create</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>Model Auto Create</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseModelAutoCreate(ModelAutoCreate object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Root Auto Select</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>Root Auto Select</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseRootAutoSelect(RootAutoSelect object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Assistant Rule</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>Assistant Rule</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseAssistantRule(AssistantRule object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Architecture Framework</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>Architecture Framework</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseArchitectureFramework(ArchitectureFramework object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>AD Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>AD Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseADElement(ADElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Architecture Viewpoint</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>Architecture Viewpoint</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseArchitectureViewpoint(ArchitectureViewpoint object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Model Kind</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>Model Kind</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseModelKind(ModelKind object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Display Unit</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>Display Unit</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseDisplayUnit(DisplayUnit object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	@Override
-	public T defaultCase(EObject object) {
-		return null;
-	}
-
-} //ConfigurationSwitch
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/Activator.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/Activator.java
deleted file mode 100644
index fdf602e8008..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/Activator.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.viewpoints.configuration;
-
-import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.papyrus.infra.core.log.LogHelper;
-
-public class Activator extends EMFPlugin {
-	/**
-	 * Keep track of the singleton.
-	 */
-	public static final Activator INSTANCE = new Activator();
-
-	/** Logging helper */
-	public static LogHelper log = new LogHelper();
-
-	/**
-	 * Keep track of the singleton.
-	 */
-	private static Implementation plugin;
-
-	/**
-	 * Create the instance.
-	 */
-	public Activator() {
-		super(new ResourceLocator[] {});
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * 
-	 * @return the singleton instance.
-	 */
-	@Override
-	public ResourceLocator getPluginResourceLocator() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * 
-	 * @return the singleton instance.
-	 */
-	public static Implementation getPlugin() {
-		return plugin;
-	}
-
-	/**
-	 * The actual implementation of the Eclipse <b>Plugin</b>.
-	 */
-	public static class Implementation extends EclipsePlugin {
-		/**
-		 * Creates an instance.
-		 */
-		public Implementation() {
-			super();
-
-			// Remember the static instance.
-			//
-			plugin = this;
-
-			// register the log helper
-			log.setPlugin(plugin);
-		}
-	}
-}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/ComplexTypePropertyDescriptor.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/ComplexTypePropertyDescriptor.java
deleted file mode 100644
index d127c35be31..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/ComplexTypePropertyDescriptor.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2014 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:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.viewpoints.configuration;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext;
-
-/**
- * Represents a descriptor for properties of type EClass
- * This is used for the ModelAutoCreate.target property because we may want to create stereotyped elements
- *
- * @author Laurent Wouters
- */
-public class ComplexTypePropertyDescriptor extends SurrogateItemPropertyDescriptor {
-	private static final Collection<EObject> empty = new ArrayList<EObject>();
-	private List<String> result;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param inner
-	 */
-	public ComplexTypePropertyDescriptor(IItemPropertyDescriptor inner) {
-		super(inner);
-		result = new ArrayList<String>();
-		try {
-			IClientContext context = TypeContext.getContext();
-			IElementType[] types = ElementTypeRegistry.getInstance().getElementTypes(context);
-			if (types != null) {
-				for (IElementType type : types) {
-					result.add(type.getId());
-				}
-			}
-			Collections.sort(result);
-		} catch (ServiceException e) {
-			// TODO : Init log in Activator and log something here 
-		}
-	}
-
-	/**
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.SurrogateItemPropertyDescriptor#getChoiceOfValues(java.lang.Object)
-	 *
-	 * @param object
-	 * @return
-	 */
-	@Override
-	public Collection<?> getChoiceOfValues(Object object) {
-		EObject current = (EObject) object;
-		if (current == null) {
-			return empty;
-		}
-		return result;
-	}
-}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/ui/ConfigurationURLSelectionDialog.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/ui/ConfigurationURLSelectionDialog.java
deleted file mode 100644
index a38652312e4..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/ui/ConfigurationURLSelectionDialog.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.viewpoints.configuration.ui;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ListViewer;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Dialog for the selection of a configuration model through URIs
- *
- * @author Laurent Wouters
- */
-public class ConfigurationURLSelectionDialog extends Dialog {
-
-	private static final int SIZE_WIDTH = 400;
-	private static final int SIZE_HEIGHT = 300;
-	private static final String MSG_TITLE = "Select the URI of the configuration model";
-
-	private static final Object TREE_ROOT = new Object();
-
-	private Resource selection;
-
-	/**
-	 * Represents a provider of URIs
-	 *
-	 * @author Laurent Wouters
-	 */
-	private static class ModelContentProvider implements IStructuredContentProvider {
-		public void dispose() {
-		}
-
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		}
-
-		public Object[] getElements(Object inputElement) {
-			List<Resource> data = new ArrayList<Resource>();
-
-			return data.toArray();
-		}
-	}
-
-	public ConfigurationURLSelectionDialog(Shell parentShell, int style) {
-		super(parentShell);
-	}
-
-	@Override
-	protected Control createDialogArea(Composite parent) {
-		// create composite
-		Composite composite = (Composite) super.createDialogArea(parent);
-		GridLayout gridLayout = new GridLayout();
-		gridLayout.numColumns = 1;
-		composite.setLayout(gridLayout);
-
-		Composite inner = new Composite(composite, SWT.NONE);
-		inner.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.FILL_VERTICAL));
-		inner.setLayout(new FillLayout());
-
-		ListViewer list = new ListViewer(inner, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
-		list.setLabelProvider(getLabelProvider());
-		list.setContentProvider(new ModelContentProvider());
-		list.setInput(TREE_ROOT);
-		list.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				IStructuredSelection s = (IStructuredSelection) event.getSelection();
-				Object first = s.getFirstElement();
-				if (first == null) {
-					onSelection(null);
-				} else if (first instanceof Resource) {
-					onSelection((Resource) first);
-				} else {
-					onSelection(null);
-				}
-			}
-		});
-
-		applyDialogFont(composite);
-		return composite;
-	}
-
-	@Override
-	protected Control createButtonBar(Composite parent) {
-		Control composite = super.createButtonBar(parent);
-		if (selection == null) {
-			getButton(IDialogConstants.OK_ID).setEnabled(false);
-		} else {
-			getButton(IDialogConstants.OK_ID).setEnabled(true);
-		}
-		return composite;
-	}
-
-	private void onSelection(Resource element) {
-		selection = element;
-		if (selection == null) {
-			getButton(IDialogConstants.OK_ID).setEnabled(false);
-		} else {
-			getButton(IDialogConstants.OK_ID).setEnabled(true);
-		}
-	}
-
-	@Override
-	protected void configureShell(Shell shell) {
-		super.configureShell(shell);
-		shell.setSize(SIZE_WIDTH, SIZE_HEIGHT);
-		Point size = shell.getParent().getShell().getSize();
-		shell.setLocation((size.x - SIZE_WIDTH) / 2, (size.y - SIZE_HEIGHT) / 2);
-		shell.setText(MSG_TITLE);
-	}
-
-	private ILabelProvider getLabelProvider() {
-		return new ILabelProvider() {
-			public void addListener(ILabelProviderListener listener) {
-			}
-
-			public void dispose() {
-			}
-
-			public boolean isLabelProperty(Object element, String property) {
-				return false;
-			}
-
-			public void removeListener(ILabelProviderListener listener) {
-			}
-
-			public Image getImage(Object element) {
-				return null;
-			}
-
-			public String getText(Object element) {
-				Resource res = (Resource) element;
-				return res.getURI().toString();
-			}
-		};
-	}
-}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/ui/IModelElementValidator.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/ui/IModelElementValidator.java
deleted file mode 100644
index 157b2e913bf..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/ui/IModelElementValidator.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.viewpoints.configuration.ui;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * Represents the validation for the selection of an object
- *
- * @author Laurent Wouters
- */
-public interface IModelElementValidator {
-	/**
-	 * Determines whether the given object pass the represented validation
-	 *
-	 * @param element
-	 *            The element to evaluate
-	 * @return <code>null</code> if the object passes the validation, or the notification to be displayed
-	 */
-	String isSelectable(EObject element);
-}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/ui/ModelElementSelectionDialog.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/ui/ModelElementSelectionDialog.java
deleted file mode 100644
index a04bb7f59ba..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/ui/ModelElementSelectionDialog.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.viewpoints.configuration.ui;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Represents a dialog for the selection of a model element
- *
- * @author Laurent Wouters
- */
-public class ModelElementSelectionDialog extends Dialog {
-	private static final int SIZE_WIDTH = 400;
-	private static final int SIZE_HEIGHT = 300;
-
-	private static final String MSG_TITLE = "Model element selection";
-	private static final String MSG_EMPTYSELECTION = "Select an element";
-
-	private ServicesRegistry registry;
-	private EObject root;
-	private EObject selection;
-	private IModelElementValidator validator;
-	private Label notification;
-	private String message;
-
-	private static class AtomSelection implements IStructuredSelection {
-		private Object element;
-
-		public AtomSelection(Object element) {
-			this.element = element;
-		}
-
-		public boolean isEmpty() {
-			return (element == null);
-		}
-
-		public Object getFirstElement() {
-			return element;
-		}
-
-		public Iterator iterator() {
-			return new Iterator() {
-				private boolean done = false;
-
-				public boolean hasNext() {
-					return (!done);
-				}
-
-				public Object next() {
-					if (done) {
-						throw new NoSuchElementException();
-					}
-					done = true;
-					return element;
-				}
-
-				public void remove() {
-				}
-			};
-		}
-
-		public int size() {
-			return ((element != null) ? 1 : 0);
-		}
-
-		public Object[] toArray() {
-			if (element == null) {
-				return new Object[0];
-			}
-			return new Object[] { element };
-		}
-
-		public List toList() {
-			List<Object> list = new ArrayList<Object>(1);
-			if (element != null) {
-				list.add(element);
-			}
-			return list;
-		}
-	}
-
-
-	public EObject getSelection() {
-		return selection;
-	}
-
-	public ModelElementSelectionDialog(Shell parentShell, ServicesRegistry registry, String message, EObject root, EObject current, IModelElementValidator validator) {
-		super(parentShell);
-		this.registry = registry;
-		this.root = root;
-		this.selection = current;
-		this.validator = validator;
-		this.message = message;
-	}
-
-	@Override
-	protected Control createDialogArea(Composite parent) {
-		// create composite
-		Composite composite = (Composite) super.createDialogArea(parent);
-		GridLayout gridLayout = new GridLayout();
-		gridLayout.numColumns = 1;
-		composite.setLayout(gridLayout);
-
-		Label label = new Label(composite, SWT.WRAP | SWT.SINGLE);
-		label.setText(message);
-		label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL));
-
-		Composite inner = new Composite(composite, SWT.NONE);
-		inner.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.FILL_VERTICAL));
-		inner.setLayout(new FillLayout());
-
-		TreeViewer tree = new TreeViewer(inner, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
-		tree.setLabelProvider(getLabelProvider());
-		tree.setContentProvider(new ECoreModelContentProvider(root));
-		tree.setInput(ECoreModelContentProvider.ROOT);
-		if (selection != null) {
-			tree.reveal(selection);
-			tree.setSelection(new AtomSelection(selection));
-		}
-		tree.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				IStructuredSelection s = (IStructuredSelection) event.getSelection();
-				Object first = s.getFirstElement();
-				if (first == null) {
-					onSelection(null);
-				} else if (first instanceof EObject) {
-					onSelection((EObject) first);
-				} else {
-					onSelection(null);
-				}
-			}
-		});
-
-		notification = new Label(composite, SWT.WRAP | SWT.SINGLE);
-		notification.setForeground(new Color(composite.getDisplay(), 255, 0, 0));
-		notification.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL));
-		if (selection == null) {
-			notification.setText(MSG_EMPTYSELECTION);
-		} else {
-			String msg = validator.isSelectable(selection);
-			if (msg == null) {
-				notification.setText("");
-			} else {
-				notification.setText(msg);
-			}
-		}
-
-		applyDialogFont(composite);
-		return composite;
-	}
-
-	@Override
-	protected Control createButtonBar(Composite parent) {
-		Control composite = super.createButtonBar(parent);
-		if (selection == null) {
-			getButton(IDialogConstants.OK_ID).setEnabled(false);
-		} else {
-			String msg = validator.isSelectable(selection);
-			if (msg == null) {
-				getButton(IDialogConstants.OK_ID).setEnabled(true);
-			} else {
-				getButton(IDialogConstants.OK_ID).setEnabled(false);
-			}
-		}
-		return composite;
-	}
-
-
-	private void onSelection(EObject element) {
-		selection = element;
-		if (selection == null) {
-			notification.setText(MSG_EMPTYSELECTION);
-			getButton(IDialogConstants.OK_ID).setEnabled(false);
-		} else {
-			String msg = validator.isSelectable(selection);
-			if (msg == null) {
-				notification.setText("");
-				getButton(IDialogConstants.OK_ID).setEnabled(true);
-			} else {
-				notification.setText(msg);
-				getButton(IDialogConstants.OK_ID).setEnabled(false);
-			}
-		}
-	}
-
-	@Override
-	protected void configureShell(Shell shell) {
-		super.configureShell(shell);
-		shell.setSize(SIZE_WIDTH, SIZE_HEIGHT);
-		shell.setText(MSG_TITLE);
-		if (shell.getParent() != null) {
-			Composite parent = shell.getParent();
-			Shell parentShell = parent.getShell();
-			if (parentShell != null) {
-				Point size = parentShell.getSize();
-				shell.setLocation((size.x - SIZE_WIDTH) / 2, (size.y - SIZE_HEIGHT) / 2);
-			}
-		}
-	}
-
-	private ILabelProvider getLabelProvider() {
-		try {
-			LabelProviderService service = registry.getService(LabelProviderService.class);
-			if (service != null) {
-				return service.getLabelProvider();
-			}
-		} catch (ServiceException e) {
-		}
-		return null;
-	}
-}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/util/ConfigurationResourceCustomImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/util/ConfigurationResourceCustomImpl.java
deleted file mode 100644
index 67fb6dcaf18..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/util/ConfigurationResourceCustomImpl.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Copyright (c) 2015 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:
- *  Benoit Maggi benoit.maggi@cea.fr - Initial API and implementation
- *
- */
-package org.eclipse.papyrus.infra.viewpoints.configuration.util;
-
-import org.eclipse.emf.common.util.URI;
-
-
-/**
- * Custom configuration resource to enforce the use of UUIDS
- * @author Benoit Maggi
- */
-public class ConfigurationResourceCustomImpl extends ConfigurationResourceImpl {
-
-
-	/**
-	 * Constructor.
-	 *
-	 * @param uri
-	 */
-	public ConfigurationResourceCustomImpl(URI uri) {
-		super(uri);
-	}
-
-	/**
-	 * use UUIDs instead of positions
-	 */
-	@Override
-	protected boolean useUUIDs() {
-		return true;
-	}
-
-} 
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/util/ConfigurationResourceFactoryCustomImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/util/ConfigurationResourceFactoryCustomImpl.java
deleted file mode 100644
index 4c492676f0c..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/util/ConfigurationResourceFactoryCustomImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Copyright (c) 2015 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:
- *  Benoit Maggi benoit.maggi@cea.fr - Initial API and implementation
- *
- */
-package org.eclipse.papyrus.infra.viewpoints.configuration.util;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-import org.eclipse.emf.ecore.xmi.impl.URIHandlerImpl;
-
-
-/**
- * Custom configuration resource factory to enforce the use of UUIDS
- * @author Benoit Maggi
- */
-public class ConfigurationResourceFactoryCustomImpl extends ConfigurationResourceFactoryImpl {
-	
-
-	/**
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.util.ConfigurationResourceFactoryImpl#createResource(org.eclipse.emf.common.util.URI)
-	 *
-	 * @param uri
-	 * @return
-	 */
-	@Override
-	public Resource createResource(URI uri) {
-		XMIResource result = new ConfigurationResourceCustomImpl(uri);
-		result.getDefaultSaveOptions().put(XMIResource.OPTION_URI_HANDLER, new URIHandlerImpl.PlatformSchemeAware());
-		return result;
-	}
-
-}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/.project b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/.project
deleted file mode 100755
index b1f85141a38..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/.project
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.infra.viewpoints.iso42010.edit</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>
-		<buildCommand>
-			<name>org.eclipse.oomph.version.VersionBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>check.maven.pom</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>ignore.lower.bound.dependency.ranges</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>release.path</key>
-					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.oomph.version.VersionNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100755
index 4759947300a..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-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

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/.settings/org.eclipse.pde.api.tools.prefs b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 23fb95e120f..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,98 +0,0 @@
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-API_USE_SCAN_FIELD_SEVERITY=Error
-API_USE_SCAN_METHOD_SEVERITY=Error
-API_USE_SCAN_TYPE_SEVERITY=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Warning
-ILLEGAL_IMPLEMENT=Warning
-ILLEGAL_INSTANTIATE=Warning
-ILLEGAL_OVERRIDE=Warning
-ILLEGAL_REFERENCE=Warning
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_ANNOTATION=Ignore
-INVALID_JAVADOC_TAG=Ignore
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
-LEAK_EXTEND=Warning
-LEAK_FIELD_DECL=Warning
-LEAK_IMPLEMENT=Warning
-LEAK_METHOD_PARAM=Warning
-LEAK_METHOD_RETURN_TYPE=Warning
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Warning
-automatically_removed_unused_problem_filters=Enabled
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Warning
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/META-INF/MANIFEST.MF b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/META-INF/MANIFEST.MF
deleted file mode 100755
index baae4db5955..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.papyrus.infra.viewpoints.iso42010;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport
-Export-Package: org.eclipse.papyrus.infra.viewpoints.iso42010.provider
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.infra.viewpoints.iso42010.provider.Iso42010EditPlugin$Implementation
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.iso42010.edit;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/about.html b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/about.html
deleted file mode 100755
index dd02e0be168..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>December 2, 2009</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/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/build.properties b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/build.properties
deleted file mode 100755
index 9811208ae02..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-#

-

-bin.includes = .,\

-               icons/,\

-               META-INF/,\

-               plugin.xml,\

-               plugin.properties,\

-               about.html

-jars.compile.order = .

-source.. = src/

-output.. = bin/

-src.includes = about.html

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureDescription_rationales_ArchitectureRationale.gif b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureDescription_rationales_ArchitectureRationale.gif
deleted file mode 100755
index dfe521b7dc1..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureDescription_rationales_ArchitectureRationale.gif
+++ /dev/null
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureDescription_rules_CorrespondenceRule.gif b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureDescription_rules_CorrespondenceRule.gif
deleted file mode 100755
index 6247d4144af..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureDescription_rules_CorrespondenceRule.gif
+++ /dev/null
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureDescription_stakeholders_Stakeholder.png b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureDescription_stakeholders_Stakeholder.png
deleted file mode 100755
index 4f334bdbf89..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureDescription_stakeholders_Stakeholder.png
+++ /dev/null
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureDescription_system_System.gif b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureDescription_system_System.gif
deleted file mode 100755
index d839c758a4c..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureDescription_system_System.gif
+++ /dev/null
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureDescription_viewpoints_ArchitectureViewpoint.gif b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureDescription_viewpoints_ArchitectureViewpoint.gif
deleted file mode 100755
index 048f1ac2406..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureDescription_viewpoints_ArchitectureViewpoint.gif
+++ /dev/null
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureDescription_views_ArchitectureView.gif b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureDescription_views_ArchitectureView.gif
deleted file mode 100755
index 63666342b38..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureDescription_views_ArchitectureView.gif
+++ /dev/null
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureFramework_concerns_Concern.gif b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureFramework_concerns_Concern.gif
deleted file mode 100755
index 8f218cb68af..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureFramework_concerns_Concern.gif
+++ /dev/null
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureFramework_rules_CorrespondenceRule.gif b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureFramework_rules_CorrespondenceRule.gif
deleted file mode 100755
index e2efc630b97..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureFramework_rules_CorrespondenceRule.gif
+++ /dev/null
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureFramework_stakeholders_Stakeholder.png b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureFramework_stakeholders_Stakeholder.png
deleted file mode 100755
index 4f334bdbf89..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureFramework_stakeholders_Stakeholder.png
+++ /dev/null
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureFramework_viewpoints_ArchitectureViewpoint.gif b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureFramework_viewpoints_ArchitectureViewpoint.gif
deleted file mode 100755
index 0e886ecf2b8..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureFramework_viewpoints_ArchitectureViewpoint.gif
+++ /dev/null
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureView_models_ArchitectureModel.gif b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureView_models_ArchitectureModel.gif
deleted file mode 100755
index 753b7fa3328..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureView_models_ArchitectureModel.gif
+++ /dev/null
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureViewpoint_modelKinds_ModelKind.gif b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureViewpoint_modelKinds_ModelKind.gif
deleted file mode 100755
index e9c7cf5ac0f..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/ctool16/CreateArchitectureViewpoint_modelKinds_ModelKind.gif
+++ /dev/null
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/obj16/Architecture.gif b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/obj16/Architecture.gif
deleted file mode 100755
index 739ebbfa6ac..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/obj16/Architecture.gif
+++ /dev/null
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/obj16/ArchitectureDecision.gif b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/obj16/ArchitectureDecision.gif
deleted file mode 100755
index 14af8aaee9f..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/obj16/ArchitectureDecision.gif
+++ /dev/null
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/obj16/ArchitectureModel.gif b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/obj16/ArchitectureModel.gif
deleted file mode 100755
index 10d222998af..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/obj16/ArchitectureModel.gif
+++ /dev/null
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/obj16/ArchitectureRationale.gif b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/obj16/ArchitectureRationale.gif
deleted file mode 100755
index c4a8af41844..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/obj16/ArchitectureRationale.gif
+++ /dev/null
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/obj16/ArchitectureView.gif b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/obj16/ArchitectureView.gif
deleted file mode 100755
index 904159880b3..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/obj16/ArchitectureView.gif
+++ /dev/null
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/obj16/ArchitectureViewpoint.gif b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/obj16/ArchitectureViewpoint.gif
deleted file mode 100755
index 8a5c70cbd74..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/obj16/ArchitectureViewpoint.gif
+++ /dev/null
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/obj16/Correspondence.gif b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/obj16/Correspondence.gif
deleted file mode 100755
index c4a8af41844..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/obj16/Correspondence.gif
+++ /dev/null
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/obj16/ModelKind.gif b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/obj16/ModelKind.gif
deleted file mode 100755
index 7b7c428c715..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/obj16/ModelKind.gif
+++ /dev/null
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/obj16/System.gif b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/obj16/System.gif
deleted file mode 100755
index 89ad5da38ab..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/icons/full/obj16/System.gif
+++ /dev/null
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/plugin.properties b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/plugin.properties
deleted file mode 100755
index f063e2f8fd0..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/plugin.properties
+++ /dev/null
@@ -1,95 +0,0 @@
-##########################################################################################

-# Copyright (c) 2013 CEA LIST.

-# 

-#     

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#  Laurent Wouters (CEA LIST) laurent.wouters@cea.fr - Initial API and implementation

-#

-########################################################################################

-

-pluginName = Papyrus ISO42010 Implementation - Edit

-providerName = Eclipse Modeling Project

-

-_UI_CreateChild_text = {0}

-_UI_CreateChild_text2 = {1} {0}

-_UI_CreateChild_text3 = {1}

-_UI_CreateChild_tooltip = Create New {0} Under {1} Feature

-_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.

-_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.

-

-_UI_PropertyDescriptor_description = The {0} of the {1}

-

-_UI_ADElement_type = AD Element

-_UI_ArchitectureDescription_type = Architecture Description

-_UI_Stakeholder_type = Stakeholder

-_UI_ArchitectureViewpoint_type = Architecture Viewpoint

-_UI_ModelKind_type = Model Kind

-_UI_ArchitectureModel_type = Architecture Model

-_UI_ArchitectureView_type = Architecture View

-_UI_Concern_type = Concern

-_UI_System_type = System

-_UI_Architecture_type = Architecture

-_UI_ArchitectureRationale_type = Architecture Rationale

-_UI_Correspondence_type = Correspondence

-_UI_CorrespondenceRule_type = Correspondence Rule

-_UI_ArchitectureDecision_type = Architecture Decision

-_UI_Unknown_type = Object

-

-_UI_Unknown_datatype= Value

-

-_UI_ADElement_name_feature = Name

-_UI_ADElement_affectedBy_feature = Affected By

-_UI_ArchitectureDescription_stakeholders_feature = Stakeholders

-_UI_ArchitectureDescription_concerns_feature = Concerns

-_UI_ArchitectureDescription_viewpoints_feature = Viewpoints

-_UI_ArchitectureDescription_views_feature = Views

-_UI_ArchitectureDescription_system_feature = System

-_UI_ArchitectureDescription_expresses_feature = Expresses

-_UI_ArchitectureDescription_rationales_feature = Rationales

-_UI_ArchitectureDescription_correspondences_feature = Correspondences

-_UI_ArchitectureDescription_rules_feature = Rules

-_UI_ArchitectureDescription_decisions_feature = Decisions

-_UI_Stakeholder_concerns_feature = Concerns

-_UI_Stakeholder_viewpoints_feature = Viewpoints

-_UI_Stakeholder_hasInterestIn_feature = Has Interest In

-_UI_ArchitectureViewpoint_modelKinds_feature = Model Kinds

-_UI_ArchitectureViewpoint_governs_feature = Governs

-_UI_ArchitectureViewpoint_frames_feature = Frames

-_UI_ModelKind_governs_feature = Governs

-_UI_ModelKind_viewpoint_feature = Viewpoint

-_UI_ArchitectureModel_governedBy_feature = Governed By

-_UI_ArchitectureModel_view_feature = View

-_UI_ArchitectureView_governedBy_feature = Governed By

-_UI_ArchitectureView_models_feature = Models

-_UI_ArchitectureView_addresses_feature = Addresses

-_UI_Concern_framedBy_feature = Framed By

-_UI_Concern_addressedBy_feature = Addressed By

-_UI_Concern_stakeholders_feature = Stakeholders

-_UI_Concern_raisedBy_feature = Raised By

-_UI_Concern_decisions_feature = Decisions

-_UI_System_name_feature = Name

-_UI_System_stakeholders_feature = Stakeholders

-_UI_System_exhibits_feature = Exhibits

-_UI_Architecture_exhibitedIn_feature = Exhibited In

-_UI_ArchitectureRationale_justifies_feature = Justifies

-_UI_Correspondence_governedBy_feature = Governed By

-_UI_Correspondence_relates_feature = Relates

-_UI_CorrespondenceRule_governs_feature = Governs

-_UI_ArchitectureDecision_justifiedBy_feature = Justified By

-_UI_ArchitectureDecision_dependsUpon_feature = Depends Upon

-_UI_ArchitectureDecision_dependents_feature = Dependents

-_UI_ArchitectureDecision_raises_feature = Raises

-_UI_ArchitectureDecision_pertainsTo_feature = Pertains To

-_UI_ArchitectureDecision_affects_feature = Affects

-_UI_Unknown_feature = Unspecified

-

-_UI_ArchitectureFramework_type = Architecture Framework

-_UI_ArchitectureFramework_stakeholders_feature = Stakeholders

-_UI_ArchitectureFramework_viewpoints_feature = Viewpoints

-_UI_ArchitectureFramework_rules_feature = Rules

-_UI_ArchitectureFramework_concerns_feature = Concerns

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/ArchitectureDecisionItemProvider.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/ArchitectureDecisionItemProvider.java
deleted file mode 100755
index f9d9158b7d3..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/ArchitectureDecisionItemProvider.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010.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.infra.viewpoints.iso42010.ArchitectureDecision;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision} object.

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

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

- *

- * @generated

- */

-public class ArchitectureDecisionItemProvider

-		extends ADElementItemProvider

-		implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	public ArchitectureDecisionItemProvider(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);

-

-			addJustifiedByPropertyDescriptor(object);

-			addDependsUponPropertyDescriptor(object);

-			addDependentsPropertyDescriptor(object);

-			addRaisesPropertyDescriptor(object);

-			addPertainsToPropertyDescriptor(object);

-			addAffectsPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Justified By feature.

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

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

-	 *

-	 * @generated

-	 */

-	protected void addJustifiedByPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_ArchitectureDecision_justifiedBy_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_ArchitectureDecision_justifiedBy_feature", "_UI_ArchitectureDecision_type"),

-						Iso42010Package.Literals.ARCHITECTURE_DECISION__JUSTIFIED_BY,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Depends Upon feature.

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

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

-	 *

-	 * @generated

-	 */

-	protected void addDependsUponPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_ArchitectureDecision_dependsUpon_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_ArchitectureDecision_dependsUpon_feature", "_UI_ArchitectureDecision_type"),

-						Iso42010Package.Literals.ARCHITECTURE_DECISION__DEPENDS_UPON,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	protected void addDependentsPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_ArchitectureDecision_dependents_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_ArchitectureDecision_dependents_feature", "_UI_ArchitectureDecision_type"),

-						Iso42010Package.Literals.ARCHITECTURE_DECISION__DEPENDENTS,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	protected void addRaisesPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_ArchitectureDecision_raises_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_ArchitectureDecision_raises_feature", "_UI_ArchitectureDecision_type"),

-						Iso42010Package.Literals.ARCHITECTURE_DECISION__RAISES,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Pertains To feature.

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

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

-	 *

-	 * @generated

-	 */

-	protected void addPertainsToPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_ArchitectureDecision_pertainsTo_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_ArchitectureDecision_pertainsTo_feature", "_UI_ArchitectureDecision_type"),

-						Iso42010Package.Literals.ARCHITECTURE_DECISION__PERTAINS_TO,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	protected void addAffectsPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_ArchitectureDecision_affects_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_ArchitectureDecision_affects_feature", "_UI_ArchitectureDecision_type"),

-						Iso42010Package.Literals.ARCHITECTURE_DECISION__AFFECTS,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

-	 * This returns ArchitectureDecision.gif.

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

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

-	}

-

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((ArchitectureDecision) object).getName();

-		return label == null || label.length() == 0 ?

-				getString("_UI_ArchitectureDecision_type") :

-				getString("_UI_ArchitectureDecision_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/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/ArchitectureDescriptionItemProvider.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/ArchitectureDescriptionItemProvider.java
deleted file mode 100755
index ad8c43dd616..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/ArchitectureDescriptionItemProvider.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010.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.infra.viewpoints.iso42010.ArchitectureDescription;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Factory;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription} object.

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

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

- *

- * @generated

- */

-public class ArchitectureDescriptionItemProvider

-		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 ArchitectureDescriptionItemProvider(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(Iso42010Package.Literals.ARCHITECTURE_DESCRIPTION__STAKEHOLDERS);

-			childrenFeatures.add(Iso42010Package.Literals.ARCHITECTURE_DESCRIPTION__CONCERNS);

-			childrenFeatures.add(Iso42010Package.Literals.ARCHITECTURE_DESCRIPTION__VIEWPOINTS);

-			childrenFeatures.add(Iso42010Package.Literals.ARCHITECTURE_DESCRIPTION__VIEWS);

-			childrenFeatures.add(Iso42010Package.Literals.ARCHITECTURE_DESCRIPTION__SYSTEM);

-			childrenFeatures.add(Iso42010Package.Literals.ARCHITECTURE_DESCRIPTION__EXPRESSES);

-			childrenFeatures.add(Iso42010Package.Literals.ARCHITECTURE_DESCRIPTION__RATIONALES);

-			childrenFeatures.add(Iso42010Package.Literals.ARCHITECTURE_DESCRIPTION__CORRESPONDENCES);

-			childrenFeatures.add(Iso42010Package.Literals.ARCHITECTURE_DESCRIPTION__RULES);

-			childrenFeatures.add(Iso42010Package.Literals.ARCHITECTURE_DESCRIPTION__DECISIONS);

-		}

-		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 ArchitectureDescription.gif.

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

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

-	}

-

-	/**

-	 * 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_ArchitectureDescription_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(ArchitectureDescription.class)) {

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__STAKEHOLDERS:

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__CONCERNS:

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__VIEWPOINTS:

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__VIEWS:

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__SYSTEM:

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__EXPRESSES:

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__RATIONALES:

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__CORRESPONDENCES:

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__RULES:

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__DECISIONS:

-			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

-				(Iso42010Package.Literals.ARCHITECTURE_DESCRIPTION__STAKEHOLDERS,

-						Iso42010Factory.eINSTANCE.createStakeholder()));

-

-		newChildDescriptors.add

-				(createChildParameter

-				(Iso42010Package.Literals.ARCHITECTURE_DESCRIPTION__CONCERNS,

-						Iso42010Factory.eINSTANCE.createConcern()));

-

-		newChildDescriptors.add

-				(createChildParameter

-				(Iso42010Package.Literals.ARCHITECTURE_DESCRIPTION__VIEWPOINTS,

-						Iso42010Factory.eINSTANCE.createArchitectureViewpoint()));

-

-		newChildDescriptors.add

-				(createChildParameter

-				(Iso42010Package.Literals.ARCHITECTURE_DESCRIPTION__VIEWS,

-						Iso42010Factory.eINSTANCE.createArchitectureView()));

-

-		newChildDescriptors.add

-				(createChildParameter

-				(Iso42010Package.Literals.ARCHITECTURE_DESCRIPTION__SYSTEM,

-						Iso42010Factory.eINSTANCE.createSystem()));

-

-		newChildDescriptors.add

-				(createChildParameter

-				(Iso42010Package.Literals.ARCHITECTURE_DESCRIPTION__EXPRESSES,

-						Iso42010Factory.eINSTANCE.createArchitecture()));

-

-		newChildDescriptors.add

-				(createChildParameter

-				(Iso42010Package.Literals.ARCHITECTURE_DESCRIPTION__RATIONALES,

-						Iso42010Factory.eINSTANCE.createArchitectureRationale()));

-

-		newChildDescriptors.add

-				(createChildParameter

-				(Iso42010Package.Literals.ARCHITECTURE_DESCRIPTION__CORRESPONDENCES,

-						Iso42010Factory.eINSTANCE.createCorrespondence()));

-

-		newChildDescriptors.add

-				(createChildParameter

-				(Iso42010Package.Literals.ARCHITECTURE_DESCRIPTION__RULES,

-						Iso42010Factory.eINSTANCE.createCorrespondenceRule()));

-

-		newChildDescriptors.add

-				(createChildParameter

-				(Iso42010Package.Literals.ARCHITECTURE_DESCRIPTION__DECISIONS,

-						Iso42010Factory.eINSTANCE.createArchitectureDecision()));

-	}

-

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return Iso42010EditPlugin.INSTANCE;

-	}

-

-}

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/ArchitectureViewItemProvider.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/ArchitectureViewItemProvider.java
deleted file mode 100755
index 547919de405..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/ArchitectureViewItemProvider.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010.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.ViewerNotification;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureView;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Factory;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureView} object.

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

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

- *

- * @generated

- */

-public class ArchitectureViewItemProvider

-		extends ADElementItemProvider

-		implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	public ArchitectureViewItemProvider(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);

-

-			addGovernedByPropertyDescriptor(object);

-			addAddressesPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Governed By feature.

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

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

-	 *

-	 * @generated

-	 */

-	protected void addGovernedByPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_ArchitectureView_governedBy_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_ArchitectureView_governedBy_feature", "_UI_ArchitectureView_type"),

-						Iso42010Package.Literals.ARCHITECTURE_VIEW__GOVERNED_BY,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	protected void addAddressesPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_ArchitectureView_addresses_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_ArchitectureView_addresses_feature", "_UI_ArchitectureView_type"),

-						Iso42010Package.Literals.ARCHITECTURE_VIEW__ADDRESSES,

-						true,

-						false,

-						true,

-						null,

-						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(Iso42010Package.Literals.ARCHITECTURE_VIEW__MODELS);

-		}

-		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 ArchitectureView.gif.

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

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

-	}

-

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((ArchitectureView) object).getName();

-		return label == null || label.length() == 0 ?

-				getString("_UI_ArchitectureView_type") :

-				getString("_UI_ArchitectureView_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(ArchitectureView.class)) {

-		case Iso42010Package.ARCHITECTURE_VIEW__MODELS:

-			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

-				(Iso42010Package.Literals.ARCHITECTURE_VIEW__MODELS,

-						Iso42010Factory.eINSTANCE.createArchitectureModel()));

-	}

-

-}

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/ArchitectureViewpointItemProvider.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/ArchitectureViewpointItemProvider.java
deleted file mode 100755
index c8581560f7b..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/ArchitectureViewpointItemProvider.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010.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.ViewerNotification;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Factory;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint} object.

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

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

- *

- * @generated

- */

-public class ArchitectureViewpointItemProvider

-		extends ADElementItemProvider

-		implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	public ArchitectureViewpointItemProvider(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);

-

-			addGovernsPropertyDescriptor(object);

-			addFramesPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	protected void addGovernsPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_ArchitectureViewpoint_governs_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_ArchitectureViewpoint_governs_feature", "_UI_ArchitectureViewpoint_type"),

-						Iso42010Package.Literals.ARCHITECTURE_VIEWPOINT__GOVERNS,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	protected void addFramesPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_ArchitectureViewpoint_frames_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_ArchitectureViewpoint_frames_feature", "_UI_ArchitectureViewpoint_type"),

-						Iso42010Package.Literals.ARCHITECTURE_VIEWPOINT__FRAMES,

-						true,

-						false,

-						true,

-						null,

-						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(Iso42010Package.Literals.ARCHITECTURE_VIEWPOINT__MODEL_KINDS);

-		}

-		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 ArchitectureViewpoint.gif.

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

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

-	}

-

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((ArchitectureViewpoint) object).getName();

-		return label == null || label.length() == 0 ?

-				getString("_UI_ArchitectureViewpoint_type") :

-				getString("_UI_ArchitectureViewpoint_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(ArchitectureViewpoint.class)) {

-		case Iso42010Package.ARCHITECTURE_VIEWPOINT__MODEL_KINDS:

-			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

-				(Iso42010Package.Literals.ARCHITECTURE_VIEWPOINT__MODEL_KINDS,

-						Iso42010Factory.eINSTANCE.createModelKind()));

-	}

-

-}

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/ConcernItemProvider.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/ConcernItemProvider.java
deleted file mode 100755
index 7ca2094b0b1..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/ConcernItemProvider.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010.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.infra.viewpoints.iso42010.Concern;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.viewpoints.iso42010.Concern} object.

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

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

- *

- * @generated

- */

-public class ConcernItemProvider

-		extends ADElementItemProvider

-		implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	public ConcernItemProvider(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);

-

-			addFramedByPropertyDescriptor(object);

-			addAddressedByPropertyDescriptor(object);

-			addStakeholdersPropertyDescriptor(object);

-			addRaisedByPropertyDescriptor(object);

-			addDecisionsPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Framed By feature.

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

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

-	 *

-	 * @generated

-	 */

-	protected void addFramedByPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_Concern_framedBy_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_Concern_framedBy_feature", "_UI_Concern_type"),

-						Iso42010Package.Literals.CONCERN__FRAMED_BY,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Addressed By feature.

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

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

-	 *

-	 * @generated

-	 */

-	protected void addAddressedByPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_Concern_addressedBy_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_Concern_addressedBy_feature", "_UI_Concern_type"),

-						Iso42010Package.Literals.CONCERN__ADDRESSED_BY,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	protected void addStakeholdersPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_Concern_stakeholders_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_Concern_stakeholders_feature", "_UI_Concern_type"),

-						Iso42010Package.Literals.CONCERN__STAKEHOLDERS,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Raised By feature.

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

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

-	 *

-	 * @generated

-	 */

-	protected void addRaisedByPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_Concern_raisedBy_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_Concern_raisedBy_feature", "_UI_Concern_type"),

-						Iso42010Package.Literals.CONCERN__RAISED_BY,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	protected void addDecisionsPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_Concern_decisions_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_Concern_decisions_feature", "_UI_Concern_type"),

-						Iso42010Package.Literals.CONCERN__DECISIONS,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

-	 * This returns Concern.gif.

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

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

-	}

-

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((Concern) object).getName();

-		return label == null || label.length() == 0 ?

-				getString("_UI_Concern_type") :

-				getString("_UI_Concern_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/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/CorrespondenceItemProvider.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/CorrespondenceItemProvider.java
deleted file mode 100755
index 60a8a90d57e..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/CorrespondenceItemProvider.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010.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.ItemProviderAdapter;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.viewpoints.iso42010.Correspondence} object.

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

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

- *

- * @generated

- */

-public class CorrespondenceItemProvider

-		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 CorrespondenceItemProvider(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);

-

-			addGovernedByPropertyDescriptor(object);

-			addRelatesPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Governed By feature.

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

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

-	 *

-	 * @generated

-	 */

-	protected void addGovernedByPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_Correspondence_governedBy_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_Correspondence_governedBy_feature", "_UI_Correspondence_type"),

-						Iso42010Package.Literals.CORRESPONDENCE__GOVERNED_BY,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	protected void addRelatesPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_Correspondence_relates_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_Correspondence_relates_feature", "_UI_Correspondence_type"),

-						Iso42010Package.Literals.CORRESPONDENCE__RELATES,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

-	 * This returns Correspondence.gif.

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

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

-	}

-

-	/**

-	 * 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_Correspondence_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);

-	}

-

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return Iso42010EditPlugin.INSTANCE;

-	}

-

-}

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/StakeholderItemProvider.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/StakeholderItemProvider.java
deleted file mode 100755
index f95dd1dd940..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/StakeholderItemProvider.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010.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.infra.viewpoints.iso42010.Iso42010Package;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder} object.

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

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

- *

- * @generated

- */

-public class StakeholderItemProvider

-		extends ADElementItemProvider

-		implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	public StakeholderItemProvider(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);

-

-			addConcernsPropertyDescriptor(object);

-			addViewpointsPropertyDescriptor(object);

-			addHasInterestInPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	protected void addConcernsPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_Stakeholder_concerns_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_Stakeholder_concerns_feature", "_UI_Stakeholder_type"),

-						Iso42010Package.Literals.STAKEHOLDER__CONCERNS,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	protected void addViewpointsPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_Stakeholder_viewpoints_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_Stakeholder_viewpoints_feature", "_UI_Stakeholder_type"),

-						Iso42010Package.Literals.STAKEHOLDER__VIEWPOINTS,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Has Interest In feature.

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

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

-	 *

-	 * @generated

-	 */

-	protected void addHasInterestInPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_Stakeholder_hasInterestIn_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_Stakeholder_hasInterestIn_feature", "_UI_Stakeholder_type"),

-						Iso42010Package.Literals.STAKEHOLDER__HAS_INTEREST_IN,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

-	 * This returns Stakeholder.gif.

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

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

-	}

-

-	/**

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

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

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

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((Stakeholder) object).getName();

-		return label == null || label.length() == 0 ? getString("_UI_Stakeholder_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/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/SystemItemProvider.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/SystemItemProvider.java
deleted file mode 100755
index f7acbd0929a..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/src/org/eclipse/papyrus/infra/viewpoints/iso42010/provider/SystemItemProvider.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010.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.infra.viewpoints.iso42010.Iso42010Package;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.viewpoints.iso42010.System} object.

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

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

- *

- * @generated

- */

-public class SystemItemProvider

-		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 SystemItemProvider(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);

-			addStakeholdersPropertyDescriptor(object);

-			addExhibitsPropertyDescriptor(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_System_name_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_System_name_feature", "_UI_System_type"),

-						Iso42010Package.Literals.SYSTEM__NAME,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

-	}

-

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	protected void addStakeholdersPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_System_stakeholders_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_System_stakeholders_feature", "_UI_System_type"),

-						Iso42010Package.Literals.SYSTEM__STAKEHOLDERS,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	protected void addExhibitsPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_System_exhibits_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_System_exhibits_feature", "_UI_System_type"),

-						Iso42010Package.Literals.SYSTEM__EXHIBITS,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

-	 * This returns System.gif.

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

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

-	}

-

-	/**

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

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

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

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((org.eclipse.papyrus.infra.viewpoints.iso42010.System) object).getName();

-		return label == null || label.length() == 0 ?

-				getString("_UI_System_type") :

-				getString("_UI_System_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(org.eclipse.papyrus.infra.viewpoints.iso42010.System.class)) {

-		case Iso42010Package.SYSTEM__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 Iso42010EditPlugin.INSTANCE;

-	}

-

-}

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/.project b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/.project
deleted file mode 100755
index 7e14fe618dd..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/.project
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.infra.viewpoints.iso42010</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>
-		<buildCommand>
-			<name>org.eclipse.oomph.version.VersionBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>check.maven.pom</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>ignore.lower.bound.dependency.ranges</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>release.path</key>
-					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.oomph.version.VersionNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100755
index 4759947300a..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-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

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/.settings/org.eclipse.pde.api.tools.prefs b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 23fb95e120f..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,98 +0,0 @@
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-API_USE_SCAN_FIELD_SEVERITY=Error
-API_USE_SCAN_METHOD_SEVERITY=Error
-API_USE_SCAN_TYPE_SEVERITY=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Warning
-ILLEGAL_IMPLEMENT=Warning
-ILLEGAL_INSTANTIATE=Warning
-ILLEGAL_OVERRIDE=Warning
-ILLEGAL_REFERENCE=Warning
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_ANNOTATION=Ignore
-INVALID_JAVADOC_TAG=Ignore
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
-LEAK_EXTEND=Warning
-LEAK_FIELD_DECL=Warning
-LEAK_IMPLEMENT=Warning
-LEAK_METHOD_PARAM=Warning
-LEAK_METHOD_RETURN_TYPE=Warning
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Warning
-automatically_removed_unused_problem_filters=Enabled
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Warning
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/META-INF/MANIFEST.MF b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/META-INF/MANIFEST.MF
deleted file mode 100755
index 2abe9df59ea..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.viewpoints.iso42010,
- org.eclipse.papyrus.infra.viewpoints.iso42010.impl,
- org.eclipse.papyrus.infra.viewpoints.iso42010.util
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.infra.viewpoints.iso42010.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.iso42010;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/about.html b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/about.html
deleted file mode 100755
index dd02e0be168..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>December 2, 2009</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/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/build.properties b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/build.properties
deleted file mode 100755
index 262cbe39d10..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-#

-

-bin.includes = .,\

-               model/,\

-               META-INF/,\

-               plugin.xml,\

-               plugin.properties,\

-               about.html

-jars.compile.order = .

-source.. = src/

-output.. = bin/

-src.includes = about.html

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/model/iso42010.ecore b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/model/iso42010.ecore
deleted file mode 100755
index 81576cdd927..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/model/iso42010.ecore
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="iso42010" nsURI="http://www.eclipse.org/papyrus/infra/viewpoints/iso42010"

-    nsPrefix="iso42010">

-  <eClassifiers xsi:type="ecore:EClass" name="ADElement" abstract="true">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="affectedBy" upperBound="-1"

-        eType="#//ArchitectureDecision" eOpposite="#//ArchitectureDecision/affects"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ArchitectureDescription">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="stakeholders" lowerBound="1"

-        upperBound="-1" eType="#//Stakeholder" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="concerns" lowerBound="1"

-        upperBound="-1" eType="#//Concern" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="viewpoints" lowerBound="1"

-        upperBound="-1" eType="#//ArchitectureViewpoint" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="views" lowerBound="1" upperBound="-1"

-        eType="#//ArchitectureView" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="system" lowerBound="1"

-        eType="#//System" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="expresses" lowerBound="1"

-        eType="#//Architecture" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="rationales" lowerBound="1"

-        upperBound="-1" eType="#//ArchitectureRationale" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="correspondences" upperBound="-1"

-        eType="#//Correspondence" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="rules" upperBound="-1"

-        eType="#//CorrespondenceRule" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="decisions" upperBound="-1"

-        eType="#//ArchitectureDecision" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Stakeholder" eSuperTypes="#//ADElement">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="concerns" lowerBound="1"

-        upperBound="-1" eType="#//Concern" eOpposite="#//Concern/stakeholders"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="viewpoints" lowerBound="1"

-        upperBound="-1" eType="#//ArchitectureViewpoint"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="hasInterestIn" lowerBound="1"

-        eType="#//System" eOpposite="#//System/stakeholders"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ArchitectureViewpoint" eSuperTypes="#//ADElement">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="modelKinds" lowerBound="1"

-        upperBound="-1" eType="#//ModelKind" containment="true" eOpposite="#//ModelKind/viewpoint"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="governs" lowerBound="1"

-        eType="#//ArchitectureView" eOpposite="#//ArchitectureView/governedBy"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="frames" lowerBound="1"

-        upperBound="-1" eType="#//Concern" eOpposite="#//Concern/framedBy"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ModelKind" eSuperTypes="#//ADElement">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="governs" lowerBound="1"

-        upperBound="-1" eType="#//ArchitectureModel" eOpposite="#//ArchitectureModel/governedBy"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="viewpoint" lowerBound="1"

-        eType="#//ArchitectureViewpoint" eOpposite="#//ArchitectureViewpoint/modelKinds"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ArchitectureModel" eSuperTypes="#//ADElement">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="governedBy" lowerBound="1"

-        eType="#//ModelKind" eOpposite="#//ModelKind/governs"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="view" lowerBound="1" eType="#//ArchitectureView"

-        eOpposite="#//ArchitectureView/models"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ArchitectureView" eSuperTypes="#//ADElement">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="governedBy" lowerBound="1"

-        eType="#//ArchitectureViewpoint" eOpposite="#//ArchitectureViewpoint/governs"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="models" lowerBound="1"

-        upperBound="-1" eType="#//ArchitectureModel" containment="true" eOpposite="#//ArchitectureModel/view"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="addresses" lowerBound="1"

-        upperBound="-1" eType="#//Concern" eOpposite="#//Concern/addressedBy"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Concern" eSuperTypes="#//ADElement">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="framedBy" lowerBound="1"

-        upperBound="-1" eType="#//ArchitectureViewpoint" eOpposite="#//ArchitectureViewpoint/frames"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="addressedBy" lowerBound="1"

-        upperBound="-1" eType="#//ArchitectureView" eOpposite="#//ArchitectureView/addresses"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="stakeholders" lowerBound="1"

-        upperBound="-1" eType="#//Stakeholder" eOpposite="#//Stakeholder/concerns"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="raisedBy" upperBound="-1"

-        eType="#//ArchitectureDecision" eOpposite="#//ArchitectureDecision/raises"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="decisions" upperBound="-1"

-        eType="#//ArchitectureDecision" eOpposite="#//ArchitectureDecision/pertainsTo"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="System">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="stakeholders" lowerBound="1"

-        upperBound="-1" eType="#//Stakeholder" eOpposite="#//Stakeholder/hasInterestIn"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="exhibits" lowerBound="1"

-        eType="#//Architecture" eOpposite="#//Architecture/exhibitedIn"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Architecture">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="exhibitedIn" lowerBound="1"

-        eType="#//System" eOpposite="#//System/exhibits"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ArchitectureRationale" eSuperTypes="#//ADElement">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="justifies" lowerBound="1"

-        upperBound="-1" eType="#//ArchitectureDecision" eOpposite="#//ArchitectureDecision/justifiedBy"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Correspondence">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="governedBy" upperBound="-1"

-        eType="#//CorrespondenceRule" eOpposite="#//CorrespondenceRule/governs"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="relates" lowerBound="2"

-        upperBound="-1" eType="#//ADElement"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="CorrespondenceRule">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="governs" lowerBound="1"

-        upperBound="-1" eType="#//Correspondence" eOpposite="#//Correspondence/governedBy"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ArchitectureDecision" eSuperTypes="#//ADElement">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="justifiedBy" upperBound="-1"

-        eType="#//ArchitectureRationale" eOpposite="#//ArchitectureRationale/justifies"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="dependsUpon" upperBound="-1"

-        eType="#//ArchitectureDecision" eOpposite="#//ArchitectureDecision/dependents"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="dependents" upperBound="-1"

-        eType="#//ArchitectureDecision" eOpposite="#//ArchitectureDecision/dependsUpon"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="raises" upperBound="-1"

-        eType="#//Concern" eOpposite="#//Concern/raisedBy"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="pertainsTo" lowerBound="1"

-        upperBound="-1" eType="#//Concern" eOpposite="#//Concern/decisions"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="affects" lowerBound="1"

-        upperBound="-1" eType="#//ADElement" eOpposite="#//ADElement/affectedBy"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ArchitectureFramework">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="stakeholders" lowerBound="1"

-        upperBound="-1" eType="#//Stakeholder" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="viewpoints" lowerBound="1"

-        upperBound="-1" eType="#//ArchitectureViewpoint" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="rules" upperBound="-1"

-        eType="#//CorrespondenceRule" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="concerns" lowerBound="1"

-        upperBound="-1" eType="#//Concern" containment="true"/>

-  </eClassifiers>

-</ecore:EPackage>

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/model/iso42010.genmodel b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/model/iso42010.genmodel
deleted file mode 100755
index e64c5473b37..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/model/iso42010.genmodel
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2013 CEA LIST.&#xD;&#xA;&#xD;&#xA; All rights reserved. This program and the accompanying materials&#xD;&#xA; are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA; which accompanies this distribution, and is available at&#xD;&#xA; http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA; &#xD;&#xA; Contributors:&#xD;&#xA; Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation&#xD;&#xA; &#xD;&#xA;"

-    modelDirectory="/org.eclipse.papyrus.infra.viewpoints.iso42010/src"

-    modelPluginID="org.eclipse.papyrus.infra.viewpoints.iso42010" modelName="Iso42010"

-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" importerID="org.eclipse.emf.importer.ecore"

-    complianceLevel="6.0" copyrightFields="false" operationReflection="true" importOrganizing="true">

-  <foreignModel>iso42010.ecore</foreignModel>

-  <genPackages prefix="Iso42010" basePackage="org.eclipse.papyrus.infra.viewpoints"

-      disposableProviderFactory="true" ecorePackage="iso42010.ecore#/">

-    <genClasses image="false" ecoreClass="iso42010.ecore#//ADElement">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute iso42010.ecore#//ADElement/name"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference iso42010.ecore#//ADElement/affectedBy"/>

-    </genClasses>

-    <genClasses ecoreClass="iso42010.ecore#//ArchitectureDescription">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference iso42010.ecore#//ArchitectureDescription/stakeholders"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference iso42010.ecore#//ArchitectureDescription/concerns"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference iso42010.ecore#//ArchitectureDescription/viewpoints"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference iso42010.ecore#//ArchitectureDescription/views"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference iso42010.ecore#//ArchitectureDescription/system"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference iso42010.ecore#//ArchitectureDescription/expresses"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference iso42010.ecore#//ArchitectureDescription/rationales"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference iso42010.ecore#//ArchitectureDescription/correspondences"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference iso42010.ecore#//ArchitectureDescription/rules"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference iso42010.ecore#//ArchitectureDescription/decisions"/>

-    </genClasses>

-    <genClasses ecoreClass="iso42010.ecore#//Stakeholder">

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference iso42010.ecore#//Stakeholder/concerns"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference iso42010.ecore#//Stakeholder/viewpoints"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference iso42010.ecore#//Stakeholder/hasInterestIn"/>

-    </genClasses>

-    <genClasses ecoreClass="iso42010.ecore#//ArchitectureViewpoint">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference iso42010.ecore#//ArchitectureViewpoint/modelKinds"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference iso42010.ecore#//ArchitectureViewpoint/governs"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference iso42010.ecore#//ArchitectureViewpoint/frames"/>

-    </genClasses>

-    <genClasses ecoreClass="iso42010.ecore#//ModelKind">

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference iso42010.ecore#//ModelKind/governs"/>

-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference iso42010.ecore#//ModelKind/viewpoint"/>

-    </genClasses>

-    <genClasses ecoreClass="iso42010.ecore#//ArchitectureModel">

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference iso42010.ecore#//ArchitectureModel/governedBy"/>

-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference iso42010.ecore#//ArchitectureModel/view"/>

-    </genClasses>

-    <genClasses ecoreClass="iso42010.ecore#//ArchitectureView">

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference iso42010.ecore#//ArchitectureView/governedBy"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference iso42010.ecore#//ArchitectureView/models"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference iso42010.ecore#//ArchitectureView/addresses"/>

-    </genClasses>

-    <genClasses ecoreClass="iso42010.ecore#//Concern">

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference iso42010.ecore#//Concern/framedBy"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference iso42010.ecore#//Concern/addressedBy"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference iso42010.ecore#//Concern/stakeholders"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference iso42010.ecore#//Concern/raisedBy"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference iso42010.ecore#//Concern/decisions"/>

-    </genClasses>

-    <genClasses ecoreClass="iso42010.ecore#//System">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute iso42010.ecore#//System/name"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference iso42010.ecore#//System/stakeholders"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference iso42010.ecore#//System/exhibits"/>

-    </genClasses>

-    <genClasses ecoreClass="iso42010.ecore#//Architecture">

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference iso42010.ecore#//Architecture/exhibitedIn"/>

-    </genClasses>

-    <genClasses ecoreClass="iso42010.ecore#//ArchitectureRationale">

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference iso42010.ecore#//ArchitectureRationale/justifies"/>

-    </genClasses>

-    <genClasses ecoreClass="iso42010.ecore#//Correspondence">

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference iso42010.ecore#//Correspondence/governedBy"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference iso42010.ecore#//Correspondence/relates"/>

-    </genClasses>

-    <genClasses ecoreClass="iso42010.ecore#//CorrespondenceRule">

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference iso42010.ecore#//CorrespondenceRule/governs"/>

-    </genClasses>

-    <genClasses ecoreClass="iso42010.ecore#//ArchitectureDecision">

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference iso42010.ecore#//ArchitectureDecision/justifiedBy"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference iso42010.ecore#//ArchitectureDecision/dependsUpon"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference iso42010.ecore#//ArchitectureDecision/dependents"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference iso42010.ecore#//ArchitectureDecision/raises"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference iso42010.ecore#//ArchitectureDecision/pertainsTo"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference iso42010.ecore#//ArchitectureDecision/affects"/>

-    </genClasses>

-  </genPackages>

-</genmodel:GenModel>

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/plugin.properties b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/plugin.properties
deleted file mode 100755
index de42da5cea6..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-##########################################################################################

-# Copyright (c) 2013 CEA LIST.

-# 

-#     

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#  Laurent Wouters (CEA LIST) laurent.wouters@cea.fr - Initial API and implementation

-#

-########################################################################################

-

-pluginName = Papyrus ISO42010 Implementation

-providerName = Eclipse Modeling Project

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/plugin.xml b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/plugin.xml
deleted file mode 100755
index 0146b430bc6..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/plugin.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-

-<!--

--->

-

-<plugin>

-

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated iso42010 -->

-      <package

-            uri="http://www.eclipse.org/papyrus/infra/viewpoints/iso42010"

-            class="org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package"

-            genModel="model/iso42010.genmodel"/>

-   </extension>

-

-</plugin>

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/ADElement.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/ADElement.java
deleted file mode 100755
index ee2006d15b0..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/ADElement.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010;

-

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

-import org.eclipse.emf.ecore.EObject;

-

-/**

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

- * A representation of the model object '<em><b>AD Element</b></em>'.

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

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ADElement#getName <em>Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ADElement#getAffectedBy <em>Affected By</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getADElement()

- * @model abstract="true"

- * @generated

- */

-public interface ADElement 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.infra.viewpoints.iso42010.Iso42010Package#getADElement_Name()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ADElement#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);

-

-	/**

-	 * Returns the value of the '<em><b>Affected By</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision}.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision#getAffects <em>Affects</em>}'.

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

-	 * <p>

-	 * If the meaning of the '<em>Affected By</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>Affected By</em>' reference list.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getADElement_AffectedBy()

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision#getAffects

-	 * @model opposite="affects"

-	 * @generated

-	 */

-	EList<ArchitectureDecision> getAffectedBy();

-

-} // ADElement

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/Activator.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/Activator.java
deleted file mode 100755
index bc42f76bba7..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/Activator.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.viewpoints.iso42010;

-

-import org.osgi.framework.BundleActivator;

-import org.osgi.framework.BundleContext;

-

-public class Activator implements BundleActivator {

-

-	private static BundleContext context;

-

-	static BundleContext getContext() {

-		return context;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)

-	 */

-	public void start(BundleContext bundleContext) throws Exception {

-		Activator.context = bundleContext;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)

-	 */

-	public void stop(BundleContext bundleContext) throws Exception {

-		Activator.context = null;

-	}

-

-}

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/Architecture.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/Architecture.java
deleted file mode 100755
index 1cbfe9bdd55..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/Architecture.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

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

- * A representation of the model object '<em><b>Architecture</b></em>'.

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

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Architecture#getExhibitedIn <em>Exhibited In</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitecture()

- * @model

- * @generated

- */

-public interface Architecture extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Exhibited In</b></em>' reference.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.System#getExhibits <em>Exhibits</em>}'.

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

-	 * <p>

-	 * If the meaning of the '<em>Exhibited In</em>' reference isn't clear, there really should be more of a description here...

-	 * </p>

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

-	 *

-	 * @return the value of the '<em>Exhibited In</em>' reference.

-	 * @see #setExhibitedIn(org.eclipse.papyrus.infra.viewpoints.iso42010.System)

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitecture_ExhibitedIn()

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.System#getExhibits

-	 * @model opposite="exhibits" required="true"

-	 * @generated

-	 */

-	org.eclipse.papyrus.infra.viewpoints.iso42010.System getExhibitedIn();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Architecture#getExhibitedIn <em>Exhibited In</em>}' reference.

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

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

-	 *

-	 * @param value

-	 *            the new value of the '<em>Exhibited In</em>' reference.

-	 * @see #getExhibitedIn()

-	 * @generated

-	 */

-	void setExhibitedIn(org.eclipse.papyrus.infra.viewpoints.iso42010.System value);

-

-} // Architecture

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/ArchitectureDecision.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/ArchitectureDecision.java
deleted file mode 100755
index 3443ab62bfb..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/ArchitectureDecision.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010;

-

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

-

-/**

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

- * A representation of the model object '<em><b>Architecture Decision</b></em>'.

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

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision#getJustifiedBy <em>Justified By</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision#getDependsUpon <em>Depends Upon</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision#getDependents <em>Dependents</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision#getRaises <em>Raises</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision#getPertainsTo <em>Pertains To</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision#getAffects <em>Affects</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitectureDecision()

- * @model

- * @generated

- */

-public interface ArchitectureDecision extends ADElement {

-	/**

-	 * Returns the value of the '<em><b>Justified By</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureRationale}.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureRationale#getJustifies <em>Justifies</em>}'.

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

-	 * <p>

-	 * If the meaning of the '<em>Justified By</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>Justified By</em>' reference list.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitectureDecision_JustifiedBy()

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureRationale#getJustifies

-	 * @model opposite="justifies"

-	 * @generated

-	 */

-	EList<ArchitectureRationale> getJustifiedBy();

-

-	/**

-	 * Returns the value of the '<em><b>Depends Upon</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision}.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision#getDependents <em>Dependents</em>}'.

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

-	 * <p>

-	 * If the meaning of the '<em>Depends Upon</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>Depends Upon</em>' reference list.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitectureDecision_DependsUpon()

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision#getDependents

-	 * @model opposite="dependents"

-	 * @generated

-	 */

-	EList<ArchitectureDecision> getDependsUpon();

-

-	/**

-	 * Returns the value of the '<em><b>Dependents</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision}.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision#getDependsUpon <em>Depends Upon</em>}'.

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

-	 * <p>

-	 * If the meaning of the '<em>Dependents</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>Dependents</em>' reference list.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitectureDecision_Dependents()

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision#getDependsUpon

-	 * @model opposite="dependsUpon"

-	 * @generated

-	 */

-	EList<ArchitectureDecision> getDependents();

-

-	/**

-	 * Returns the value of the '<em><b>Raises</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.iso42010.Concern}.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Concern#getRaisedBy <em>Raised By</em>}'.

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

-	 * <p>

-	 * If the meaning of the '<em>Raises</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>Raises</em>' reference list.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitectureDecision_Raises()

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Concern#getRaisedBy

-	 * @model opposite="raisedBy"

-	 * @generated

-	 */

-	EList<Concern> getRaises();

-

-	/**

-	 * Returns the value of the '<em><b>Pertains To</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.iso42010.Concern}.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Concern#getDecisions <em>Decisions</em>}'.

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

-	 * <p>

-	 * If the meaning of the '<em>Pertains To</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>Pertains To</em>' reference list.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitectureDecision_PertainsTo()

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Concern#getDecisions

-	 * @model opposite="decisions" required="true"

-	 * @generated

-	 */

-	EList<Concern> getPertainsTo();

-

-	/**

-	 * Returns the value of the '<em><b>Affects</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ADElement}.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ADElement#getAffectedBy <em>Affected By</em>}'.

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

-	 * <p>

-	 * If the meaning of the '<em>Affects</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>Affects</em>' reference list.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitectureDecision_Affects()

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ADElement#getAffectedBy

-	 * @model opposite="affectedBy" required="true"

-	 * @generated

-	 */

-	EList<ADElement> getAffects();

-

-} // ArchitectureDecision

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/ArchitectureDescription.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/ArchitectureDescription.java
deleted file mode 100755
index 1c121d1c5c4..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/ArchitectureDescription.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010;

-

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

-import org.eclipse.emf.ecore.EObject;

-

-/**

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

- * A representation of the model object '<em><b>Architecture Description</b></em>'.

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

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription#getStakeholders <em>Stakeholders</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription#getConcerns <em>Concerns</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription#getViewpoints <em>Viewpoints</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription#getViews <em>Views</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription#getSystem <em>System</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription#getExpresses <em>Expresses</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription#getRationales <em>Rationales</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription#getCorrespondences <em>Correspondences</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription#getRules <em>Rules</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription#getDecisions <em>Decisions</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitectureDescription()

- * @model

- * @generated

- */

-public interface ArchitectureDescription extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Stakeholders</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder}.

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

-	 * <p>

-	 * If the meaning of the '<em>Stakeholders</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>Stakeholders</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitectureDescription_Stakeholders()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	EList<Stakeholder> getStakeholders();

-

-	/**

-	 * Returns the value of the '<em><b>Concerns</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.iso42010.Concern}.

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

-	 * <p>

-	 * If the meaning of the '<em>Concerns</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>Concerns</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitectureDescription_Concerns()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	EList<Concern> getConcerns();

-

-	/**

-	 * Returns the value of the '<em><b>Viewpoints</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint}.

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

-	 * <p>

-	 * If the meaning of the '<em>Viewpoints</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>Viewpoints</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitectureDescription_Viewpoints()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	EList<ArchitectureViewpoint> getViewpoints();

-

-	/**

-	 * Returns the value of the '<em><b>Views</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureView}.

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

-	 * <p>

-	 * If the meaning of the '<em>Views</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>Views</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitectureDescription_Views()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	EList<ArchitectureView> getViews();

-

-	/**

-	 * Returns the value of the '<em><b>System</b></em>' containment reference.

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

-	 * <p>

-	 * If the meaning of the '<em>System</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>System</em>' containment reference.

-	 * @see #setSystem(org.eclipse.papyrus.infra.viewpoints.iso42010.System)

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitectureDescription_System()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	org.eclipse.papyrus.infra.viewpoints.iso42010.System getSystem();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription#getSystem <em>System</em>}' containment reference.

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

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

-	 *

-	 * @param value

-	 *            the new value of the '<em>System</em>' containment reference.

-	 * @see #getSystem()

-	 * @generated

-	 */

-	void setSystem(org.eclipse.papyrus.infra.viewpoints.iso42010.System value);

-

-	/**

-	 * Returns the value of the '<em><b>Expresses</b></em>' containment reference.

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

-	 * <p>

-	 * If the meaning of the '<em>Expresses</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>Expresses</em>' containment reference.

-	 * @see #setExpresses(Architecture)

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitectureDescription_Expresses()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	Architecture getExpresses();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription#getExpresses <em>Expresses</em>}' containment reference.

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

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

-	 *

-	 * @param value

-	 *            the new value of the '<em>Expresses</em>' containment reference.

-	 * @see #getExpresses()

-	 * @generated

-	 */

-	void setExpresses(Architecture value);

-

-	/**

-	 * Returns the value of the '<em><b>Rationales</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureRationale}.

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

-	 * <p>

-	 * If the meaning of the '<em>Rationales</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>Rationales</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitectureDescription_Rationales()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	EList<ArchitectureRationale> getRationales();

-

-	/**

-	 * Returns the value of the '<em><b>Correspondences</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.iso42010.Correspondence}.

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

-	 * <p>

-	 * If the meaning of the '<em>Correspondences</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>Correspondences</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitectureDescription_Correspondences()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<Correspondence> getCorrespondences();

-

-	/**

-	 * Returns the value of the '<em><b>Rules</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.iso42010.CorrespondenceRule}.

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

-	 * <p>

-	 * If the meaning of the '<em>Rules</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>Rules</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitectureDescription_Rules()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<CorrespondenceRule> getRules();

-

-	/**

-	 * Returns the value of the '<em><b>Decisions</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision}.

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

-	 * <p>

-	 * If the meaning of the '<em>Decisions</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>Decisions</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitectureDescription_Decisions()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<ArchitectureDecision> getDecisions();

-

-} // ArchitectureDescription

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/ArchitectureFramework.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/ArchitectureFramework.java
deleted file mode 100755
index f41d1f965a1..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/ArchitectureFramework.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010;

-

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

-import org.eclipse.emf.ecore.EObject;

-

-/**

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

- * A representation of the model object '<em><b>Architecture Framework</b></em>'.

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

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureFramework#getStakeholders <em>Stakeholders</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureFramework#getViewpoints <em>Viewpoints</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureFramework#getRules <em>Rules</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureFramework#getConcerns <em>Concerns</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitectureFramework()

- * @model

- * @generated

- */

-public interface ArchitectureFramework extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Stakeholders</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder}.

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

-	 * <p>

-	 * If the meaning of the '<em>Stakeholders</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>Stakeholders</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitectureFramework_Stakeholders()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	EList<Stakeholder> getStakeholders();

-

-	/**

-	 * Returns the value of the '<em><b>Viewpoints</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint}.

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

-	 * <p>

-	 * If the meaning of the '<em>Viewpoints</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>Viewpoints</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitectureFramework_Viewpoints()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	EList<ArchitectureViewpoint> getViewpoints();

-

-	/**

-	 * Returns the value of the '<em><b>Rules</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.iso42010.CorrespondenceRule}.

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

-	 * <p>

-	 * If the meaning of the '<em>Rules</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>Rules</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitectureFramework_Rules()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<CorrespondenceRule> getRules();

-

-	/**

-	 * Returns the value of the '<em><b>Concerns</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.iso42010.Concern}.

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

-	 * <p>

-	 * If the meaning of the '<em>Concerns</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>Concerns</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitectureFramework_Concerns()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	EList<Concern> getConcerns();

-

-} // ArchitectureFramework

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/ArchitectureModel.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/ArchitectureModel.java
deleted file mode 100755
index d61f5f9e22f..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/ArchitectureModel.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010;

-

-

-/**

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

- * A representation of the model object '<em><b>Architecture Model</b></em>'.

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

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureModel#getGovernedBy <em>Governed By</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureModel#getView <em>View</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitectureModel()

- * @model

- * @generated

- */

-public interface ArchitectureModel extends ADElement {

-	/**

-	 * Returns the value of the '<em><b>Governed By</b></em>' reference.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ModelKind#getGoverns <em>Governs</em>}'.

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

-	 * <p>

-	 * If the meaning of the '<em>Governed By</em>' reference isn't clear, there really should be more of a description here...

-	 * </p>

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

-	 *

-	 * @return the value of the '<em>Governed By</em>' reference.

-	 * @see #setGovernedBy(ModelKind)

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitectureModel_GovernedBy()

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ModelKind#getGoverns

-	 * @model opposite="governs" required="true"

-	 * @generated

-	 */

-	ModelKind getGovernedBy();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureModel#getGovernedBy <em>Governed By</em>}' reference.

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

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

-	 *

-	 * @param value

-	 *            the new value of the '<em>Governed By</em>' reference.

-	 * @see #getGovernedBy()

-	 * @generated

-	 */

-	void setGovernedBy(ModelKind value);

-

-	/**

-	 * Returns the value of the '<em><b>View</b></em>' container reference.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureView#getModels <em>Models</em>}'.

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

-	 * <p>

-	 * If the meaning of the '<em>View</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>View</em>' container reference.

-	 * @see #setView(ArchitectureView)

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitectureModel_View()

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureView#getModels

-	 * @model opposite="models" required="true" transient="false"

-	 * @generated

-	 */

-	ArchitectureView getView();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureModel#getView <em>View</em>}' container reference.

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

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

-	 *

-	 * @param value

-	 *            the new value of the '<em>View</em>' container reference.

-	 * @see #getView()

-	 * @generated

-	 */

-	void setView(ArchitectureView value);

-

-} // ArchitectureModel

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/ArchitectureRationale.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/ArchitectureRationale.java
deleted file mode 100755
index 0756ba27264..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/ArchitectureRationale.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010;

-

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

-

-/**

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

- * A representation of the model object '<em><b>Architecture Rationale</b></em>'.

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

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureRationale#getJustifies <em>Justifies</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitectureRationale()

- * @model

- * @generated

- */

-public interface ArchitectureRationale extends ADElement {

-	/**

-	 * Returns the value of the '<em><b>Justifies</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision}.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision#getJustifiedBy <em>Justified By</em>}'.

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

-	 * <p>

-	 * If the meaning of the '<em>Justifies</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>Justifies</em>' reference list.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitectureRationale_Justifies()

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision#getJustifiedBy

-	 * @model opposite="justifiedBy" required="true"

-	 * @generated

-	 */

-	EList<ArchitectureDecision> getJustifies();

-

-} // ArchitectureRationale

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/ArchitectureView.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/ArchitectureView.java
deleted file mode 100755
index b50003b2438..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/ArchitectureView.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010;

-

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

-

-/**

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

- * A representation of the model object '<em><b>Architecture View</b></em>'.

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

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureView#getGovernedBy <em>Governed By</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureView#getModels <em>Models</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureView#getAddresses <em>Addresses</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitectureView()

- * @model

- * @generated

- */

-public interface ArchitectureView extends ADElement {

-	/**

-	 * Returns the value of the '<em><b>Governed By</b></em>' reference.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint#getGoverns <em>Governs</em>}'.

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

-	 * <p>

-	 * If the meaning of the '<em>Governed By</em>' reference isn't clear, there really should be more of a description here...

-	 * </p>

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

-	 *

-	 * @return the value of the '<em>Governed By</em>' reference.

-	 * @see #setGovernedBy(ArchitectureViewpoint)

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitectureView_GovernedBy()

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint#getGoverns

-	 * @model opposite="governs" required="true"

-	 * @generated

-	 */

-	ArchitectureViewpoint getGovernedBy();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureView#getGovernedBy <em>Governed By</em>}' reference.

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

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

-	 *

-	 * @param value

-	 *            the new value of the '<em>Governed By</em>' reference.

-	 * @see #getGovernedBy()

-	 * @generated

-	 */

-	void setGovernedBy(ArchitectureViewpoint value);

-

-	/**

-	 * Returns the value of the '<em><b>Models</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureModel}.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureModel#getView <em>View</em>}'.

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

-	 * <p>

-	 * If the meaning of the '<em>Models</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>Models</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitectureView_Models()

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureModel#getView

-	 * @model opposite="view" containment="true" required="true"

-	 * @generated

-	 */

-	EList<ArchitectureModel> getModels();

-

-	/**

-	 * Returns the value of the '<em><b>Addresses</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.iso42010.Concern}.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Concern#getAddressedBy <em>Addressed By</em>}'.

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

-	 * <p>

-	 * If the meaning of the '<em>Addresses</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>Addresses</em>' reference list.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitectureView_Addresses()

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Concern#getAddressedBy

-	 * @model opposite="addressedBy" required="true"

-	 * @generated

-	 */

-	EList<Concern> getAddresses();

-

-} // ArchitectureView

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/ArchitectureViewpoint.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/ArchitectureViewpoint.java
deleted file mode 100755
index 827c2dcb50b..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/ArchitectureViewpoint.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010;

-

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

-

-/**

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

- * A representation of the model object '<em><b>Architecture Viewpoint</b></em>'.

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

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint#getModelKinds <em>Model Kinds</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint#getGoverns <em>Governs</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint#getFrames <em>Frames</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitectureViewpoint()

- * @model

- * @generated

- */

-public interface ArchitectureViewpoint extends ADElement {

-	/**

-	 * Returns the value of the '<em><b>Model Kinds</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ModelKind}.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ModelKind#getViewpoint <em>Viewpoint</em>}'.

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

-	 * <p>

-	 * If the meaning of the '<em>Model Kinds</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>Model Kinds</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitectureViewpoint_ModelKinds()

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ModelKind#getViewpoint

-	 * @model opposite="viewpoint" containment="true" required="true"

-	 * @generated

-	 */

-	EList<ModelKind> getModelKinds();

-

-	/**

-	 * Returns the value of the '<em><b>Governs</b></em>' reference.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureView#getGovernedBy <em>Governed By</em>}'.

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

-	 * <p>

-	 * If the meaning of the '<em>Governs</em>' reference isn't clear, there really should be more of a description here...

-	 * </p>

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

-	 *

-	 * @return the value of the '<em>Governs</em>' reference.

-	 * @see #setGoverns(ArchitectureView)

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitectureViewpoint_Governs()

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureView#getGovernedBy

-	 * @model opposite="governedBy" required="true"

-	 * @generated

-	 */

-	ArchitectureView getGoverns();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint#getGoverns <em>Governs</em>}' reference.

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

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

-	 *

-	 * @param value

-	 *            the new value of the '<em>Governs</em>' reference.

-	 * @see #getGoverns()

-	 * @generated

-	 */

-	void setGoverns(ArchitectureView value);

-

-	/**

-	 * Returns the value of the '<em><b>Frames</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.iso42010.Concern}.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Concern#getFramedBy <em>Framed By</em>}'.

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

-	 * <p>

-	 * If the meaning of the '<em>Frames</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>Frames</em>' reference list.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getArchitectureViewpoint_Frames()

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Concern#getFramedBy

-	 * @model opposite="framedBy" required="true"

-	 * @generated

-	 */

-	EList<Concern> getFrames();

-

-} // ArchitectureViewpoint

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/Concern.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/Concern.java
deleted file mode 100755
index 72dede62127..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/Concern.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010;

-

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

-

-/**

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

- * A representation of the model object '<em><b>Concern</b></em>'.

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

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Concern#getFramedBy <em>Framed By</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Concern#getAddressedBy <em>Addressed By</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Concern#getStakeholders <em>Stakeholders</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Concern#getRaisedBy <em>Raised By</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Concern#getDecisions <em>Decisions</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getConcern()

- * @model

- * @generated

- */

-public interface Concern extends ADElement {

-	/**

-	 * Returns the value of the '<em><b>Framed By</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint}.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint#getFrames <em>Frames</em>}'.

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

-	 * <p>

-	 * If the meaning of the '<em>Framed By</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>Framed By</em>' reference list.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getConcern_FramedBy()

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint#getFrames

-	 * @model opposite="frames" required="true"

-	 * @generated

-	 */

-	EList<ArchitectureViewpoint> getFramedBy();

-

-	/**

-	 * Returns the value of the '<em><b>Addressed By</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureView}.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureView#getAddresses <em>Addresses</em>}'.

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

-	 * <p>

-	 * If the meaning of the '<em>Addressed By</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>Addressed By</em>' reference list.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getConcern_AddressedBy()

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureView#getAddresses

-	 * @model opposite="addresses" required="true"

-	 * @generated

-	 */

-	EList<ArchitectureView> getAddressedBy();

-

-	/**

-	 * Returns the value of the '<em><b>Stakeholders</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder}.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder#getConcerns <em>Concerns</em>}'.

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

-	 * <p>

-	 * If the meaning of the '<em>Stakeholders</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>Stakeholders</em>' reference list.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getConcern_Stakeholders()

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder#getConcerns

-	 * @model opposite="concerns" required="true"

-	 * @generated

-	 */

-	EList<Stakeholder> getStakeholders();

-

-	/**

-	 * Returns the value of the '<em><b>Raised By</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision}.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision#getRaises <em>Raises</em>}'.

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

-	 * <p>

-	 * If the meaning of the '<em>Raised By</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>Raised By</em>' reference list.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getConcern_RaisedBy()

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision#getRaises

-	 * @model opposite="raises"

-	 * @generated

-	 */

-	EList<ArchitectureDecision> getRaisedBy();

-

-	/**

-	 * Returns the value of the '<em><b>Decisions</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision}.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision#getPertainsTo <em>Pertains To</em>}'.

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

-	 * <p>

-	 * If the meaning of the '<em>Decisions</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>Decisions</em>' reference list.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getConcern_Decisions()

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision#getPertainsTo

-	 * @model opposite="pertainsTo"

-	 * @generated

-	 */

-	EList<ArchitectureDecision> getDecisions();

-

-} // Concern

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/Correspondence.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/Correspondence.java
deleted file mode 100755
index 46519b832f7..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/Correspondence.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010;

-

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

-import org.eclipse.emf.ecore.EObject;

-

-/**

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

- * A representation of the model object '<em><b>Correspondence</b></em>'.

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

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Correspondence#getGovernedBy <em>Governed By</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Correspondence#getRelates <em>Relates</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getCorrespondence()

- * @model

- * @generated

- */

-public interface Correspondence extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Governed By</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.iso42010.CorrespondenceRule}.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.CorrespondenceRule#getGoverns <em>Governs</em>}'.

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

-	 * <p>

-	 * If the meaning of the '<em>Governed By</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>Governed By</em>' reference list.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getCorrespondence_GovernedBy()

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.CorrespondenceRule#getGoverns

-	 * @model opposite="governs"

-	 * @generated

-	 */

-	EList<CorrespondenceRule> getGovernedBy();

-

-	/**

-	 * Returns the value of the '<em><b>Relates</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ADElement}.

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

-	 * <p>

-	 * If the meaning of the '<em>Relates</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>Relates</em>' reference list.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getCorrespondence_Relates()

-	 * @model lower="2"

-	 * @generated

-	 */

-	EList<ADElement> getRelates();

-

-} // Correspondence

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/CorrespondenceRule.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/CorrespondenceRule.java
deleted file mode 100755
index 26fba4b7ee4..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/CorrespondenceRule.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010;

-

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

-import org.eclipse.emf.ecore.EObject;

-

-/**

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

- * A representation of the model object '<em><b>Correspondence Rule</b></em>'.

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

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.CorrespondenceRule#getGoverns <em>Governs</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getCorrespondenceRule()

- * @model

- * @generated

- */

-public interface CorrespondenceRule extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Governs</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.iso42010.Correspondence}.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Correspondence#getGovernedBy <em>Governed By</em>}'.

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

-	 * <p>

-	 * If the meaning of the '<em>Governs</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>Governs</em>' reference list.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getCorrespondenceRule_Governs()

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Correspondence#getGovernedBy

-	 * @model opposite="governedBy" required="true"

-	 * @generated

-	 */

-	EList<Correspondence> getGoverns();

-

-} // CorrespondenceRule

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/Iso42010Factory.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/Iso42010Factory.java
deleted file mode 100755
index a7a93c82dc5..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/Iso42010Factory.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010;

-

-import org.eclipse.emf.ecore.EFactory;

-

-/**

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

- * The <b>Factory</b> for the model.

- * It provides a create method for each non-abstract class of the model.

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

- *

- * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package

- * @generated

- */

-public interface Iso42010Factory extends EFactory {

-	/**

-	 * The singleton instance of the factory.

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

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

-	 *

-	 * @generated

-	 */

-	Iso42010Factory eINSTANCE = org.eclipse.papyrus.infra.viewpoints.iso42010.impl.Iso42010FactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Architecture Description</em>'.

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

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

-	 *

-	 * @return a new object of class '<em>Architecture Description</em>'.

-	 * @generated

-	 */

-	ArchitectureDescription createArchitectureDescription();

-

-	/**

-	 * Returns a new object of class '<em>Stakeholder</em>'.

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

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

-	 *

-	 * @return a new object of class '<em>Stakeholder</em>'.

-	 * @generated

-	 */

-	Stakeholder createStakeholder();

-

-	/**

-	 * Returns a new object of class '<em>Architecture Viewpoint</em>'.

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

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

-	 *

-	 * @return a new object of class '<em>Architecture Viewpoint</em>'.

-	 * @generated

-	 */

-	ArchitectureViewpoint createArchitectureViewpoint();

-

-	/**

-	 * Returns a new object of class '<em>Model Kind</em>'.

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

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

-	 *

-	 * @return a new object of class '<em>Model Kind</em>'.

-	 * @generated

-	 */

-	ModelKind createModelKind();

-

-	/**

-	 * Returns a new object of class '<em>Architecture Model</em>'.

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

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

-	 *

-	 * @return a new object of class '<em>Architecture Model</em>'.

-	 * @generated

-	 */

-	ArchitectureModel createArchitectureModel();

-

-	/**

-	 * Returns a new object of class '<em>Architecture View</em>'.

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

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

-	 *

-	 * @return a new object of class '<em>Architecture View</em>'.

-	 * @generated

-	 */

-	ArchitectureView createArchitectureView();

-

-	/**

-	 * Returns a new object of class '<em>Concern</em>'.

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

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

-	 *

-	 * @return a new object of class '<em>Concern</em>'.

-	 * @generated

-	 */

-	Concern createConcern();

-

-	/**

-	 * Returns a new object of class '<em>System</em>'.

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

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

-	 *

-	 * @return a new object of class '<em>System</em>'.

-	 * @generated

-	 */

-	System createSystem();

-

-	/**

-	 * Returns a new object of class '<em>Architecture</em>'.

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

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

-	 *

-	 * @return a new object of class '<em>Architecture</em>'.

-	 * @generated

-	 */

-	Architecture createArchitecture();

-

-	/**

-	 * Returns a new object of class '<em>Architecture Rationale</em>'.

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

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

-	 *

-	 * @return a new object of class '<em>Architecture Rationale</em>'.

-	 * @generated

-	 */

-	ArchitectureRationale createArchitectureRationale();

-

-	/**

-	 * Returns a new object of class '<em>Correspondence</em>'.

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

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

-	 *

-	 * @return a new object of class '<em>Correspondence</em>'.

-	 * @generated

-	 */

-	Correspondence createCorrespondence();

-

-	/**

-	 * Returns a new object of class '<em>Correspondence Rule</em>'.

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

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

-	 *

-	 * @return a new object of class '<em>Correspondence Rule</em>'.

-	 * @generated

-	 */

-	CorrespondenceRule createCorrespondenceRule();

-

-	/**

-	 * Returns a new object of class '<em>Architecture Decision</em>'.

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

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

-	 *

-	 * @return a new object of class '<em>Architecture Decision</em>'.

-	 * @generated

-	 */

-	ArchitectureDecision createArchitectureDecision();

-

-	/**

-	 * Returns a new object of class '<em>Architecture Framework</em>'.

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

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

-	 *

-	 * @return a new object of class '<em>Architecture Framework</em>'.

-	 * @generated

-	 */

-	ArchitectureFramework createArchitectureFramework();

-

-	/**

-	 * Returns the package supported by this factory.

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

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

-	 *

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	Iso42010Package getIso42010Package();

-

-} // Iso42010Factory

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/Iso42010Package.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/Iso42010Package.java
deleted file mode 100755
index fa4c9065165..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/Iso42010Package.java
+++ /dev/null
@@ -1,2546 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-

-/**

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

- * The <b>Package</b> for the model.

- * It contains accessors for the meta objects to represent

- * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each operation of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

- * </ul>

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

- *

- * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Factory

- * @model kind="package"

- * @generated

- */

-public interface Iso42010Package extends EPackage {

-	/**

-	 * The package name.

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

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

-	 *

-	 * @generated

-	 */

-	String eNAME = "iso42010";

-

-	/**

-	 * The package namespace URI.

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

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

-	 *

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/infra/viewpoints/iso42010";

-

-	/**

-	 * The package namespace name.

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

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

-	 *

-	 * @generated

-	 */

-	String eNS_PREFIX = "iso42010";

-

-	/**

-	 * The singleton instance of the package.

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

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

-	 *

-	 * @generated

-	 */

-	Iso42010Package eINSTANCE = org.eclipse.papyrus.infra.viewpoints.iso42010.impl.Iso42010PackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ADElementImpl <em>AD Element</em>}' class.

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

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

-	 *

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ADElementImpl

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.Iso42010PackageImpl#getADElement()

-	 * @generated

-	 */

-	int AD_ELEMENT = 0;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int AD_ELEMENT__NAME = 0;

-

-	/**

-	 * The feature id for the '<em><b>Affected By</b></em>' reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int AD_ELEMENT__AFFECTED_BY = 1;

-

-	/**

-	 * The number of structural features of the '<em>AD Element</em>' class.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int AD_ELEMENT_FEATURE_COUNT = 2;

-

-	/**

-	 * The number of operations of the '<em>AD Element</em>' class.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int AD_ELEMENT_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureDescriptionImpl <em>Architecture Description</em>}' class.

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

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

-	 *

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureDescriptionImpl

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.Iso42010PackageImpl#getArchitectureDescription()

-	 * @generated

-	 */

-	int ARCHITECTURE_DESCRIPTION = 1;

-

-	/**

-	 * The feature id for the '<em><b>Stakeholders</b></em>' containment reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_DESCRIPTION__STAKEHOLDERS = 0;

-

-	/**

-	 * The feature id for the '<em><b>Concerns</b></em>' containment reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_DESCRIPTION__CONCERNS = 1;

-

-	/**

-	 * The feature id for the '<em><b>Viewpoints</b></em>' containment reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_DESCRIPTION__VIEWPOINTS = 2;

-

-	/**

-	 * The feature id for the '<em><b>Views</b></em>' containment reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_DESCRIPTION__VIEWS = 3;

-

-	/**

-	 * The feature id for the '<em><b>System</b></em>' containment reference.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_DESCRIPTION__SYSTEM = 4;

-

-	/**

-	 * The feature id for the '<em><b>Expresses</b></em>' containment reference.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_DESCRIPTION__EXPRESSES = 5;

-

-	/**

-	 * The feature id for the '<em><b>Rationales</b></em>' containment reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_DESCRIPTION__RATIONALES = 6;

-

-	/**

-	 * The feature id for the '<em><b>Correspondences</b></em>' containment reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_DESCRIPTION__CORRESPONDENCES = 7;

-

-	/**

-	 * The feature id for the '<em><b>Rules</b></em>' containment reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_DESCRIPTION__RULES = 8;

-

-	/**

-	 * The feature id for the '<em><b>Decisions</b></em>' containment reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_DESCRIPTION__DECISIONS = 9;

-

-	/**

-	 * The number of structural features of the '<em>Architecture Description</em>' class.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_DESCRIPTION_FEATURE_COUNT = 10;

-

-	/**

-	 * The number of operations of the '<em>Architecture Description</em>' class.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_DESCRIPTION_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.StakeholderImpl <em>Stakeholder</em>}' class.

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

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

-	 *

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.StakeholderImpl

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.Iso42010PackageImpl#getStakeholder()

-	 * @generated

-	 */

-	int STAKEHOLDER = 2;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int STAKEHOLDER__NAME = AD_ELEMENT__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Affected By</b></em>' reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int STAKEHOLDER__AFFECTED_BY = AD_ELEMENT__AFFECTED_BY;

-

-	/**

-	 * The feature id for the '<em><b>Concerns</b></em>' reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int STAKEHOLDER__CONCERNS = AD_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Viewpoints</b></em>' reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int STAKEHOLDER__VIEWPOINTS = AD_ELEMENT_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Has Interest In</b></em>' reference.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int STAKEHOLDER__HAS_INTEREST_IN = AD_ELEMENT_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of structural features of the '<em>Stakeholder</em>' class.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int STAKEHOLDER_FEATURE_COUNT = AD_ELEMENT_FEATURE_COUNT + 3;

-

-	/**

-	 * The number of operations of the '<em>Stakeholder</em>' class.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int STAKEHOLDER_OPERATION_COUNT = AD_ELEMENT_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureViewpointImpl <em>Architecture Viewpoint</em>}' class.

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

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

-	 *

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureViewpointImpl

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.Iso42010PackageImpl#getArchitectureViewpoint()

-	 * @generated

-	 */

-	int ARCHITECTURE_VIEWPOINT = 3;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_VIEWPOINT__NAME = AD_ELEMENT__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Affected By</b></em>' reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_VIEWPOINT__AFFECTED_BY = AD_ELEMENT__AFFECTED_BY;

-

-	/**

-	 * The feature id for the '<em><b>Model Kinds</b></em>' containment reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_VIEWPOINT__MODEL_KINDS = AD_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Governs</b></em>' reference.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_VIEWPOINT__GOVERNS = AD_ELEMENT_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Frames</b></em>' reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_VIEWPOINT__FRAMES = AD_ELEMENT_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of structural features of the '<em>Architecture Viewpoint</em>' class.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_VIEWPOINT_FEATURE_COUNT = AD_ELEMENT_FEATURE_COUNT + 3;

-

-	/**

-	 * The number of operations of the '<em>Architecture Viewpoint</em>' class.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_VIEWPOINT_OPERATION_COUNT = AD_ELEMENT_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ModelKindImpl <em>Model Kind</em>}' class.

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

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

-	 *

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ModelKindImpl

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.Iso42010PackageImpl#getModelKind()

-	 * @generated

-	 */

-	int MODEL_KIND = 4;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int MODEL_KIND__NAME = AD_ELEMENT__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Affected By</b></em>' reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int MODEL_KIND__AFFECTED_BY = AD_ELEMENT__AFFECTED_BY;

-

-	/**

-	 * The feature id for the '<em><b>Governs</b></em>' reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int MODEL_KIND__GOVERNS = AD_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Viewpoint</b></em>' container reference.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int MODEL_KIND__VIEWPOINT = AD_ELEMENT_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of structural features of the '<em>Model Kind</em>' class.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int MODEL_KIND_FEATURE_COUNT = AD_ELEMENT_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of operations of the '<em>Model Kind</em>' class.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int MODEL_KIND_OPERATION_COUNT = AD_ELEMENT_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureModelImpl <em>Architecture Model</em>}' class.

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

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

-	 *

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureModelImpl

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.Iso42010PackageImpl#getArchitectureModel()

-	 * @generated

-	 */

-	int ARCHITECTURE_MODEL = 5;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_MODEL__NAME = AD_ELEMENT__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Affected By</b></em>' reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_MODEL__AFFECTED_BY = AD_ELEMENT__AFFECTED_BY;

-

-	/**

-	 * The feature id for the '<em><b>Governed By</b></em>' reference.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_MODEL__GOVERNED_BY = AD_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>View</b></em>' container reference.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_MODEL__VIEW = AD_ELEMENT_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of structural features of the '<em>Architecture Model</em>' class.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_MODEL_FEATURE_COUNT = AD_ELEMENT_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of operations of the '<em>Architecture Model</em>' class.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_MODEL_OPERATION_COUNT = AD_ELEMENT_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureViewImpl <em>Architecture View</em>}' class.

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

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

-	 *

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureViewImpl

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.Iso42010PackageImpl#getArchitectureView()

-	 * @generated

-	 */

-	int ARCHITECTURE_VIEW = 6;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_VIEW__NAME = AD_ELEMENT__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Affected By</b></em>' reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_VIEW__AFFECTED_BY = AD_ELEMENT__AFFECTED_BY;

-

-	/**

-	 * The feature id for the '<em><b>Governed By</b></em>' reference.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_VIEW__GOVERNED_BY = AD_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Models</b></em>' containment reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_VIEW__MODELS = AD_ELEMENT_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Addresses</b></em>' reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_VIEW__ADDRESSES = AD_ELEMENT_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of structural features of the '<em>Architecture View</em>' class.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_VIEW_FEATURE_COUNT = AD_ELEMENT_FEATURE_COUNT + 3;

-

-	/**

-	 * The number of operations of the '<em>Architecture View</em>' class.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_VIEW_OPERATION_COUNT = AD_ELEMENT_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ConcernImpl <em>Concern</em>}' class.

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

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

-	 *

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ConcernImpl

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.Iso42010PackageImpl#getConcern()

-	 * @generated

-	 */

-	int CONCERN = 7;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONCERN__NAME = AD_ELEMENT__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Affected By</b></em>' reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONCERN__AFFECTED_BY = AD_ELEMENT__AFFECTED_BY;

-

-	/**

-	 * The feature id for the '<em><b>Framed By</b></em>' reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONCERN__FRAMED_BY = AD_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Addressed By</b></em>' reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONCERN__ADDRESSED_BY = AD_ELEMENT_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Stakeholders</b></em>' reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONCERN__STAKEHOLDERS = AD_ELEMENT_FEATURE_COUNT + 2;

-

-	/**

-	 * The feature id for the '<em><b>Raised By</b></em>' reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONCERN__RAISED_BY = AD_ELEMENT_FEATURE_COUNT + 3;

-

-	/**

-	 * The feature id for the '<em><b>Decisions</b></em>' reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONCERN__DECISIONS = AD_ELEMENT_FEATURE_COUNT + 4;

-

-	/**

-	 * The number of structural features of the '<em>Concern</em>' class.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONCERN_FEATURE_COUNT = AD_ELEMENT_FEATURE_COUNT + 5;

-

-	/**

-	 * The number of operations of the '<em>Concern</em>' class.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONCERN_OPERATION_COUNT = AD_ELEMENT_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.SystemImpl <em>System</em>}' class.

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

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

-	 *

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.SystemImpl

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.Iso42010PackageImpl#getSystem()

-	 * @generated

-	 */

-	int SYSTEM = 8;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SYSTEM__NAME = 0;

-

-	/**

-	 * The feature id for the '<em><b>Stakeholders</b></em>' reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SYSTEM__STAKEHOLDERS = 1;

-

-	/**

-	 * The feature id for the '<em><b>Exhibits</b></em>' reference.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SYSTEM__EXHIBITS = 2;

-

-	/**

-	 * The number of structural features of the '<em>System</em>' class.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SYSTEM_FEATURE_COUNT = 3;

-

-	/**

-	 * The number of operations of the '<em>System</em>' class.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SYSTEM_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureImpl <em>Architecture</em>}' class.

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

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

-	 *

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureImpl

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.Iso42010PackageImpl#getArchitecture()

-	 * @generated

-	 */

-	int ARCHITECTURE = 9;

-

-	/**

-	 * The feature id for the '<em><b>Exhibited In</b></em>' reference.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE__EXHIBITED_IN = 0;

-

-	/**

-	 * The number of structural features of the '<em>Architecture</em>' class.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_FEATURE_COUNT = 1;

-

-	/**

-	 * The number of operations of the '<em>Architecture</em>' class.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureRationaleImpl <em>Architecture Rationale</em>}' class.

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

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

-	 *

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureRationaleImpl

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.Iso42010PackageImpl#getArchitectureRationale()

-	 * @generated

-	 */

-	int ARCHITECTURE_RATIONALE = 10;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_RATIONALE__NAME = AD_ELEMENT__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Affected By</b></em>' reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_RATIONALE__AFFECTED_BY = AD_ELEMENT__AFFECTED_BY;

-

-	/**

-	 * The feature id for the '<em><b>Justifies</b></em>' reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_RATIONALE__JUSTIFIES = AD_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Architecture Rationale</em>' class.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_RATIONALE_FEATURE_COUNT = AD_ELEMENT_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of operations of the '<em>Architecture Rationale</em>' class.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_RATIONALE_OPERATION_COUNT = AD_ELEMENT_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.CorrespondenceImpl <em>Correspondence</em>}' class.

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

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

-	 *

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.CorrespondenceImpl

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.Iso42010PackageImpl#getCorrespondence()

-	 * @generated

-	 */

-	int CORRESPONDENCE = 11;

-

-	/**

-	 * The feature id for the '<em><b>Governed By</b></em>' reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CORRESPONDENCE__GOVERNED_BY = 0;

-

-	/**

-	 * The feature id for the '<em><b>Relates</b></em>' reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CORRESPONDENCE__RELATES = 1;

-

-	/**

-	 * The number of structural features of the '<em>Correspondence</em>' class.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CORRESPONDENCE_FEATURE_COUNT = 2;

-

-	/**

-	 * The number of operations of the '<em>Correspondence</em>' class.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CORRESPONDENCE_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.CorrespondenceRuleImpl <em>Correspondence Rule</em>}' class.

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

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

-	 *

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.CorrespondenceRuleImpl

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.Iso42010PackageImpl#getCorrespondenceRule()

-	 * @generated

-	 */

-	int CORRESPONDENCE_RULE = 12;

-

-	/**

-	 * The feature id for the '<em><b>Governs</b></em>' reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CORRESPONDENCE_RULE__GOVERNS = 0;

-

-	/**

-	 * The number of structural features of the '<em>Correspondence Rule</em>' class.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CORRESPONDENCE_RULE_FEATURE_COUNT = 1;

-

-	/**

-	 * The number of operations of the '<em>Correspondence Rule</em>' class.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CORRESPONDENCE_RULE_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureDecisionImpl <em>Architecture Decision</em>}' class.

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

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

-	 *

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureDecisionImpl

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.Iso42010PackageImpl#getArchitectureDecision()

-	 * @generated

-	 */

-	int ARCHITECTURE_DECISION = 13;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_DECISION__NAME = AD_ELEMENT__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Affected By</b></em>' reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_DECISION__AFFECTED_BY = AD_ELEMENT__AFFECTED_BY;

-

-	/**

-	 * The feature id for the '<em><b>Justified By</b></em>' reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_DECISION__JUSTIFIED_BY = AD_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Depends Upon</b></em>' reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_DECISION__DEPENDS_UPON = AD_ELEMENT_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Dependents</b></em>' reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_DECISION__DEPENDENTS = AD_ELEMENT_FEATURE_COUNT + 2;

-

-	/**

-	 * The feature id for the '<em><b>Raises</b></em>' reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_DECISION__RAISES = AD_ELEMENT_FEATURE_COUNT + 3;

-

-	/**

-	 * The feature id for the '<em><b>Pertains To</b></em>' reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_DECISION__PERTAINS_TO = AD_ELEMENT_FEATURE_COUNT + 4;

-

-	/**

-	 * The feature id for the '<em><b>Affects</b></em>' reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_DECISION__AFFECTS = AD_ELEMENT_FEATURE_COUNT + 5;

-

-	/**

-	 * The number of structural features of the '<em>Architecture Decision</em>' class.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_DECISION_FEATURE_COUNT = AD_ELEMENT_FEATURE_COUNT + 6;

-

-	/**

-	 * The number of operations of the '<em>Architecture Decision</em>' class.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_DECISION_OPERATION_COUNT = AD_ELEMENT_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureFrameworkImpl <em>Architecture Framework</em>}' class.

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

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

-	 *

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureFrameworkImpl

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.Iso42010PackageImpl#getArchitectureFramework()

-	 * @generated

-	 */

-	int ARCHITECTURE_FRAMEWORK = 14;

-

-	/**

-	 * The feature id for the '<em><b>Stakeholders</b></em>' containment reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_FRAMEWORK__STAKEHOLDERS = 0;

-

-	/**

-	 * The feature id for the '<em><b>Viewpoints</b></em>' containment reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_FRAMEWORK__VIEWPOINTS = 1;

-

-	/**

-	 * The feature id for the '<em><b>Rules</b></em>' containment reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_FRAMEWORK__RULES = 2;

-

-	/**

-	 * The feature id for the '<em><b>Concerns</b></em>' containment reference list.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_FRAMEWORK__CONCERNS = 3;

-

-	/**

-	 * The number of structural features of the '<em>Architecture Framework</em>' class.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_FRAMEWORK_FEATURE_COUNT = 4;

-

-	/**

-	 * The number of operations of the '<em>Architecture Framework</em>' class.

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

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

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ARCHITECTURE_FRAMEWORK_OPERATION_COUNT = 0;

-

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ADElement <em>AD Element</em>}'.

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

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

-	 *

-	 * @return the meta object for class '<em>AD Element</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ADElement

-	 * @generated

-	 */

-	EClass getADElement();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ADElement#getName <em>Name</em>}'.

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

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

-	 *

-	 * @return the meta object for the attribute '<em>Name</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ADElement#getName()

-	 * @see #getADElement()

-	 * @generated

-	 */

-	EAttribute getADElement_Name();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ADElement#getAffectedBy <em>Affected By</em>}'.

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

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

-	 *

-	 * @return the meta object for the reference list '<em>Affected By</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ADElement#getAffectedBy()

-	 * @see #getADElement()

-	 * @generated

-	 */

-	EReference getADElement_AffectedBy();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription <em>Architecture Description</em>}'.

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

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

-	 *

-	 * @return the meta object for class '<em>Architecture Description</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription

-	 * @generated

-	 */

-	EClass getArchitectureDescription();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription#getStakeholders <em>Stakeholders</em>}'.

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

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

-	 *

-	 * @return the meta object for the containment reference list '<em>Stakeholders</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription#getStakeholders()

-	 * @see #getArchitectureDescription()

-	 * @generated

-	 */

-	EReference getArchitectureDescription_Stakeholders();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription#getConcerns <em>Concerns</em>}'.

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

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

-	 *

-	 * @return the meta object for the containment reference list '<em>Concerns</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription#getConcerns()

-	 * @see #getArchitectureDescription()

-	 * @generated

-	 */

-	EReference getArchitectureDescription_Concerns();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription#getViewpoints <em>Viewpoints</em>}'.

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

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

-	 *

-	 * @return the meta object for the containment reference list '<em>Viewpoints</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription#getViewpoints()

-	 * @see #getArchitectureDescription()

-	 * @generated

-	 */

-	EReference getArchitectureDescription_Viewpoints();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription#getViews <em>Views</em>}'.

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

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

-	 *

-	 * @return the meta object for the containment reference list '<em>Views</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription#getViews()

-	 * @see #getArchitectureDescription()

-	 * @generated

-	 */

-	EReference getArchitectureDescription_Views();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription#getSystem <em>System</em>}'.

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

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

-	 *

-	 * @return the meta object for the containment reference '<em>System</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription#getSystem()

-	 * @see #getArchitectureDescription()

-	 * @generated

-	 */

-	EReference getArchitectureDescription_System();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription#getExpresses <em>Expresses</em>}'.

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

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

-	 *

-	 * @return the meta object for the containment reference '<em>Expresses</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription#getExpresses()

-	 * @see #getArchitectureDescription()

-	 * @generated

-	 */

-	EReference getArchitectureDescription_Expresses();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription#getRationales <em>Rationales</em>}'.

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

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

-	 *

-	 * @return the meta object for the containment reference list '<em>Rationales</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription#getRationales()

-	 * @see #getArchitectureDescription()

-	 * @generated

-	 */

-	EReference getArchitectureDescription_Rationales();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription#getCorrespondences <em>Correspondences</em>}'.

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

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

-	 *

-	 * @return the meta object for the containment reference list '<em>Correspondences</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription#getCorrespondences()

-	 * @see #getArchitectureDescription()

-	 * @generated

-	 */

-	EReference getArchitectureDescription_Correspondences();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription#getRules <em>Rules</em>}'.

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

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

-	 *

-	 * @return the meta object for the containment reference list '<em>Rules</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription#getRules()

-	 * @see #getArchitectureDescription()

-	 * @generated

-	 */

-	EReference getArchitectureDescription_Rules();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription#getDecisions <em>Decisions</em>}'.

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

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

-	 *

-	 * @return the meta object for the containment reference list '<em>Decisions</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription#getDecisions()

-	 * @see #getArchitectureDescription()

-	 * @generated

-	 */

-	EReference getArchitectureDescription_Decisions();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder <em>Stakeholder</em>}'.

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

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

-	 *

-	 * @return the meta object for class '<em>Stakeholder</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder

-	 * @generated

-	 */

-	EClass getStakeholder();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder#getConcerns <em>Concerns</em>}'.

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

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

-	 *

-	 * @return the meta object for the reference list '<em>Concerns</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder#getConcerns()

-	 * @see #getStakeholder()

-	 * @generated

-	 */

-	EReference getStakeholder_Concerns();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder#getViewpoints <em>Viewpoints</em>}'.

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

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

-	 *

-	 * @return the meta object for the reference list '<em>Viewpoints</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder#getViewpoints()

-	 * @see #getStakeholder()

-	 * @generated

-	 */

-	EReference getStakeholder_Viewpoints();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder#getHasInterestIn <em>Has Interest In</em>}'.

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

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

-	 *

-	 * @return the meta object for the reference '<em>Has Interest In</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder#getHasInterestIn()

-	 * @see #getStakeholder()

-	 * @generated

-	 */

-	EReference getStakeholder_HasInterestIn();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint <em>Architecture Viewpoint</em>}'.

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

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

-	 *

-	 * @return the meta object for class '<em>Architecture Viewpoint</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint

-	 * @generated

-	 */

-	EClass getArchitectureViewpoint();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint#getModelKinds <em>Model Kinds</em>}'.

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

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

-	 *

-	 * @return the meta object for the containment reference list '<em>Model Kinds</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint#getModelKinds()

-	 * @see #getArchitectureViewpoint()

-	 * @generated

-	 */

-	EReference getArchitectureViewpoint_ModelKinds();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint#getGoverns <em>Governs</em>}'.

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

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

-	 *

-	 * @return the meta object for the reference '<em>Governs</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint#getGoverns()

-	 * @see #getArchitectureViewpoint()

-	 * @generated

-	 */

-	EReference getArchitectureViewpoint_Governs();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint#getFrames <em>Frames</em>}'.

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

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

-	 *

-	 * @return the meta object for the reference list '<em>Frames</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint#getFrames()

-	 * @see #getArchitectureViewpoint()

-	 * @generated

-	 */

-	EReference getArchitectureViewpoint_Frames();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ModelKind <em>Model Kind</em>}'.

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

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

-	 *

-	 * @return the meta object for class '<em>Model Kind</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ModelKind

-	 * @generated

-	 */

-	EClass getModelKind();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ModelKind#getGoverns <em>Governs</em>}'.

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

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

-	 *

-	 * @return the meta object for the reference list '<em>Governs</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ModelKind#getGoverns()

-	 * @see #getModelKind()

-	 * @generated

-	 */

-	EReference getModelKind_Governs();

-

-	/**

-	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ModelKind#getViewpoint <em>Viewpoint</em>}'.

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

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

-	 *

-	 * @return the meta object for the container reference '<em>Viewpoint</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ModelKind#getViewpoint()

-	 * @see #getModelKind()

-	 * @generated

-	 */

-	EReference getModelKind_Viewpoint();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureModel <em>Architecture Model</em>}'.

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

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

-	 *

-	 * @return the meta object for class '<em>Architecture Model</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureModel

-	 * @generated

-	 */

-	EClass getArchitectureModel();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureModel#getGovernedBy <em>Governed By</em>}'.

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

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

-	 *

-	 * @return the meta object for the reference '<em>Governed By</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureModel#getGovernedBy()

-	 * @see #getArchitectureModel()

-	 * @generated

-	 */

-	EReference getArchitectureModel_GovernedBy();

-

-	/**

-	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureModel#getView <em>View</em>}'.

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

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

-	 *

-	 * @return the meta object for the container reference '<em>View</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureModel#getView()

-	 * @see #getArchitectureModel()

-	 * @generated

-	 */

-	EReference getArchitectureModel_View();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureView <em>Architecture View</em>}'.

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

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

-	 *

-	 * @return the meta object for class '<em>Architecture View</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureView

-	 * @generated

-	 */

-	EClass getArchitectureView();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureView#getGovernedBy <em>Governed By</em>}'.

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

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

-	 *

-	 * @return the meta object for the reference '<em>Governed By</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureView#getGovernedBy()

-	 * @see #getArchitectureView()

-	 * @generated

-	 */

-	EReference getArchitectureView_GovernedBy();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureView#getModels <em>Models</em>}'.

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

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

-	 *

-	 * @return the meta object for the containment reference list '<em>Models</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureView#getModels()

-	 * @see #getArchitectureView()

-	 * @generated

-	 */

-	EReference getArchitectureView_Models();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureView#getAddresses <em>Addresses</em>}'.

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

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

-	 *

-	 * @return the meta object for the reference list '<em>Addresses</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureView#getAddresses()

-	 * @see #getArchitectureView()

-	 * @generated

-	 */

-	EReference getArchitectureView_Addresses();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Concern <em>Concern</em>}'.

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

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

-	 *

-	 * @return the meta object for class '<em>Concern</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Concern

-	 * @generated

-	 */

-	EClass getConcern();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Concern#getFramedBy <em>Framed By</em>}'.

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

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

-	 *

-	 * @return the meta object for the reference list '<em>Framed By</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Concern#getFramedBy()

-	 * @see #getConcern()

-	 * @generated

-	 */

-	EReference getConcern_FramedBy();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Concern#getAddressedBy <em>Addressed By</em>}'.

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

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

-	 *

-	 * @return the meta object for the reference list '<em>Addressed By</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Concern#getAddressedBy()

-	 * @see #getConcern()

-	 * @generated

-	 */

-	EReference getConcern_AddressedBy();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Concern#getStakeholders <em>Stakeholders</em>}'.

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

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

-	 *

-	 * @return the meta object for the reference list '<em>Stakeholders</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Concern#getStakeholders()

-	 * @see #getConcern()

-	 * @generated

-	 */

-	EReference getConcern_Stakeholders();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Concern#getRaisedBy <em>Raised By</em>}'.

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

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

-	 *

-	 * @return the meta object for the reference list '<em>Raised By</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Concern#getRaisedBy()

-	 * @see #getConcern()

-	 * @generated

-	 */

-	EReference getConcern_RaisedBy();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Concern#getDecisions <em>Decisions</em>}'.

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

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

-	 *

-	 * @return the meta object for the reference list '<em>Decisions</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Concern#getDecisions()

-	 * @see #getConcern()

-	 * @generated

-	 */

-	EReference getConcern_Decisions();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.System <em>System</em>}'.

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

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

-	 *

-	 * @return the meta object for class '<em>System</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.System

-	 * @generated

-	 */

-	EClass getSystem();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.System#getName <em>Name</em>}'.

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

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

-	 *

-	 * @return the meta object for the attribute '<em>Name</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.System#getName()

-	 * @see #getSystem()

-	 * @generated

-	 */

-	EAttribute getSystem_Name();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.System#getStakeholders <em>Stakeholders</em>}'.

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

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

-	 *

-	 * @return the meta object for the reference list '<em>Stakeholders</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.System#getStakeholders()

-	 * @see #getSystem()

-	 * @generated

-	 */

-	EReference getSystem_Stakeholders();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.System#getExhibits <em>Exhibits</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference '<em>Exhibits</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.System#getExhibits()

-	 * @see #getSystem()

-	 * @generated

-	 */

-	EReference getSystem_Exhibits();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Architecture <em>Architecture</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Architecture</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Architecture

-	 * @generated

-	 */

-	EClass getArchitecture();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Architecture#getExhibitedIn <em>Exhibited In</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference '<em>Exhibited In</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Architecture#getExhibitedIn()

-	 * @see #getArchitecture()

-	 * @generated

-	 */

-	EReference getArchitecture_ExhibitedIn();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureRationale <em>Architecture Rationale</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Architecture Rationale</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureRationale

-	 * @generated

-	 */

-	EClass getArchitectureRationale();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureRationale#getJustifies <em>Justifies</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference list '<em>Justifies</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureRationale#getJustifies()

-	 * @see #getArchitectureRationale()

-	 * @generated

-	 */

-	EReference getArchitectureRationale_Justifies();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Correspondence <em>Correspondence</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Correspondence</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Correspondence

-	 * @generated

-	 */

-	EClass getCorrespondence();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Correspondence#getGovernedBy <em>Governed By</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference list '<em>Governed By</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Correspondence#getGovernedBy()

-	 * @see #getCorrespondence()

-	 * @generated

-	 */

-	EReference getCorrespondence_GovernedBy();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Correspondence#getRelates <em>Relates</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference list '<em>Relates</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Correspondence#getRelates()

-	 * @see #getCorrespondence()

-	 * @generated

-	 */

-	EReference getCorrespondence_Relates();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.CorrespondenceRule <em>Correspondence Rule</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Correspondence Rule</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.CorrespondenceRule

-	 * @generated

-	 */

-	EClass getCorrespondenceRule();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.CorrespondenceRule#getGoverns <em>Governs</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference list '<em>Governs</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.CorrespondenceRule#getGoverns()

-	 * @see #getCorrespondenceRule()

-	 * @generated

-	 */

-	EReference getCorrespondenceRule_Governs();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision <em>Architecture Decision</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Architecture Decision</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision

-	 * @generated

-	 */

-	EClass getArchitectureDecision();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision#getJustifiedBy <em>Justified By</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference list '<em>Justified By</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision#getJustifiedBy()

-	 * @see #getArchitectureDecision()

-	 * @generated

-	 */

-	EReference getArchitectureDecision_JustifiedBy();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision#getDependsUpon <em>Depends Upon</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference list '<em>Depends Upon</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision#getDependsUpon()

-	 * @see #getArchitectureDecision()

-	 * @generated

-	 */

-	EReference getArchitectureDecision_DependsUpon();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision#getDependents <em>Dependents</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference list '<em>Dependents</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision#getDependents()

-	 * @see #getArchitectureDecision()

-	 * @generated

-	 */

-	EReference getArchitectureDecision_Dependents();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision#getRaises <em>Raises</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference list '<em>Raises</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision#getRaises()

-	 * @see #getArchitectureDecision()

-	 * @generated

-	 */

-	EReference getArchitectureDecision_Raises();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision#getPertainsTo <em>Pertains To</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference list '<em>Pertains To</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision#getPertainsTo()

-	 * @see #getArchitectureDecision()

-	 * @generated

-	 */

-	EReference getArchitectureDecision_PertainsTo();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision#getAffects <em>Affects</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference list '<em>Affects</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision#getAffects()

-	 * @see #getArchitectureDecision()

-	 * @generated

-	 */

-	EReference getArchitectureDecision_Affects();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureFramework <em>Architecture Framework</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Architecture Framework</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureFramework

-	 * @generated

-	 */

-	EClass getArchitectureFramework();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureFramework#getStakeholders <em>Stakeholders</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Stakeholders</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureFramework#getStakeholders()

-	 * @see #getArchitectureFramework()

-	 * @generated

-	 */

-	EReference getArchitectureFramework_Stakeholders();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureFramework#getViewpoints <em>Viewpoints</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Viewpoints</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureFramework#getViewpoints()

-	 * @see #getArchitectureFramework()

-	 * @generated

-	 */

-	EReference getArchitectureFramework_Viewpoints();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureFramework#getRules <em>Rules</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Rules</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureFramework#getRules()

-	 * @see #getArchitectureFramework()

-	 * @generated

-	 */

-	EReference getArchitectureFramework_Rules();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureFramework#getConcerns <em>Concerns</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Concerns</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureFramework#getConcerns()

-	 * @see #getArchitectureFramework()

-	 * @generated

-	 */

-	EReference getArchitectureFramework_Concerns();

-

-	/**

-	 * Returns the factory that creates the instances of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the factory that creates the instances of the model.

-	 * @generated

-	 */

-	Iso42010Factory getIso42010Factory();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * Defines literals for the meta objects that represent

-	 * <ul>

-	 * <li>each class,</li>

-	 * <li>each feature of each class,</li>

-	 * <li>each operation of each class,</li>

-	 * <li>each enum,</li>

-	 * <li>and each data type</li>

-	 * </ul>

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	interface Literals {

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ADElementImpl <em>AD Element</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ADElementImpl

-		 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.Iso42010PackageImpl#getADElement()

-		 * @generated

-		 */

-		EClass AD_ELEMENT = eINSTANCE.getADElement();

-

-		/**

-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute AD_ELEMENT__NAME = eINSTANCE.getADElement_Name();

-

-		/**

-		 * The meta object literal for the '<em><b>Affected By</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference AD_ELEMENT__AFFECTED_BY = eINSTANCE.getADElement_AffectedBy();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureDescriptionImpl <em>Architecture Description</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureDescriptionImpl

-		 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.Iso42010PackageImpl#getArchitectureDescription()

-		 * @generated

-		 */

-		EClass ARCHITECTURE_DESCRIPTION = eINSTANCE.getArchitectureDescription();

-

-		/**

-		 * The meta object literal for the '<em><b>Stakeholders</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ARCHITECTURE_DESCRIPTION__STAKEHOLDERS = eINSTANCE.getArchitectureDescription_Stakeholders();

-

-		/**

-		 * The meta object literal for the '<em><b>Concerns</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ARCHITECTURE_DESCRIPTION__CONCERNS = eINSTANCE.getArchitectureDescription_Concerns();

-

-		/**

-		 * The meta object literal for the '<em><b>Viewpoints</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ARCHITECTURE_DESCRIPTION__VIEWPOINTS = eINSTANCE.getArchitectureDescription_Viewpoints();

-

-		/**

-		 * The meta object literal for the '<em><b>Views</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ARCHITECTURE_DESCRIPTION__VIEWS = eINSTANCE.getArchitectureDescription_Views();

-

-		/**

-		 * The meta object literal for the '<em><b>System</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ARCHITECTURE_DESCRIPTION__SYSTEM = eINSTANCE.getArchitectureDescription_System();

-

-		/**

-		 * The meta object literal for the '<em><b>Expresses</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ARCHITECTURE_DESCRIPTION__EXPRESSES = eINSTANCE.getArchitectureDescription_Expresses();

-

-		/**

-		 * The meta object literal for the '<em><b>Rationales</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ARCHITECTURE_DESCRIPTION__RATIONALES = eINSTANCE.getArchitectureDescription_Rationales();

-

-		/**

-		 * The meta object literal for the '<em><b>Correspondences</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ARCHITECTURE_DESCRIPTION__CORRESPONDENCES = eINSTANCE.getArchitectureDescription_Correspondences();

-

-		/**

-		 * The meta object literal for the '<em><b>Rules</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ARCHITECTURE_DESCRIPTION__RULES = eINSTANCE.getArchitectureDescription_Rules();

-

-		/**

-		 * The meta object literal for the '<em><b>Decisions</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ARCHITECTURE_DESCRIPTION__DECISIONS = eINSTANCE.getArchitectureDescription_Decisions();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.StakeholderImpl <em>Stakeholder</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.StakeholderImpl

-		 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.Iso42010PackageImpl#getStakeholder()

-		 * @generated

-		 */

-		EClass STAKEHOLDER = eINSTANCE.getStakeholder();

-

-		/**

-		 * The meta object literal for the '<em><b>Concerns</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference STAKEHOLDER__CONCERNS = eINSTANCE.getStakeholder_Concerns();

-

-		/**

-		 * The meta object literal for the '<em><b>Viewpoints</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference STAKEHOLDER__VIEWPOINTS = eINSTANCE.getStakeholder_Viewpoints();

-

-		/**

-		 * The meta object literal for the '<em><b>Has Interest In</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference STAKEHOLDER__HAS_INTEREST_IN = eINSTANCE.getStakeholder_HasInterestIn();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureViewpointImpl <em>Architecture Viewpoint</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureViewpointImpl

-		 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.Iso42010PackageImpl#getArchitectureViewpoint()

-		 * @generated

-		 */

-		EClass ARCHITECTURE_VIEWPOINT = eINSTANCE.getArchitectureViewpoint();

-

-		/**

-		 * The meta object literal for the '<em><b>Model Kinds</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ARCHITECTURE_VIEWPOINT__MODEL_KINDS = eINSTANCE.getArchitectureViewpoint_ModelKinds();

-

-		/**

-		 * The meta object literal for the '<em><b>Governs</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ARCHITECTURE_VIEWPOINT__GOVERNS = eINSTANCE.getArchitectureViewpoint_Governs();

-

-		/**

-		 * The meta object literal for the '<em><b>Frames</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ARCHITECTURE_VIEWPOINT__FRAMES = eINSTANCE.getArchitectureViewpoint_Frames();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ModelKindImpl <em>Model Kind</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ModelKindImpl

-		 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.Iso42010PackageImpl#getModelKind()

-		 * @generated

-		 */

-		EClass MODEL_KIND = eINSTANCE.getModelKind();

-

-		/**

-		 * The meta object literal for the '<em><b>Governs</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference MODEL_KIND__GOVERNS = eINSTANCE.getModelKind_Governs();

-

-		/**

-		 * The meta object literal for the '<em><b>Viewpoint</b></em>' container reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference MODEL_KIND__VIEWPOINT = eINSTANCE.getModelKind_Viewpoint();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureModelImpl <em>Architecture Model</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureModelImpl

-		 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.Iso42010PackageImpl#getArchitectureModel()

-		 * @generated

-		 */

-		EClass ARCHITECTURE_MODEL = eINSTANCE.getArchitectureModel();

-

-		/**

-		 * The meta object literal for the '<em><b>Governed By</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ARCHITECTURE_MODEL__GOVERNED_BY = eINSTANCE.getArchitectureModel_GovernedBy();

-

-		/**

-		 * The meta object literal for the '<em><b>View</b></em>' container reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ARCHITECTURE_MODEL__VIEW = eINSTANCE.getArchitectureModel_View();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureViewImpl <em>Architecture View</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureViewImpl

-		 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.Iso42010PackageImpl#getArchitectureView()

-		 * @generated

-		 */

-		EClass ARCHITECTURE_VIEW = eINSTANCE.getArchitectureView();

-

-		/**

-		 * The meta object literal for the '<em><b>Governed By</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ARCHITECTURE_VIEW__GOVERNED_BY = eINSTANCE.getArchitectureView_GovernedBy();

-

-		/**

-		 * The meta object literal for the '<em><b>Models</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ARCHITECTURE_VIEW__MODELS = eINSTANCE.getArchitectureView_Models();

-

-		/**

-		 * The meta object literal for the '<em><b>Addresses</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ARCHITECTURE_VIEW__ADDRESSES = eINSTANCE.getArchitectureView_Addresses();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ConcernImpl <em>Concern</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ConcernImpl

-		 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.Iso42010PackageImpl#getConcern()

-		 * @generated

-		 */

-		EClass CONCERN = eINSTANCE.getConcern();

-

-		/**

-		 * The meta object literal for the '<em><b>Framed By</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference CONCERN__FRAMED_BY = eINSTANCE.getConcern_FramedBy();

-

-		/**

-		 * The meta object literal for the '<em><b>Addressed By</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference CONCERN__ADDRESSED_BY = eINSTANCE.getConcern_AddressedBy();

-

-		/**

-		 * The meta object literal for the '<em><b>Stakeholders</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference CONCERN__STAKEHOLDERS = eINSTANCE.getConcern_Stakeholders();

-

-		/**

-		 * The meta object literal for the '<em><b>Raised By</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference CONCERN__RAISED_BY = eINSTANCE.getConcern_RaisedBy();

-

-		/**

-		 * The meta object literal for the '<em><b>Decisions</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference CONCERN__DECISIONS = eINSTANCE.getConcern_Decisions();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.SystemImpl <em>System</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.SystemImpl

-		 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.Iso42010PackageImpl#getSystem()

-		 * @generated

-		 */

-		EClass SYSTEM = eINSTANCE.getSystem();

-

-		/**

-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute SYSTEM__NAME = eINSTANCE.getSystem_Name();

-

-		/**

-		 * The meta object literal for the '<em><b>Stakeholders</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference SYSTEM__STAKEHOLDERS = eINSTANCE.getSystem_Stakeholders();

-

-		/**

-		 * The meta object literal for the '<em><b>Exhibits</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference SYSTEM__EXHIBITS = eINSTANCE.getSystem_Exhibits();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureImpl <em>Architecture</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureImpl

-		 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.Iso42010PackageImpl#getArchitecture()

-		 * @generated

-		 */

-		EClass ARCHITECTURE = eINSTANCE.getArchitecture();

-

-		/**

-		 * The meta object literal for the '<em><b>Exhibited In</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ARCHITECTURE__EXHIBITED_IN = eINSTANCE.getArchitecture_ExhibitedIn();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureRationaleImpl <em>Architecture Rationale</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureRationaleImpl

-		 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.Iso42010PackageImpl#getArchitectureRationale()

-		 * @generated

-		 */

-		EClass ARCHITECTURE_RATIONALE = eINSTANCE.getArchitectureRationale();

-

-		/**

-		 * The meta object literal for the '<em><b>Justifies</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ARCHITECTURE_RATIONALE__JUSTIFIES = eINSTANCE.getArchitectureRationale_Justifies();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.CorrespondenceImpl <em>Correspondence</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.CorrespondenceImpl

-		 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.Iso42010PackageImpl#getCorrespondence()

-		 * @generated

-		 */

-		EClass CORRESPONDENCE = eINSTANCE.getCorrespondence();

-

-		/**

-		 * The meta object literal for the '<em><b>Governed By</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference CORRESPONDENCE__GOVERNED_BY = eINSTANCE.getCorrespondence_GovernedBy();

-

-		/**

-		 * The meta object literal for the '<em><b>Relates</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference CORRESPONDENCE__RELATES = eINSTANCE.getCorrespondence_Relates();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.CorrespondenceRuleImpl <em>Correspondence Rule</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.CorrespondenceRuleImpl

-		 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.Iso42010PackageImpl#getCorrespondenceRule()

-		 * @generated

-		 */

-		EClass CORRESPONDENCE_RULE = eINSTANCE.getCorrespondenceRule();

-

-		/**

-		 * The meta object literal for the '<em><b>Governs</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference CORRESPONDENCE_RULE__GOVERNS = eINSTANCE.getCorrespondenceRule_Governs();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureDecisionImpl <em>Architecture Decision</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureDecisionImpl

-		 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.Iso42010PackageImpl#getArchitectureDecision()

-		 * @generated

-		 */

-		EClass ARCHITECTURE_DECISION = eINSTANCE.getArchitectureDecision();

-

-		/**

-		 * The meta object literal for the '<em><b>Justified By</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ARCHITECTURE_DECISION__JUSTIFIED_BY = eINSTANCE.getArchitectureDecision_JustifiedBy();

-

-		/**

-		 * The meta object literal for the '<em><b>Depends Upon</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ARCHITECTURE_DECISION__DEPENDS_UPON = eINSTANCE.getArchitectureDecision_DependsUpon();

-

-		/**

-		 * The meta object literal for the '<em><b>Dependents</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ARCHITECTURE_DECISION__DEPENDENTS = eINSTANCE.getArchitectureDecision_Dependents();

-

-		/**

-		 * The meta object literal for the '<em><b>Raises</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ARCHITECTURE_DECISION__RAISES = eINSTANCE.getArchitectureDecision_Raises();

-

-		/**

-		 * The meta object literal for the '<em><b>Pertains To</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ARCHITECTURE_DECISION__PERTAINS_TO = eINSTANCE.getArchitectureDecision_PertainsTo();

-

-		/**

-		 * The meta object literal for the '<em><b>Affects</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ARCHITECTURE_DECISION__AFFECTS = eINSTANCE.getArchitectureDecision_Affects();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureFrameworkImpl <em>Architecture Framework</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureFrameworkImpl

-		 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.impl.Iso42010PackageImpl#getArchitectureFramework()

-		 * @generated

-		 */

-		EClass ARCHITECTURE_FRAMEWORK = eINSTANCE.getArchitectureFramework();

-

-		/**

-		 * The meta object literal for the '<em><b>Stakeholders</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ARCHITECTURE_FRAMEWORK__STAKEHOLDERS = eINSTANCE.getArchitectureFramework_Stakeholders();

-

-		/**

-		 * The meta object literal for the '<em><b>Viewpoints</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ARCHITECTURE_FRAMEWORK__VIEWPOINTS = eINSTANCE.getArchitectureFramework_Viewpoints();

-

-		/**

-		 * The meta object literal for the '<em><b>Rules</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ARCHITECTURE_FRAMEWORK__RULES = eINSTANCE.getArchitectureFramework_Rules();

-

-		/**

-		 * The meta object literal for the '<em><b>Concerns</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference ARCHITECTURE_FRAMEWORK__CONCERNS = eINSTANCE.getArchitectureFramework_Concerns();

-

-	}

-

-} // Iso42010Package

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/ModelKind.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/ModelKind.java
deleted file mode 100755
index c7eaa8dbded..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/ModelKind.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010;

-

-import org.eclipse.emf.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Model Kind</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ModelKind#getGoverns <em>Governs</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ModelKind#getViewpoint <em>Viewpoint</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getModelKind()

- * @model

- * @generated

- */

-public interface ModelKind extends ADElement {

-	/**

-	 * Returns the value of the '<em><b>Governs</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureModel}.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureModel#getGovernedBy <em>Governed By</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Governs</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>Governs</em>' reference list.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getModelKind_Governs()

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureModel#getGovernedBy

-	 * @model opposite="governedBy" required="true"

-	 * @generated

-	 */

-	EList<ArchitectureModel> getGoverns();

-

-	/**

-	 * Returns the value of the '<em><b>Viewpoint</b></em>' container reference.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint#getModelKinds <em>Model Kinds</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Viewpoint</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>Viewpoint</em>' container reference.

-	 * @see #setViewpoint(ArchitectureViewpoint)

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getModelKind_Viewpoint()

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint#getModelKinds

-	 * @model opposite="modelKinds" required="true" transient="false"

-	 * @generated

-	 */

-	ArchitectureViewpoint getViewpoint();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ModelKind#getViewpoint <em>Viewpoint</em>}' container reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Viewpoint</em>' container reference.

-	 * @see #getViewpoint()

-	 * @generated

-	 */

-	void setViewpoint(ArchitectureViewpoint value);

-

-} // ModelKind

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/Stakeholder.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/Stakeholder.java
deleted file mode 100755
index b9af34eab0d..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/Stakeholder.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010;

-

-import org.eclipse.emf.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Stakeholder</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder#getConcerns <em>Concerns</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder#getViewpoints <em>Viewpoints</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder#getHasInterestIn <em>Has Interest In</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getStakeholder()

- * @model

- * @generated

- */

-public interface Stakeholder extends ADElement {

-	/**

-	 * Returns the value of the '<em><b>Concerns</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.iso42010.Concern}.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Concern#getStakeholders <em>Stakeholders</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Concerns</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>Concerns</em>' reference list.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getStakeholder_Concerns()

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Concern#getStakeholders

-	 * @model opposite="stakeholders" required="true"

-	 * @generated

-	 */

-	EList<Concern> getConcerns();

-

-	/**

-	 * Returns the value of the '<em><b>Viewpoints</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Viewpoints</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>Viewpoints</em>' reference list.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getStakeholder_Viewpoints()

-	 * @model required="true"

-	 * @generated

-	 */

-	EList<ArchitectureViewpoint> getViewpoints();

-

-	/**

-	 * Returns the value of the '<em><b>Has Interest In</b></em>' reference.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.System#getStakeholders <em>Stakeholders</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Has Interest In</em>' reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Has Interest In</em>' reference.

-	 * @see #setHasInterestIn(org.eclipse.papyrus.infra.viewpoints.iso42010.System)

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getStakeholder_HasInterestIn()

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.System#getStakeholders

-	 * @model opposite="stakeholders" required="true"

-	 * @generated

-	 */

-	org.eclipse.papyrus.infra.viewpoints.iso42010.System getHasInterestIn();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder#getHasInterestIn <em>Has Interest In</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Has Interest In</em>' reference.

-	 * @see #getHasInterestIn()

-	 * @generated

-	 */

-	void setHasInterestIn(org.eclipse.papyrus.infra.viewpoints.iso42010.System value);

-

-} // Stakeholder

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/System.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/System.java
deleted file mode 100755
index ca50991affe..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/System.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>System</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.System#getName <em>Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.System#getStakeholders <em>Stakeholders</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.System#getExhibits <em>Exhibits</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getSystem()

- * @model

- * @generated

- */

-public interface System 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.infra.viewpoints.iso42010.Iso42010Package#getSystem_Name()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.System#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);

-

-	/**

-	 * Returns the value of the '<em><b>Stakeholders</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder}.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder#getHasInterestIn <em>Has Interest In</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Stakeholders</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>Stakeholders</em>' reference list.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getSystem_Stakeholders()

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder#getHasInterestIn

-	 * @model opposite="hasInterestIn" required="true"

-	 * @generated

-	 */

-	EList<Stakeholder> getStakeholders();

-

-	/**

-	 * Returns the value of the '<em><b>Exhibits</b></em>' reference.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Architecture#getExhibitedIn <em>Exhibited In</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Exhibits</em>' reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Exhibits</em>' reference.

-	 * @see #setExhibits(Architecture)

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#getSystem_Exhibits()

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Architecture#getExhibitedIn

-	 * @model opposite="exhibitedIn" required="true"

-	 * @generated

-	 */

-	Architecture getExhibits();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.System#getExhibits <em>Exhibits</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Exhibits</em>' reference.

-	 * @see #getExhibits()

-	 * @generated

-	 */

-	void setExhibits(Architecture value);

-

-} // System

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/ADElementImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/ADElementImpl.java
deleted file mode 100755
index 1ea39ede4b6..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/ADElementImpl.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010.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.MinimalEObjectImpl;

-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ADElement;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>AD Element</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ADElementImpl#getName <em>Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ADElementImpl#getAffectedBy <em>Affected By</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public abstract class ADElementImpl extends MinimalEObjectImpl.Container implements ADElement {

-	/**

-	 * 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;

-

-	/**

-	 * The cached value of the '{@link #getAffectedBy() <em>Affected By</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getAffectedBy()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ArchitectureDecision> affectedBy;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ADElementImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return Iso42010Package.Literals.AD_ELEMENT;

-	}

-

-	/**

-	 * <!-- 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, Iso42010Package.AD_ELEMENT__NAME, oldName, name));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<ArchitectureDecision> getAffectedBy() {

-		if (affectedBy == null) {

-			affectedBy = new EObjectWithInverseResolvingEList.ManyInverse<ArchitectureDecision>(ArchitectureDecision.class, this, Iso42010Package.AD_ELEMENT__AFFECTED_BY, Iso42010Package.ARCHITECTURE_DECISION__AFFECTS);

-		}

-		return affectedBy;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case Iso42010Package.AD_ELEMENT__AFFECTED_BY:

-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getAffectedBy()).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 Iso42010Package.AD_ELEMENT__AFFECTED_BY:

-			return ((InternalEList<?>) getAffectedBy()).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 Iso42010Package.AD_ELEMENT__NAME:

-			return getName();

-		case Iso42010Package.AD_ELEMENT__AFFECTED_BY:

-			return getAffectedBy();

-		}

-		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 Iso42010Package.AD_ELEMENT__NAME:

-			setName((String) newValue);

-			return;

-		case Iso42010Package.AD_ELEMENT__AFFECTED_BY:

-			getAffectedBy().clear();

-			getAffectedBy().addAll((Collection<? extends ArchitectureDecision>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case Iso42010Package.AD_ELEMENT__NAME:

-			setName(NAME_EDEFAULT);

-			return;

-		case Iso42010Package.AD_ELEMENT__AFFECTED_BY:

-			getAffectedBy().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case Iso42010Package.AD_ELEMENT__NAME:

-			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

-		case Iso42010Package.AD_ELEMENT__AFFECTED_BY:

-			return affectedBy != null && !affectedBy.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(" (name: ");

-		result.append(name);

-		result.append(')');

-		return result.toString();

-	}

-

-} // ADElementImpl

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/ArchitectureDecisionImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/ArchitectureDecisionImpl.java
deleted file mode 100755
index be28b3bff38..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/ArchitectureDecisionImpl.java
+++ /dev/null
@@ -1,384 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ADElement;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureRationale;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Concern;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Architecture Decision</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureDecisionImpl#getJustifiedBy <em>Justified By</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureDecisionImpl#getDependsUpon <em>Depends Upon</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureDecisionImpl#getDependents <em>Dependents</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureDecisionImpl#getRaises <em>Raises</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureDecisionImpl#getPertainsTo <em>Pertains To</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureDecisionImpl#getAffects <em>Affects</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ArchitectureDecisionImpl extends ADElementImpl implements ArchitectureDecision {

-	/**

-	 * The cached value of the '{@link #getJustifiedBy() <em>Justified By</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getJustifiedBy()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ArchitectureRationale> justifiedBy;

-

-	/**

-	 * The cached value of the '{@link #getDependsUpon() <em>Depends Upon</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getDependsUpon()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ArchitectureDecision> dependsUpon;

-

-	/**

-	 * The cached value of the '{@link #getDependents() <em>Dependents</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getDependents()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ArchitectureDecision> dependents;

-

-	/**

-	 * The cached value of the '{@link #getRaises() <em>Raises</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getRaises()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Concern> raises;

-

-	/**

-	 * The cached value of the '{@link #getPertainsTo() <em>Pertains To</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getPertainsTo()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Concern> pertainsTo;

-

-	/**

-	 * The cached value of the '{@link #getAffects() <em>Affects</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getAffects()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ADElement> affects;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ArchitectureDecisionImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return Iso42010Package.Literals.ARCHITECTURE_DECISION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<ArchitectureRationale> getJustifiedBy() {

-		if (justifiedBy == null) {

-			justifiedBy = new EObjectWithInverseResolvingEList.ManyInverse<ArchitectureRationale>(ArchitectureRationale.class, this, Iso42010Package.ARCHITECTURE_DECISION__JUSTIFIED_BY, Iso42010Package.ARCHITECTURE_RATIONALE__JUSTIFIES);

-		}

-		return justifiedBy;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<ArchitectureDecision> getDependsUpon() {

-		if (dependsUpon == null) {

-			dependsUpon = new EObjectWithInverseResolvingEList.ManyInverse<ArchitectureDecision>(ArchitectureDecision.class, this, Iso42010Package.ARCHITECTURE_DECISION__DEPENDS_UPON, Iso42010Package.ARCHITECTURE_DECISION__DEPENDENTS);

-		}

-		return dependsUpon;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<ArchitectureDecision> getDependents() {

-		if (dependents == null) {

-			dependents = new EObjectWithInverseResolvingEList.ManyInverse<ArchitectureDecision>(ArchitectureDecision.class, this, Iso42010Package.ARCHITECTURE_DECISION__DEPENDENTS, Iso42010Package.ARCHITECTURE_DECISION__DEPENDS_UPON);

-		}

-		return dependents;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<Concern> getRaises() {

-		if (raises == null) {

-			raises = new EObjectWithInverseResolvingEList.ManyInverse<Concern>(Concern.class, this, Iso42010Package.ARCHITECTURE_DECISION__RAISES, Iso42010Package.CONCERN__RAISED_BY);

-		}

-		return raises;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<Concern> getPertainsTo() {

-		if (pertainsTo == null) {

-			pertainsTo = new EObjectWithInverseResolvingEList.ManyInverse<Concern>(Concern.class, this, Iso42010Package.ARCHITECTURE_DECISION__PERTAINS_TO, Iso42010Package.CONCERN__DECISIONS);

-		}

-		return pertainsTo;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<ADElement> getAffects() {

-		if (affects == null) {

-			affects = new EObjectWithInverseResolvingEList.ManyInverse<ADElement>(ADElement.class, this, Iso42010Package.ARCHITECTURE_DECISION__AFFECTS, Iso42010Package.AD_ELEMENT__AFFECTED_BY);

-		}

-		return affects;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case Iso42010Package.ARCHITECTURE_DECISION__JUSTIFIED_BY:

-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getJustifiedBy()).basicAdd(otherEnd, msgs);

-		case Iso42010Package.ARCHITECTURE_DECISION__DEPENDS_UPON:

-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getDependsUpon()).basicAdd(otherEnd, msgs);

-		case Iso42010Package.ARCHITECTURE_DECISION__DEPENDENTS:

-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getDependents()).basicAdd(otherEnd, msgs);

-		case Iso42010Package.ARCHITECTURE_DECISION__RAISES:

-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getRaises()).basicAdd(otherEnd, msgs);

-		case Iso42010Package.ARCHITECTURE_DECISION__PERTAINS_TO:

-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getPertainsTo()).basicAdd(otherEnd, msgs);

-		case Iso42010Package.ARCHITECTURE_DECISION__AFFECTS:

-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getAffects()).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 Iso42010Package.ARCHITECTURE_DECISION__JUSTIFIED_BY:

-			return ((InternalEList<?>) getJustifiedBy()).basicRemove(otherEnd, msgs);

-		case Iso42010Package.ARCHITECTURE_DECISION__DEPENDS_UPON:

-			return ((InternalEList<?>) getDependsUpon()).basicRemove(otherEnd, msgs);

-		case Iso42010Package.ARCHITECTURE_DECISION__DEPENDENTS:

-			return ((InternalEList<?>) getDependents()).basicRemove(otherEnd, msgs);

-		case Iso42010Package.ARCHITECTURE_DECISION__RAISES:

-			return ((InternalEList<?>) getRaises()).basicRemove(otherEnd, msgs);

-		case Iso42010Package.ARCHITECTURE_DECISION__PERTAINS_TO:

-			return ((InternalEList<?>) getPertainsTo()).basicRemove(otherEnd, msgs);

-		case Iso42010Package.ARCHITECTURE_DECISION__AFFECTS:

-			return ((InternalEList<?>) getAffects()).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 Iso42010Package.ARCHITECTURE_DECISION__JUSTIFIED_BY:

-			return getJustifiedBy();

-		case Iso42010Package.ARCHITECTURE_DECISION__DEPENDS_UPON:

-			return getDependsUpon();

-		case Iso42010Package.ARCHITECTURE_DECISION__DEPENDENTS:

-			return getDependents();

-		case Iso42010Package.ARCHITECTURE_DECISION__RAISES:

-			return getRaises();

-		case Iso42010Package.ARCHITECTURE_DECISION__PERTAINS_TO:

-			return getPertainsTo();

-		case Iso42010Package.ARCHITECTURE_DECISION__AFFECTS:

-			return getAffects();

-		}

-		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 Iso42010Package.ARCHITECTURE_DECISION__JUSTIFIED_BY:

-			getJustifiedBy().clear();

-			getJustifiedBy().addAll((Collection<? extends ArchitectureRationale>) newValue);

-			return;

-		case Iso42010Package.ARCHITECTURE_DECISION__DEPENDS_UPON:

-			getDependsUpon().clear();

-			getDependsUpon().addAll((Collection<? extends ArchitectureDecision>) newValue);

-			return;

-		case Iso42010Package.ARCHITECTURE_DECISION__DEPENDENTS:

-			getDependents().clear();

-			getDependents().addAll((Collection<? extends ArchitectureDecision>) newValue);

-			return;

-		case Iso42010Package.ARCHITECTURE_DECISION__RAISES:

-			getRaises().clear();

-			getRaises().addAll((Collection<? extends Concern>) newValue);

-			return;

-		case Iso42010Package.ARCHITECTURE_DECISION__PERTAINS_TO:

-			getPertainsTo().clear();

-			getPertainsTo().addAll((Collection<? extends Concern>) newValue);

-			return;

-		case Iso42010Package.ARCHITECTURE_DECISION__AFFECTS:

-			getAffects().clear();

-			getAffects().addAll((Collection<? extends ADElement>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case Iso42010Package.ARCHITECTURE_DECISION__JUSTIFIED_BY:

-			getJustifiedBy().clear();

-			return;

-		case Iso42010Package.ARCHITECTURE_DECISION__DEPENDS_UPON:

-			getDependsUpon().clear();

-			return;

-		case Iso42010Package.ARCHITECTURE_DECISION__DEPENDENTS:

-			getDependents().clear();

-			return;

-		case Iso42010Package.ARCHITECTURE_DECISION__RAISES:

-			getRaises().clear();

-			return;

-		case Iso42010Package.ARCHITECTURE_DECISION__PERTAINS_TO:

-			getPertainsTo().clear();

-			return;

-		case Iso42010Package.ARCHITECTURE_DECISION__AFFECTS:

-			getAffects().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case Iso42010Package.ARCHITECTURE_DECISION__JUSTIFIED_BY:

-			return justifiedBy != null && !justifiedBy.isEmpty();

-		case Iso42010Package.ARCHITECTURE_DECISION__DEPENDS_UPON:

-			return dependsUpon != null && !dependsUpon.isEmpty();

-		case Iso42010Package.ARCHITECTURE_DECISION__DEPENDENTS:

-			return dependents != null && !dependents.isEmpty();

-		case Iso42010Package.ARCHITECTURE_DECISION__RAISES:

-			return raises != null && !raises.isEmpty();

-		case Iso42010Package.ARCHITECTURE_DECISION__PERTAINS_TO:

-			return pertainsTo != null && !pertainsTo.isEmpty();

-		case Iso42010Package.ARCHITECTURE_DECISION__AFFECTS:

-			return affects != null && !affects.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // ArchitectureDecisionImpl

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/ArchitectureDescriptionImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/ArchitectureDescriptionImpl.java
deleted file mode 100755
index 878a1acb62b..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/ArchitectureDescriptionImpl.java
+++ /dev/null
@@ -1,601 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010.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.MinimalEObjectImpl;

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Architecture;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureRationale;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureView;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Concern;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Correspondence;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.CorrespondenceRule;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Architecture Description</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureDescriptionImpl#getStakeholders <em>Stakeholders</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureDescriptionImpl#getConcerns <em>Concerns</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureDescriptionImpl#getViewpoints <em>Viewpoints</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureDescriptionImpl#getViews <em>Views</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureDescriptionImpl#getSystem <em>System</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureDescriptionImpl#getExpresses <em>Expresses</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureDescriptionImpl#getRationales <em>Rationales</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureDescriptionImpl#getCorrespondences <em>Correspondences</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureDescriptionImpl#getRules <em>Rules</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureDescriptionImpl#getDecisions <em>Decisions</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ArchitectureDescriptionImpl extends MinimalEObjectImpl.Container implements ArchitectureDescription {

-	/**

-	 * The cached value of the '{@link #getStakeholders() <em>Stakeholders</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getStakeholders()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Stakeholder> stakeholders;

-

-	/**

-	 * The cached value of the '{@link #getConcerns() <em>Concerns</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getConcerns()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Concern> concerns;

-

-	/**

-	 * The cached value of the '{@link #getViewpoints() <em>Viewpoints</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getViewpoints()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ArchitectureViewpoint> viewpoints;

-

-	/**

-	 * The cached value of the '{@link #getViews() <em>Views</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getViews()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ArchitectureView> views;

-

-	/**

-	 * The cached value of the '{@link #getSystem() <em>System</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getSystem()

-	 * @generated

-	 * @ordered

-	 */

-	protected org.eclipse.papyrus.infra.viewpoints.iso42010.System system;

-

-	/**

-	 * The cached value of the '{@link #getExpresses() <em>Expresses</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getExpresses()

-	 * @generated

-	 * @ordered

-	 */

-	protected Architecture expresses;

-

-	/**

-	 * The cached value of the '{@link #getRationales() <em>Rationales</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getRationales()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ArchitectureRationale> rationales;

-

-	/**

-	 * The cached value of the '{@link #getCorrespondences() <em>Correspondences</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getCorrespondences()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Correspondence> correspondences;

-

-	/**

-	 * The cached value of the '{@link #getRules() <em>Rules</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getRules()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<CorrespondenceRule> rules;

-

-	/**

-	 * The cached value of the '{@link #getDecisions() <em>Decisions</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getDecisions()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ArchitectureDecision> decisions;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ArchitectureDescriptionImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return Iso42010Package.Literals.ARCHITECTURE_DESCRIPTION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<Stakeholder> getStakeholders() {

-		if (stakeholders == null) {

-			stakeholders = new EObjectContainmentEList<Stakeholder>(Stakeholder.class, this, Iso42010Package.ARCHITECTURE_DESCRIPTION__STAKEHOLDERS);

-		}

-		return stakeholders;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<Concern> getConcerns() {

-		if (concerns == null) {

-			concerns = new EObjectContainmentEList<Concern>(Concern.class, this, Iso42010Package.ARCHITECTURE_DESCRIPTION__CONCERNS);

-		}

-		return concerns;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<ArchitectureViewpoint> getViewpoints() {

-		if (viewpoints == null) {

-			viewpoints = new EObjectContainmentEList<ArchitectureViewpoint>(ArchitectureViewpoint.class, this, Iso42010Package.ARCHITECTURE_DESCRIPTION__VIEWPOINTS);

-		}

-		return viewpoints;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<ArchitectureView> getViews() {

-		if (views == null) {

-			views = new EObjectContainmentEList<ArchitectureView>(ArchitectureView.class, this, Iso42010Package.ARCHITECTURE_DESCRIPTION__VIEWS);

-		}

-		return views;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public org.eclipse.papyrus.infra.viewpoints.iso42010.System getSystem() {

-		return system;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetSystem(org.eclipse.papyrus.infra.viewpoints.iso42010.System newSystem, NotificationChain msgs) {

-		org.eclipse.papyrus.infra.viewpoints.iso42010.System oldSystem = system;

-		system = newSystem;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Iso42010Package.ARCHITECTURE_DESCRIPTION__SYSTEM, oldSystem, newSystem);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setSystem(org.eclipse.papyrus.infra.viewpoints.iso42010.System newSystem) {

-		if (newSystem != system) {

-			NotificationChain msgs = null;

-			if (system != null) {

-				msgs = ((InternalEObject) system).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Iso42010Package.ARCHITECTURE_DESCRIPTION__SYSTEM, null, msgs);

-			}

-			if (newSystem != null) {

-				msgs = ((InternalEObject) newSystem).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Iso42010Package.ARCHITECTURE_DESCRIPTION__SYSTEM, null, msgs);

-			}

-			msgs = basicSetSystem(newSystem, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, Iso42010Package.ARCHITECTURE_DESCRIPTION__SYSTEM, newSystem, newSystem));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Architecture getExpresses() {

-		return expresses;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetExpresses(Architecture newExpresses, NotificationChain msgs) {

-		Architecture oldExpresses = expresses;

-		expresses = newExpresses;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Iso42010Package.ARCHITECTURE_DESCRIPTION__EXPRESSES, oldExpresses, newExpresses);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setExpresses(Architecture newExpresses) {

-		if (newExpresses != expresses) {

-			NotificationChain msgs = null;

-			if (expresses != null) {

-				msgs = ((InternalEObject) expresses).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Iso42010Package.ARCHITECTURE_DESCRIPTION__EXPRESSES, null, msgs);

-			}

-			if (newExpresses != null) {

-				msgs = ((InternalEObject) newExpresses).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Iso42010Package.ARCHITECTURE_DESCRIPTION__EXPRESSES, null, msgs);

-			}

-			msgs = basicSetExpresses(newExpresses, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, Iso42010Package.ARCHITECTURE_DESCRIPTION__EXPRESSES, newExpresses, newExpresses));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<ArchitectureRationale> getRationales() {

-		if (rationales == null) {

-			rationales = new EObjectContainmentEList<ArchitectureRationale>(ArchitectureRationale.class, this, Iso42010Package.ARCHITECTURE_DESCRIPTION__RATIONALES);

-		}

-		return rationales;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<Correspondence> getCorrespondences() {

-		if (correspondences == null) {

-			correspondences = new EObjectContainmentEList<Correspondence>(Correspondence.class, this, Iso42010Package.ARCHITECTURE_DESCRIPTION__CORRESPONDENCES);

-		}

-		return correspondences;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<CorrespondenceRule> getRules() {

-		if (rules == null) {

-			rules = new EObjectContainmentEList<CorrespondenceRule>(CorrespondenceRule.class, this, Iso42010Package.ARCHITECTURE_DESCRIPTION__RULES);

-		}

-		return rules;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<ArchitectureDecision> getDecisions() {

-		if (decisions == null) {

-			decisions = new EObjectContainmentEList<ArchitectureDecision>(ArchitectureDecision.class, this, Iso42010Package.ARCHITECTURE_DESCRIPTION__DECISIONS);

-		}

-		return decisions;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__STAKEHOLDERS:

-			return ((InternalEList<?>) getStakeholders()).basicRemove(otherEnd, msgs);

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__CONCERNS:

-			return ((InternalEList<?>) getConcerns()).basicRemove(otherEnd, msgs);

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__VIEWPOINTS:

-			return ((InternalEList<?>) getViewpoints()).basicRemove(otherEnd, msgs);

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__VIEWS:

-			return ((InternalEList<?>) getViews()).basicRemove(otherEnd, msgs);

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__SYSTEM:

-			return basicSetSystem(null, msgs);

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__EXPRESSES:

-			return basicSetExpresses(null, msgs);

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__RATIONALES:

-			return ((InternalEList<?>) getRationales()).basicRemove(otherEnd, msgs);

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__CORRESPONDENCES:

-			return ((InternalEList<?>) getCorrespondences()).basicRemove(otherEnd, msgs);

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__RULES:

-			return ((InternalEList<?>) getRules()).basicRemove(otherEnd, msgs);

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__DECISIONS:

-			return ((InternalEList<?>) getDecisions()).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 Iso42010Package.ARCHITECTURE_DESCRIPTION__STAKEHOLDERS:

-			return getStakeholders();

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__CONCERNS:

-			return getConcerns();

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__VIEWPOINTS:

-			return getViewpoints();

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__VIEWS:

-			return getViews();

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__SYSTEM:

-			return getSystem();

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__EXPRESSES:

-			return getExpresses();

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__RATIONALES:

-			return getRationales();

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__CORRESPONDENCES:

-			return getCorrespondences();

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__RULES:

-			return getRules();

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__DECISIONS:

-			return getDecisions();

-		}

-		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 Iso42010Package.ARCHITECTURE_DESCRIPTION__STAKEHOLDERS:

-			getStakeholders().clear();

-			getStakeholders().addAll((Collection<? extends Stakeholder>) newValue);

-			return;

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__CONCERNS:

-			getConcerns().clear();

-			getConcerns().addAll((Collection<? extends Concern>) newValue);

-			return;

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__VIEWPOINTS:

-			getViewpoints().clear();

-			getViewpoints().addAll((Collection<? extends ArchitectureViewpoint>) newValue);

-			return;

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__VIEWS:

-			getViews().clear();

-			getViews().addAll((Collection<? extends ArchitectureView>) newValue);

-			return;

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__SYSTEM:

-			setSystem((org.eclipse.papyrus.infra.viewpoints.iso42010.System) newValue);

-			return;

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__EXPRESSES:

-			setExpresses((Architecture) newValue);

-			return;

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__RATIONALES:

-			getRationales().clear();

-			getRationales().addAll((Collection<? extends ArchitectureRationale>) newValue);

-			return;

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__CORRESPONDENCES:

-			getCorrespondences().clear();

-			getCorrespondences().addAll((Collection<? extends Correspondence>) newValue);

-			return;

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__RULES:

-			getRules().clear();

-			getRules().addAll((Collection<? extends CorrespondenceRule>) newValue);

-			return;

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__DECISIONS:

-			getDecisions().clear();

-			getDecisions().addAll((Collection<? extends ArchitectureDecision>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__STAKEHOLDERS:

-			getStakeholders().clear();

-			return;

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__CONCERNS:

-			getConcerns().clear();

-			return;

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__VIEWPOINTS:

-			getViewpoints().clear();

-			return;

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__VIEWS:

-			getViews().clear();

-			return;

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__SYSTEM:

-			setSystem((org.eclipse.papyrus.infra.viewpoints.iso42010.System) null);

-			return;

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__EXPRESSES:

-			setExpresses((Architecture) null);

-			return;

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__RATIONALES:

-			getRationales().clear();

-			return;

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__CORRESPONDENCES:

-			getCorrespondences().clear();

-			return;

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__RULES:

-			getRules().clear();

-			return;

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__DECISIONS:

-			getDecisions().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__STAKEHOLDERS:

-			return stakeholders != null && !stakeholders.isEmpty();

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__CONCERNS:

-			return concerns != null && !concerns.isEmpty();

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__VIEWPOINTS:

-			return viewpoints != null && !viewpoints.isEmpty();

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__VIEWS:

-			return views != null && !views.isEmpty();

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__SYSTEM:

-			return system != null;

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__EXPRESSES:

-			return expresses != null;

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__RATIONALES:

-			return rationales != null && !rationales.isEmpty();

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__CORRESPONDENCES:

-			return correspondences != null && !correspondences.isEmpty();

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__RULES:

-			return rules != null && !rules.isEmpty();

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION__DECISIONS:

-			return decisions != null && !decisions.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // ArchitectureDescriptionImpl

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/ArchitectureFrameworkImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/ArchitectureFrameworkImpl.java
deleted file mode 100755
index 053ae6a8334..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/ArchitectureFrameworkImpl.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010.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.MinimalEObjectImpl;

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureFramework;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Concern;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.CorrespondenceRule;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Architecture Framework</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureFrameworkImpl#getStakeholders <em>Stakeholders</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureFrameworkImpl#getViewpoints <em>Viewpoints</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureFrameworkImpl#getRules <em>Rules</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureFrameworkImpl#getConcerns <em>Concerns</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ArchitectureFrameworkImpl extends MinimalEObjectImpl.Container implements ArchitectureFramework {

-	/**

-	 * The cached value of the '{@link #getStakeholders() <em>Stakeholders</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getStakeholders()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Stakeholder> stakeholders;

-

-	/**

-	 * The cached value of the '{@link #getViewpoints() <em>Viewpoints</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getViewpoints()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ArchitectureViewpoint> viewpoints;

-

-	/**

-	 * The cached value of the '{@link #getRules() <em>Rules</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getRules()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<CorrespondenceRule> rules;

-

-	/**

-	 * The cached value of the '{@link #getConcerns() <em>Concerns</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getConcerns()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Concern> concerns;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ArchitectureFrameworkImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return Iso42010Package.Literals.ARCHITECTURE_FRAMEWORK;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<Stakeholder> getStakeholders() {

-		if (stakeholders == null) {

-			stakeholders = new EObjectContainmentEList<Stakeholder>(Stakeholder.class, this, Iso42010Package.ARCHITECTURE_FRAMEWORK__STAKEHOLDERS);

-		}

-		return stakeholders;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<ArchitectureViewpoint> getViewpoints() {

-		if (viewpoints == null) {

-			viewpoints = new EObjectContainmentEList<ArchitectureViewpoint>(ArchitectureViewpoint.class, this, Iso42010Package.ARCHITECTURE_FRAMEWORK__VIEWPOINTS);

-		}

-		return viewpoints;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<CorrespondenceRule> getRules() {

-		if (rules == null) {

-			rules = new EObjectContainmentEList<CorrespondenceRule>(CorrespondenceRule.class, this, Iso42010Package.ARCHITECTURE_FRAMEWORK__RULES);

-		}

-		return rules;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<Concern> getConcerns() {

-		if (concerns == null) {

-			concerns = new EObjectContainmentEList<Concern>(Concern.class, this, Iso42010Package.ARCHITECTURE_FRAMEWORK__CONCERNS);

-		}

-		return concerns;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case Iso42010Package.ARCHITECTURE_FRAMEWORK__STAKEHOLDERS:

-			return ((InternalEList<?>) getStakeholders()).basicRemove(otherEnd, msgs);

-		case Iso42010Package.ARCHITECTURE_FRAMEWORK__VIEWPOINTS:

-			return ((InternalEList<?>) getViewpoints()).basicRemove(otherEnd, msgs);

-		case Iso42010Package.ARCHITECTURE_FRAMEWORK__RULES:

-			return ((InternalEList<?>) getRules()).basicRemove(otherEnd, msgs);

-		case Iso42010Package.ARCHITECTURE_FRAMEWORK__CONCERNS:

-			return ((InternalEList<?>) getConcerns()).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 Iso42010Package.ARCHITECTURE_FRAMEWORK__STAKEHOLDERS:

-			return getStakeholders();

-		case Iso42010Package.ARCHITECTURE_FRAMEWORK__VIEWPOINTS:

-			return getViewpoints();

-		case Iso42010Package.ARCHITECTURE_FRAMEWORK__RULES:

-			return getRules();

-		case Iso42010Package.ARCHITECTURE_FRAMEWORK__CONCERNS:

-			return getConcerns();

-		}

-		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 Iso42010Package.ARCHITECTURE_FRAMEWORK__STAKEHOLDERS:

-			getStakeholders().clear();

-			getStakeholders().addAll((Collection<? extends Stakeholder>) newValue);

-			return;

-		case Iso42010Package.ARCHITECTURE_FRAMEWORK__VIEWPOINTS:

-			getViewpoints().clear();

-			getViewpoints().addAll((Collection<? extends ArchitectureViewpoint>) newValue);

-			return;

-		case Iso42010Package.ARCHITECTURE_FRAMEWORK__RULES:

-			getRules().clear();

-			getRules().addAll((Collection<? extends CorrespondenceRule>) newValue);

-			return;

-		case Iso42010Package.ARCHITECTURE_FRAMEWORK__CONCERNS:

-			getConcerns().clear();

-			getConcerns().addAll((Collection<? extends Concern>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case Iso42010Package.ARCHITECTURE_FRAMEWORK__STAKEHOLDERS:

-			getStakeholders().clear();

-			return;

-		case Iso42010Package.ARCHITECTURE_FRAMEWORK__VIEWPOINTS:

-			getViewpoints().clear();

-			return;

-		case Iso42010Package.ARCHITECTURE_FRAMEWORK__RULES:

-			getRules().clear();

-			return;

-		case Iso42010Package.ARCHITECTURE_FRAMEWORK__CONCERNS:

-			getConcerns().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case Iso42010Package.ARCHITECTURE_FRAMEWORK__STAKEHOLDERS:

-			return stakeholders != null && !stakeholders.isEmpty();

-		case Iso42010Package.ARCHITECTURE_FRAMEWORK__VIEWPOINTS:

-			return viewpoints != null && !viewpoints.isEmpty();

-		case Iso42010Package.ARCHITECTURE_FRAMEWORK__RULES:

-			return rules != null && !rules.isEmpty();

-		case Iso42010Package.ARCHITECTURE_FRAMEWORK__CONCERNS:

-			return concerns != null && !concerns.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // ArchitectureFrameworkImpl

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/ArchitectureImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/ArchitectureImpl.java
deleted file mode 100755
index 5311661695a..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/ArchitectureImpl.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Architecture;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Architecture</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureImpl#getExhibitedIn <em>Exhibited In</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ArchitectureImpl extends MinimalEObjectImpl.Container implements Architecture {

-	/**

-	 * The cached value of the '{@link #getExhibitedIn() <em>Exhibited In</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getExhibitedIn()

-	 * @generated

-	 * @ordered

-	 */

-	protected org.eclipse.papyrus.infra.viewpoints.iso42010.System exhibitedIn;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ArchitectureImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return Iso42010Package.Literals.ARCHITECTURE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public org.eclipse.papyrus.infra.viewpoints.iso42010.System getExhibitedIn() {

-		if (exhibitedIn != null && exhibitedIn.eIsProxy()) {

-			InternalEObject oldExhibitedIn = (InternalEObject) exhibitedIn;

-			exhibitedIn = (org.eclipse.papyrus.infra.viewpoints.iso42010.System) eResolveProxy(oldExhibitedIn);

-			if (exhibitedIn != oldExhibitedIn) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Iso42010Package.ARCHITECTURE__EXHIBITED_IN, oldExhibitedIn, exhibitedIn));

-				}

-			}

-		}

-		return exhibitedIn;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public org.eclipse.papyrus.infra.viewpoints.iso42010.System basicGetExhibitedIn() {

-		return exhibitedIn;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetExhibitedIn(org.eclipse.papyrus.infra.viewpoints.iso42010.System newExhibitedIn, NotificationChain msgs) {

-		org.eclipse.papyrus.infra.viewpoints.iso42010.System oldExhibitedIn = exhibitedIn;

-		exhibitedIn = newExhibitedIn;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Iso42010Package.ARCHITECTURE__EXHIBITED_IN, oldExhibitedIn, newExhibitedIn);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setExhibitedIn(org.eclipse.papyrus.infra.viewpoints.iso42010.System newExhibitedIn) {

-		if (newExhibitedIn != exhibitedIn) {

-			NotificationChain msgs = null;

-			if (exhibitedIn != null) {

-				msgs = ((InternalEObject) exhibitedIn).eInverseRemove(this, Iso42010Package.SYSTEM__EXHIBITS, org.eclipse.papyrus.infra.viewpoints.iso42010.System.class, msgs);

-			}

-			if (newExhibitedIn != null) {

-				msgs = ((InternalEObject) newExhibitedIn).eInverseAdd(this, Iso42010Package.SYSTEM__EXHIBITS, org.eclipse.papyrus.infra.viewpoints.iso42010.System.class, msgs);

-			}

-			msgs = basicSetExhibitedIn(newExhibitedIn, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, Iso42010Package.ARCHITECTURE__EXHIBITED_IN, newExhibitedIn, newExhibitedIn));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case Iso42010Package.ARCHITECTURE__EXHIBITED_IN:

-			if (exhibitedIn != null) {

-				msgs = ((InternalEObject) exhibitedIn).eInverseRemove(this, Iso42010Package.SYSTEM__EXHIBITS, org.eclipse.papyrus.infra.viewpoints.iso42010.System.class, msgs);

-			}

-			return basicSetExhibitedIn((org.eclipse.papyrus.infra.viewpoints.iso42010.System) 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 Iso42010Package.ARCHITECTURE__EXHIBITED_IN:

-			return basicSetExhibitedIn(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 Iso42010Package.ARCHITECTURE__EXHIBITED_IN:

-			if (resolve) {

-				return getExhibitedIn();

-			}

-			return basicGetExhibitedIn();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case Iso42010Package.ARCHITECTURE__EXHIBITED_IN:

-			setExhibitedIn((org.eclipse.papyrus.infra.viewpoints.iso42010.System) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case Iso42010Package.ARCHITECTURE__EXHIBITED_IN:

-			setExhibitedIn((org.eclipse.papyrus.infra.viewpoints.iso42010.System) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case Iso42010Package.ARCHITECTURE__EXHIBITED_IN:

-			return exhibitedIn != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // ArchitectureImpl

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/ArchitectureModelImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/ArchitectureModelImpl.java
deleted file mode 100755
index f3775b8b253..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/ArchitectureModelImpl.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010.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.util.EcoreUtil;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureModel;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureView;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ModelKind;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Architecture Model</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureModelImpl#getGovernedBy <em>Governed By</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureModelImpl#getView <em>View</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ArchitectureModelImpl extends ADElementImpl implements ArchitectureModel {

-	/**

-	 * The cached value of the '{@link #getGovernedBy() <em>Governed By</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getGovernedBy()

-	 * @generated

-	 * @ordered

-	 */

-	protected ModelKind governedBy;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ArchitectureModelImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return Iso42010Package.Literals.ARCHITECTURE_MODEL;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ModelKind getGovernedBy() {

-		if (governedBy != null && governedBy.eIsProxy()) {

-			InternalEObject oldGovernedBy = (InternalEObject) governedBy;

-			governedBy = (ModelKind) eResolveProxy(oldGovernedBy);

-			if (governedBy != oldGovernedBy) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Iso42010Package.ARCHITECTURE_MODEL__GOVERNED_BY, oldGovernedBy, governedBy));

-				}

-			}

-		}

-		return governedBy;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ModelKind basicGetGovernedBy() {

-		return governedBy;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetGovernedBy(ModelKind newGovernedBy, NotificationChain msgs) {

-		ModelKind oldGovernedBy = governedBy;

-		governedBy = newGovernedBy;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Iso42010Package.ARCHITECTURE_MODEL__GOVERNED_BY, oldGovernedBy, newGovernedBy);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setGovernedBy(ModelKind newGovernedBy) {

-		if (newGovernedBy != governedBy) {

-			NotificationChain msgs = null;

-			if (governedBy != null) {

-				msgs = ((InternalEObject) governedBy).eInverseRemove(this, Iso42010Package.MODEL_KIND__GOVERNS, ModelKind.class, msgs);

-			}

-			if (newGovernedBy != null) {

-				msgs = ((InternalEObject) newGovernedBy).eInverseAdd(this, Iso42010Package.MODEL_KIND__GOVERNS, ModelKind.class, msgs);

-			}

-			msgs = basicSetGovernedBy(newGovernedBy, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, Iso42010Package.ARCHITECTURE_MODEL__GOVERNED_BY, newGovernedBy, newGovernedBy));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ArchitectureView getView() {

-		if (eContainerFeatureID() != Iso42010Package.ARCHITECTURE_MODEL__VIEW) {

-			return null;

-		}

-		return (ArchitectureView) eInternalContainer();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetView(ArchitectureView newView, NotificationChain msgs) {

-		msgs = eBasicSetContainer((InternalEObject) newView, Iso42010Package.ARCHITECTURE_MODEL__VIEW, msgs);

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setView(ArchitectureView newView) {

-		if (newView != eInternalContainer() || (eContainerFeatureID() != Iso42010Package.ARCHITECTURE_MODEL__VIEW && newView != null)) {

-			if (EcoreUtil.isAncestor(this, newView)) {

-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());

-			}

-			NotificationChain msgs = null;

-			if (eInternalContainer() != null) {

-				msgs = eBasicRemoveFromContainer(msgs);

-			}

-			if (newView != null) {

-				msgs = ((InternalEObject) newView).eInverseAdd(this, Iso42010Package.ARCHITECTURE_VIEW__MODELS, ArchitectureView.class, msgs);

-			}

-			msgs = basicSetView(newView, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, Iso42010Package.ARCHITECTURE_MODEL__VIEW, newView, newView));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case Iso42010Package.ARCHITECTURE_MODEL__GOVERNED_BY:

-			if (governedBy != null) {

-				msgs = ((InternalEObject) governedBy).eInverseRemove(this, Iso42010Package.MODEL_KIND__GOVERNS, ModelKind.class, msgs);

-			}

-			return basicSetGovernedBy((ModelKind) otherEnd, msgs);

-		case Iso42010Package.ARCHITECTURE_MODEL__VIEW:

-			if (eInternalContainer() != null) {

-				msgs = eBasicRemoveFromContainer(msgs);

-			}

-			return basicSetView((ArchitectureView) 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 Iso42010Package.ARCHITECTURE_MODEL__GOVERNED_BY:

-			return basicSetGovernedBy(null, msgs);

-		case Iso42010Package.ARCHITECTURE_MODEL__VIEW:

-			return basicSetView(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {

-		switch (eContainerFeatureID()) {

-		case Iso42010Package.ARCHITECTURE_MODEL__VIEW:

-			return eInternalContainer().eInverseRemove(this, Iso42010Package.ARCHITECTURE_VIEW__MODELS, ArchitectureView.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 Iso42010Package.ARCHITECTURE_MODEL__GOVERNED_BY:

-			if (resolve) {

-				return getGovernedBy();

-			}

-			return basicGetGovernedBy();

-		case Iso42010Package.ARCHITECTURE_MODEL__VIEW:

-			return getView();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case Iso42010Package.ARCHITECTURE_MODEL__GOVERNED_BY:

-			setGovernedBy((ModelKind) newValue);

-			return;

-		case Iso42010Package.ARCHITECTURE_MODEL__VIEW:

-			setView((ArchitectureView) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case Iso42010Package.ARCHITECTURE_MODEL__GOVERNED_BY:

-			setGovernedBy((ModelKind) null);

-			return;

-		case Iso42010Package.ARCHITECTURE_MODEL__VIEW:

-			setView((ArchitectureView) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case Iso42010Package.ARCHITECTURE_MODEL__GOVERNED_BY:

-			return governedBy != null;

-		case Iso42010Package.ARCHITECTURE_MODEL__VIEW:

-			return getView() != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // ArchitectureModelImpl

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/ArchitectureRationaleImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/ArchitectureRationaleImpl.java
deleted file mode 100755
index fd4d62ab172..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/ArchitectureRationaleImpl.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureRationale;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Architecture Rationale</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureRationaleImpl#getJustifies <em>Justifies</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ArchitectureRationaleImpl extends ADElementImpl implements ArchitectureRationale {

-	/**

-	 * The cached value of the '{@link #getJustifies() <em>Justifies</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getJustifies()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ArchitectureDecision> justifies;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ArchitectureRationaleImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return Iso42010Package.Literals.ARCHITECTURE_RATIONALE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<ArchitectureDecision> getJustifies() {

-		if (justifies == null) {

-			justifies = new EObjectWithInverseResolvingEList.ManyInverse<ArchitectureDecision>(ArchitectureDecision.class, this, Iso42010Package.ARCHITECTURE_RATIONALE__JUSTIFIES, Iso42010Package.ARCHITECTURE_DECISION__JUSTIFIED_BY);

-		}

-		return justifies;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case Iso42010Package.ARCHITECTURE_RATIONALE__JUSTIFIES:

-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getJustifies()).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 Iso42010Package.ARCHITECTURE_RATIONALE__JUSTIFIES:

-			return ((InternalEList<?>) getJustifies()).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 Iso42010Package.ARCHITECTURE_RATIONALE__JUSTIFIES:

-			return getJustifies();

-		}

-		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 Iso42010Package.ARCHITECTURE_RATIONALE__JUSTIFIES:

-			getJustifies().clear();

-			getJustifies().addAll((Collection<? extends ArchitectureDecision>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case Iso42010Package.ARCHITECTURE_RATIONALE__JUSTIFIES:

-			getJustifies().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case Iso42010Package.ARCHITECTURE_RATIONALE__JUSTIFIES:

-			return justifies != null && !justifies.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // ArchitectureRationaleImpl

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/ArchitectureViewImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/ArchitectureViewImpl.java
deleted file mode 100755
index a9e76bea9f9..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/ArchitectureViewImpl.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010.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.util.EObjectContainmentWithInverseEList;

-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureModel;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureView;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Concern;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Architecture View</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureViewImpl#getGovernedBy <em>Governed By</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureViewImpl#getModels <em>Models</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureViewImpl#getAddresses <em>Addresses</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ArchitectureViewImpl extends ADElementImpl implements ArchitectureView {

-	/**

-	 * The cached value of the '{@link #getGovernedBy() <em>Governed By</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getGovernedBy()

-	 * @generated

-	 * @ordered

-	 */

-	protected ArchitectureViewpoint governedBy;

-

-	/**

-	 * The cached value of the '{@link #getModels() <em>Models</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getModels()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ArchitectureModel> models;

-

-	/**

-	 * The cached value of the '{@link #getAddresses() <em>Addresses</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getAddresses()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Concern> addresses;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ArchitectureViewImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return Iso42010Package.Literals.ARCHITECTURE_VIEW;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ArchitectureViewpoint getGovernedBy() {

-		if (governedBy != null && governedBy.eIsProxy()) {

-			InternalEObject oldGovernedBy = (InternalEObject) governedBy;

-			governedBy = (ArchitectureViewpoint) eResolveProxy(oldGovernedBy);

-			if (governedBy != oldGovernedBy) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Iso42010Package.ARCHITECTURE_VIEW__GOVERNED_BY, oldGovernedBy, governedBy));

-				}

-			}

-		}

-		return governedBy;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ArchitectureViewpoint basicGetGovernedBy() {

-		return governedBy;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetGovernedBy(ArchitectureViewpoint newGovernedBy, NotificationChain msgs) {

-		ArchitectureViewpoint oldGovernedBy = governedBy;

-		governedBy = newGovernedBy;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Iso42010Package.ARCHITECTURE_VIEW__GOVERNED_BY, oldGovernedBy, newGovernedBy);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setGovernedBy(ArchitectureViewpoint newGovernedBy) {

-		if (newGovernedBy != governedBy) {

-			NotificationChain msgs = null;

-			if (governedBy != null) {

-				msgs = ((InternalEObject) governedBy).eInverseRemove(this, Iso42010Package.ARCHITECTURE_VIEWPOINT__GOVERNS, ArchitectureViewpoint.class, msgs);

-			}

-			if (newGovernedBy != null) {

-				msgs = ((InternalEObject) newGovernedBy).eInverseAdd(this, Iso42010Package.ARCHITECTURE_VIEWPOINT__GOVERNS, ArchitectureViewpoint.class, msgs);

-			}

-			msgs = basicSetGovernedBy(newGovernedBy, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, Iso42010Package.ARCHITECTURE_VIEW__GOVERNED_BY, newGovernedBy, newGovernedBy));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<ArchitectureModel> getModels() {

-		if (models == null) {

-			models = new EObjectContainmentWithInverseEList<ArchitectureModel>(ArchitectureModel.class, this, Iso42010Package.ARCHITECTURE_VIEW__MODELS, Iso42010Package.ARCHITECTURE_MODEL__VIEW);

-		}

-		return models;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<Concern> getAddresses() {

-		if (addresses == null) {

-			addresses = new EObjectWithInverseResolvingEList.ManyInverse<Concern>(Concern.class, this, Iso42010Package.ARCHITECTURE_VIEW__ADDRESSES, Iso42010Package.CONCERN__ADDRESSED_BY);

-		}

-		return addresses;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case Iso42010Package.ARCHITECTURE_VIEW__GOVERNED_BY:

-			if (governedBy != null) {

-				msgs = ((InternalEObject) governedBy).eInverseRemove(this, Iso42010Package.ARCHITECTURE_VIEWPOINT__GOVERNS, ArchitectureViewpoint.class, msgs);

-			}

-			return basicSetGovernedBy((ArchitectureViewpoint) otherEnd, msgs);

-		case Iso42010Package.ARCHITECTURE_VIEW__MODELS:

-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getModels()).basicAdd(otherEnd, msgs);

-		case Iso42010Package.ARCHITECTURE_VIEW__ADDRESSES:

-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getAddresses()).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 Iso42010Package.ARCHITECTURE_VIEW__GOVERNED_BY:

-			return basicSetGovernedBy(null, msgs);

-		case Iso42010Package.ARCHITECTURE_VIEW__MODELS:

-			return ((InternalEList<?>) getModels()).basicRemove(otherEnd, msgs);

-		case Iso42010Package.ARCHITECTURE_VIEW__ADDRESSES:

-			return ((InternalEList<?>) getAddresses()).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 Iso42010Package.ARCHITECTURE_VIEW__GOVERNED_BY:

-			if (resolve) {

-				return getGovernedBy();

-			}

-			return basicGetGovernedBy();

-		case Iso42010Package.ARCHITECTURE_VIEW__MODELS:

-			return getModels();

-		case Iso42010Package.ARCHITECTURE_VIEW__ADDRESSES:

-			return getAddresses();

-		}

-		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 Iso42010Package.ARCHITECTURE_VIEW__GOVERNED_BY:

-			setGovernedBy((ArchitectureViewpoint) newValue);

-			return;

-		case Iso42010Package.ARCHITECTURE_VIEW__MODELS:

-			getModels().clear();

-			getModels().addAll((Collection<? extends ArchitectureModel>) newValue);

-			return;

-		case Iso42010Package.ARCHITECTURE_VIEW__ADDRESSES:

-			getAddresses().clear();

-			getAddresses().addAll((Collection<? extends Concern>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case Iso42010Package.ARCHITECTURE_VIEW__GOVERNED_BY:

-			setGovernedBy((ArchitectureViewpoint) null);

-			return;

-		case Iso42010Package.ARCHITECTURE_VIEW__MODELS:

-			getModels().clear();

-			return;

-		case Iso42010Package.ARCHITECTURE_VIEW__ADDRESSES:

-			getAddresses().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case Iso42010Package.ARCHITECTURE_VIEW__GOVERNED_BY:

-			return governedBy != null;

-		case Iso42010Package.ARCHITECTURE_VIEW__MODELS:

-			return models != null && !models.isEmpty();

-		case Iso42010Package.ARCHITECTURE_VIEW__ADDRESSES:

-			return addresses != null && !addresses.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // ArchitectureViewImpl

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/ArchitectureViewpointImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/ArchitectureViewpointImpl.java
deleted file mode 100755
index 5646cc08f28..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/ArchitectureViewpointImpl.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010.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.util.EObjectContainmentWithInverseEList;

-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureView;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Concern;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ModelKind;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Architecture Viewpoint</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureViewpointImpl#getModelKinds <em>Model Kinds</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureViewpointImpl#getGoverns <em>Governs</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ArchitectureViewpointImpl#getFrames <em>Frames</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ArchitectureViewpointImpl extends ADElementImpl implements ArchitectureViewpoint {

-	/**

-	 * The cached value of the '{@link #getModelKinds() <em>Model Kinds</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getModelKinds()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ModelKind> modelKinds;

-

-	/**

-	 * The cached value of the '{@link #getGoverns() <em>Governs</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getGoverns()

-	 * @generated

-	 * @ordered

-	 */

-	protected ArchitectureView governs;

-

-	/**

-	 * The cached value of the '{@link #getFrames() <em>Frames</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getFrames()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Concern> frames;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ArchitectureViewpointImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return Iso42010Package.Literals.ARCHITECTURE_VIEWPOINT;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<ModelKind> getModelKinds() {

-		if (modelKinds == null) {

-			modelKinds = new EObjectContainmentWithInverseEList<ModelKind>(ModelKind.class, this, Iso42010Package.ARCHITECTURE_VIEWPOINT__MODEL_KINDS, Iso42010Package.MODEL_KIND__VIEWPOINT);

-		}

-		return modelKinds;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ArchitectureView getGoverns() {

-		if (governs != null && governs.eIsProxy()) {

-			InternalEObject oldGoverns = (InternalEObject) governs;

-			governs = (ArchitectureView) eResolveProxy(oldGoverns);

-			if (governs != oldGoverns) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Iso42010Package.ARCHITECTURE_VIEWPOINT__GOVERNS, oldGoverns, governs));

-				}

-			}

-		}

-		return governs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ArchitectureView basicGetGoverns() {

-		return governs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetGoverns(ArchitectureView newGoverns, NotificationChain msgs) {

-		ArchitectureView oldGoverns = governs;

-		governs = newGoverns;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Iso42010Package.ARCHITECTURE_VIEWPOINT__GOVERNS, oldGoverns, newGoverns);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setGoverns(ArchitectureView newGoverns) {

-		if (newGoverns != governs) {

-			NotificationChain msgs = null;

-			if (governs != null) {

-				msgs = ((InternalEObject) governs).eInverseRemove(this, Iso42010Package.ARCHITECTURE_VIEW__GOVERNED_BY, ArchitectureView.class, msgs);

-			}

-			if (newGoverns != null) {

-				msgs = ((InternalEObject) newGoverns).eInverseAdd(this, Iso42010Package.ARCHITECTURE_VIEW__GOVERNED_BY, ArchitectureView.class, msgs);

-			}

-			msgs = basicSetGoverns(newGoverns, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, Iso42010Package.ARCHITECTURE_VIEWPOINT__GOVERNS, newGoverns, newGoverns));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<Concern> getFrames() {

-		if (frames == null) {

-			frames = new EObjectWithInverseResolvingEList.ManyInverse<Concern>(Concern.class, this, Iso42010Package.ARCHITECTURE_VIEWPOINT__FRAMES, Iso42010Package.CONCERN__FRAMED_BY);

-		}

-		return frames;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case Iso42010Package.ARCHITECTURE_VIEWPOINT__MODEL_KINDS:

-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getModelKinds()).basicAdd(otherEnd, msgs);

-		case Iso42010Package.ARCHITECTURE_VIEWPOINT__GOVERNS:

-			if (governs != null) {

-				msgs = ((InternalEObject) governs).eInverseRemove(this, Iso42010Package.ARCHITECTURE_VIEW__GOVERNED_BY, ArchitectureView.class, msgs);

-			}

-			return basicSetGoverns((ArchitectureView) otherEnd, msgs);

-		case Iso42010Package.ARCHITECTURE_VIEWPOINT__FRAMES:

-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getFrames()).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 Iso42010Package.ARCHITECTURE_VIEWPOINT__MODEL_KINDS:

-			return ((InternalEList<?>) getModelKinds()).basicRemove(otherEnd, msgs);

-		case Iso42010Package.ARCHITECTURE_VIEWPOINT__GOVERNS:

-			return basicSetGoverns(null, msgs);

-		case Iso42010Package.ARCHITECTURE_VIEWPOINT__FRAMES:

-			return ((InternalEList<?>) getFrames()).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 Iso42010Package.ARCHITECTURE_VIEWPOINT__MODEL_KINDS:

-			return getModelKinds();

-		case Iso42010Package.ARCHITECTURE_VIEWPOINT__GOVERNS:

-			if (resolve) {

-				return getGoverns();

-			}

-			return basicGetGoverns();

-		case Iso42010Package.ARCHITECTURE_VIEWPOINT__FRAMES:

-			return getFrames();

-		}

-		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 Iso42010Package.ARCHITECTURE_VIEWPOINT__MODEL_KINDS:

-			getModelKinds().clear();

-			getModelKinds().addAll((Collection<? extends ModelKind>) newValue);

-			return;

-		case Iso42010Package.ARCHITECTURE_VIEWPOINT__GOVERNS:

-			setGoverns((ArchitectureView) newValue);

-			return;

-		case Iso42010Package.ARCHITECTURE_VIEWPOINT__FRAMES:

-			getFrames().clear();

-			getFrames().addAll((Collection<? extends Concern>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case Iso42010Package.ARCHITECTURE_VIEWPOINT__MODEL_KINDS:

-			getModelKinds().clear();

-			return;

-		case Iso42010Package.ARCHITECTURE_VIEWPOINT__GOVERNS:

-			setGoverns((ArchitectureView) null);

-			return;

-		case Iso42010Package.ARCHITECTURE_VIEWPOINT__FRAMES:

-			getFrames().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case Iso42010Package.ARCHITECTURE_VIEWPOINT__MODEL_KINDS:

-			return modelKinds != null && !modelKinds.isEmpty();

-		case Iso42010Package.ARCHITECTURE_VIEWPOINT__GOVERNS:

-			return governs != null;

-		case Iso42010Package.ARCHITECTURE_VIEWPOINT__FRAMES:

-			return frames != null && !frames.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // ArchitectureViewpointImpl

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/ConcernImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/ConcernImpl.java
deleted file mode 100755
index b8a6c5a1cba..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/ConcernImpl.java
+++ /dev/null
@@ -1,345 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureView;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Concern;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Concern</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ConcernImpl#getFramedBy <em>Framed By</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ConcernImpl#getAddressedBy <em>Addressed By</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ConcernImpl#getStakeholders <em>Stakeholders</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ConcernImpl#getRaisedBy <em>Raised By</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ConcernImpl#getDecisions <em>Decisions</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ConcernImpl extends ADElementImpl implements Concern {

-	/**

-	 * The cached value of the '{@link #getFramedBy() <em>Framed By</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getFramedBy()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ArchitectureViewpoint> framedBy;

-

-	/**

-	 * The cached value of the '{@link #getAddressedBy() <em>Addressed By</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getAddressedBy()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ArchitectureView> addressedBy;

-

-	/**

-	 * The cached value of the '{@link #getStakeholders() <em>Stakeholders</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getStakeholders()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Stakeholder> stakeholders;

-

-	/**

-	 * The cached value of the '{@link #getRaisedBy() <em>Raised By</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getRaisedBy()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ArchitectureDecision> raisedBy;

-

-	/**

-	 * The cached value of the '{@link #getDecisions() <em>Decisions</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getDecisions()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ArchitectureDecision> decisions;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ConcernImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return Iso42010Package.Literals.CONCERN;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<ArchitectureViewpoint> getFramedBy() {

-		if (framedBy == null) {

-			framedBy = new EObjectWithInverseResolvingEList.ManyInverse<ArchitectureViewpoint>(ArchitectureViewpoint.class, this, Iso42010Package.CONCERN__FRAMED_BY, Iso42010Package.ARCHITECTURE_VIEWPOINT__FRAMES);

-		}

-		return framedBy;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<ArchitectureView> getAddressedBy() {

-		if (addressedBy == null) {

-			addressedBy = new EObjectWithInverseResolvingEList.ManyInverse<ArchitectureView>(ArchitectureView.class, this, Iso42010Package.CONCERN__ADDRESSED_BY, Iso42010Package.ARCHITECTURE_VIEW__ADDRESSES);

-		}

-		return addressedBy;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<Stakeholder> getStakeholders() {

-		if (stakeholders == null) {

-			stakeholders = new EObjectWithInverseResolvingEList.ManyInverse<Stakeholder>(Stakeholder.class, this, Iso42010Package.CONCERN__STAKEHOLDERS, Iso42010Package.STAKEHOLDER__CONCERNS);

-		}

-		return stakeholders;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<ArchitectureDecision> getRaisedBy() {

-		if (raisedBy == null) {

-			raisedBy = new EObjectWithInverseResolvingEList.ManyInverse<ArchitectureDecision>(ArchitectureDecision.class, this, Iso42010Package.CONCERN__RAISED_BY, Iso42010Package.ARCHITECTURE_DECISION__RAISES);

-		}

-		return raisedBy;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<ArchitectureDecision> getDecisions() {

-		if (decisions == null) {

-			decisions = new EObjectWithInverseResolvingEList.ManyInverse<ArchitectureDecision>(ArchitectureDecision.class, this, Iso42010Package.CONCERN__DECISIONS, Iso42010Package.ARCHITECTURE_DECISION__PERTAINS_TO);

-		}

-		return decisions;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case Iso42010Package.CONCERN__FRAMED_BY:

-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getFramedBy()).basicAdd(otherEnd, msgs);

-		case Iso42010Package.CONCERN__ADDRESSED_BY:

-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getAddressedBy()).basicAdd(otherEnd, msgs);

-		case Iso42010Package.CONCERN__STAKEHOLDERS:

-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getStakeholders()).basicAdd(otherEnd, msgs);

-		case Iso42010Package.CONCERN__RAISED_BY:

-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getRaisedBy()).basicAdd(otherEnd, msgs);

-		case Iso42010Package.CONCERN__DECISIONS:

-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getDecisions()).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 Iso42010Package.CONCERN__FRAMED_BY:

-			return ((InternalEList<?>) getFramedBy()).basicRemove(otherEnd, msgs);

-		case Iso42010Package.CONCERN__ADDRESSED_BY:

-			return ((InternalEList<?>) getAddressedBy()).basicRemove(otherEnd, msgs);

-		case Iso42010Package.CONCERN__STAKEHOLDERS:

-			return ((InternalEList<?>) getStakeholders()).basicRemove(otherEnd, msgs);

-		case Iso42010Package.CONCERN__RAISED_BY:

-			return ((InternalEList<?>) getRaisedBy()).basicRemove(otherEnd, msgs);

-		case Iso42010Package.CONCERN__DECISIONS:

-			return ((InternalEList<?>) getDecisions()).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 Iso42010Package.CONCERN__FRAMED_BY:

-			return getFramedBy();

-		case Iso42010Package.CONCERN__ADDRESSED_BY:

-			return getAddressedBy();

-		case Iso42010Package.CONCERN__STAKEHOLDERS:

-			return getStakeholders();

-		case Iso42010Package.CONCERN__RAISED_BY:

-			return getRaisedBy();

-		case Iso42010Package.CONCERN__DECISIONS:

-			return getDecisions();

-		}

-		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 Iso42010Package.CONCERN__FRAMED_BY:

-			getFramedBy().clear();

-			getFramedBy().addAll((Collection<? extends ArchitectureViewpoint>) newValue);

-			return;

-		case Iso42010Package.CONCERN__ADDRESSED_BY:

-			getAddressedBy().clear();

-			getAddressedBy().addAll((Collection<? extends ArchitectureView>) newValue);

-			return;

-		case Iso42010Package.CONCERN__STAKEHOLDERS:

-			getStakeholders().clear();

-			getStakeholders().addAll((Collection<? extends Stakeholder>) newValue);

-			return;

-		case Iso42010Package.CONCERN__RAISED_BY:

-			getRaisedBy().clear();

-			getRaisedBy().addAll((Collection<? extends ArchitectureDecision>) newValue);

-			return;

-		case Iso42010Package.CONCERN__DECISIONS:

-			getDecisions().clear();

-			getDecisions().addAll((Collection<? extends ArchitectureDecision>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case Iso42010Package.CONCERN__FRAMED_BY:

-			getFramedBy().clear();

-			return;

-		case Iso42010Package.CONCERN__ADDRESSED_BY:

-			getAddressedBy().clear();

-			return;

-		case Iso42010Package.CONCERN__STAKEHOLDERS:

-			getStakeholders().clear();

-			return;

-		case Iso42010Package.CONCERN__RAISED_BY:

-			getRaisedBy().clear();

-			return;

-		case Iso42010Package.CONCERN__DECISIONS:

-			getDecisions().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case Iso42010Package.CONCERN__FRAMED_BY:

-			return framedBy != null && !framedBy.isEmpty();

-		case Iso42010Package.CONCERN__ADDRESSED_BY:

-			return addressedBy != null && !addressedBy.isEmpty();

-		case Iso42010Package.CONCERN__STAKEHOLDERS:

-			return stakeholders != null && !stakeholders.isEmpty();

-		case Iso42010Package.CONCERN__RAISED_BY:

-			return raisedBy != null && !raisedBy.isEmpty();

-		case Iso42010Package.CONCERN__DECISIONS:

-			return decisions != null && !decisions.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // ConcernImpl

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/CorrespondenceImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/CorrespondenceImpl.java
deleted file mode 100755
index 094a932d4bb..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/CorrespondenceImpl.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010.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.MinimalEObjectImpl;

-import org.eclipse.emf.ecore.util.EObjectResolvingEList;

-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ADElement;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Correspondence;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.CorrespondenceRule;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Correspondence</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.CorrespondenceImpl#getGovernedBy <em>Governed By</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.CorrespondenceImpl#getRelates <em>Relates</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class CorrespondenceImpl extends MinimalEObjectImpl.Container implements Correspondence {

-	/**

-	 * The cached value of the '{@link #getGovernedBy() <em>Governed By</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getGovernedBy()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<CorrespondenceRule> governedBy;

-

-	/**

-	 * The cached value of the '{@link #getRelates() <em>Relates</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getRelates()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ADElement> relates;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected CorrespondenceImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return Iso42010Package.Literals.CORRESPONDENCE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<CorrespondenceRule> getGovernedBy() {

-		if (governedBy == null) {

-			governedBy = new EObjectWithInverseResolvingEList.ManyInverse<CorrespondenceRule>(CorrespondenceRule.class, this, Iso42010Package.CORRESPONDENCE__GOVERNED_BY, Iso42010Package.CORRESPONDENCE_RULE__GOVERNS);

-		}

-		return governedBy;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<ADElement> getRelates() {

-		if (relates == null) {

-			relates = new EObjectResolvingEList<ADElement>(ADElement.class, this, Iso42010Package.CORRESPONDENCE__RELATES);

-		}

-		return relates;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case Iso42010Package.CORRESPONDENCE__GOVERNED_BY:

-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getGovernedBy()).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 Iso42010Package.CORRESPONDENCE__GOVERNED_BY:

-			return ((InternalEList<?>) getGovernedBy()).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 Iso42010Package.CORRESPONDENCE__GOVERNED_BY:

-			return getGovernedBy();

-		case Iso42010Package.CORRESPONDENCE__RELATES:

-			return getRelates();

-		}

-		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 Iso42010Package.CORRESPONDENCE__GOVERNED_BY:

-			getGovernedBy().clear();

-			getGovernedBy().addAll((Collection<? extends CorrespondenceRule>) newValue);

-			return;

-		case Iso42010Package.CORRESPONDENCE__RELATES:

-			getRelates().clear();

-			getRelates().addAll((Collection<? extends ADElement>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case Iso42010Package.CORRESPONDENCE__GOVERNED_BY:

-			getGovernedBy().clear();

-			return;

-		case Iso42010Package.CORRESPONDENCE__RELATES:

-			getRelates().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case Iso42010Package.CORRESPONDENCE__GOVERNED_BY:

-			return governedBy != null && !governedBy.isEmpty();

-		case Iso42010Package.CORRESPONDENCE__RELATES:

-			return relates != null && !relates.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // CorrespondenceImpl

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/CorrespondenceRuleImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/CorrespondenceRuleImpl.java
deleted file mode 100755
index ce6d97522a7..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/CorrespondenceRuleImpl.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010.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.MinimalEObjectImpl;

-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Correspondence;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.CorrespondenceRule;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Correspondence Rule</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.CorrespondenceRuleImpl#getGoverns <em>Governs</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class CorrespondenceRuleImpl extends MinimalEObjectImpl.Container implements CorrespondenceRule {

-	/**

-	 * The cached value of the '{@link #getGoverns() <em>Governs</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getGoverns()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Correspondence> governs;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected CorrespondenceRuleImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return Iso42010Package.Literals.CORRESPONDENCE_RULE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<Correspondence> getGoverns() {

-		if (governs == null) {

-			governs = new EObjectWithInverseResolvingEList.ManyInverse<Correspondence>(Correspondence.class, this, Iso42010Package.CORRESPONDENCE_RULE__GOVERNS, Iso42010Package.CORRESPONDENCE__GOVERNED_BY);

-		}

-		return governs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case Iso42010Package.CORRESPONDENCE_RULE__GOVERNS:

-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getGoverns()).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 Iso42010Package.CORRESPONDENCE_RULE__GOVERNS:

-			return ((InternalEList<?>) getGoverns()).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 Iso42010Package.CORRESPONDENCE_RULE__GOVERNS:

-			return getGoverns();

-		}

-		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 Iso42010Package.CORRESPONDENCE_RULE__GOVERNS:

-			getGoverns().clear();

-			getGoverns().addAll((Collection<? extends Correspondence>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case Iso42010Package.CORRESPONDENCE_RULE__GOVERNS:

-			getGoverns().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case Iso42010Package.CORRESPONDENCE_RULE__GOVERNS:

-			return governs != null && !governs.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // CorrespondenceRuleImpl

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/Iso42010FactoryImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/Iso42010FactoryImpl.java
deleted file mode 100755
index 406a37062b4..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/Iso42010FactoryImpl.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.impl.EFactoryImpl;

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Architecture;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureFramework;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureModel;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureRationale;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureView;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Concern;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Correspondence;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.CorrespondenceRule;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Factory;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ModelKind;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class Iso42010FactoryImpl extends EFactoryImpl implements Iso42010Factory {

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static Iso42010Factory init() {

-		try {

-			Iso42010Factory theIso42010Factory = (Iso42010Factory) EPackage.Registry.INSTANCE.getEFactory(Iso42010Package.eNS_URI);

-			if (theIso42010Factory != null) {

-				return theIso42010Factory;

-			}

-		} catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new Iso42010FactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Iso42010FactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION:

-			return createArchitectureDescription();

-		case Iso42010Package.STAKEHOLDER:

-			return createStakeholder();

-		case Iso42010Package.ARCHITECTURE_VIEWPOINT:

-			return createArchitectureViewpoint();

-		case Iso42010Package.MODEL_KIND:

-			return createModelKind();

-		case Iso42010Package.ARCHITECTURE_MODEL:

-			return createArchitectureModel();

-		case Iso42010Package.ARCHITECTURE_VIEW:

-			return createArchitectureView();

-		case Iso42010Package.CONCERN:

-			return createConcern();

-		case Iso42010Package.SYSTEM:

-			return createSystem();

-		case Iso42010Package.ARCHITECTURE:

-			return createArchitecture();

-		case Iso42010Package.ARCHITECTURE_RATIONALE:

-			return createArchitectureRationale();

-		case Iso42010Package.CORRESPONDENCE:

-			return createCorrespondence();

-		case Iso42010Package.CORRESPONDENCE_RULE:

-			return createCorrespondenceRule();

-		case Iso42010Package.ARCHITECTURE_DECISION:

-			return createArchitectureDecision();

-		case Iso42010Package.ARCHITECTURE_FRAMEWORK:

-			return createArchitectureFramework();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ArchitectureDescription createArchitectureDescription() {

-		ArchitectureDescriptionImpl architectureDescription = new ArchitectureDescriptionImpl();

-		return architectureDescription;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Stakeholder createStakeholder() {

-		StakeholderImpl stakeholder = new StakeholderImpl();

-		return stakeholder;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ArchitectureViewpoint createArchitectureViewpoint() {

-		ArchitectureViewpointImpl architectureViewpoint = new ArchitectureViewpointImpl();

-		return architectureViewpoint;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ModelKind createModelKind() {

-		ModelKindImpl modelKind = new ModelKindImpl();

-		return modelKind;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ArchitectureModel createArchitectureModel() {

-		ArchitectureModelImpl architectureModel = new ArchitectureModelImpl();

-		return architectureModel;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ArchitectureView createArchitectureView() {

-		ArchitectureViewImpl architectureView = new ArchitectureViewImpl();

-		return architectureView;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Concern createConcern() {

-		ConcernImpl concern = new ConcernImpl();

-		return concern;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public org.eclipse.papyrus.infra.viewpoints.iso42010.System createSystem() {

-		SystemImpl system = new SystemImpl();

-		return system;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Architecture createArchitecture() {

-		ArchitectureImpl architecture = new ArchitectureImpl();

-		return architecture;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ArchitectureRationale createArchitectureRationale() {

-		ArchitectureRationaleImpl architectureRationale = new ArchitectureRationaleImpl();

-		return architectureRationale;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Correspondence createCorrespondence() {

-		CorrespondenceImpl correspondence = new CorrespondenceImpl();

-		return correspondence;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public CorrespondenceRule createCorrespondenceRule() {

-		CorrespondenceRuleImpl correspondenceRule = new CorrespondenceRuleImpl();

-		return correspondenceRule;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ArchitectureDecision createArchitectureDecision() {

-		ArchitectureDecisionImpl architectureDecision = new ArchitectureDecisionImpl();

-		return architectureDecision;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ArchitectureFramework createArchitectureFramework() {

-		ArchitectureFrameworkImpl architectureFramework = new ArchitectureFrameworkImpl();

-		return architectureFramework;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Iso42010Package getIso42010Package() {

-		return (Iso42010Package) getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static Iso42010Package getPackage() {

-		return Iso42010Package.eINSTANCE;

-	}

-

-} // Iso42010FactoryImpl

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/Iso42010PackageImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/Iso42010PackageImpl.java
deleted file mode 100755
index 1651390debe..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/Iso42010PackageImpl.java
+++ /dev/null
@@ -1,1136 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010.impl;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ADElement;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Architecture;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureFramework;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureModel;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureRationale;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureView;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Concern;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Correspondence;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.CorrespondenceRule;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Factory;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ModelKind;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class Iso42010PackageImpl extends EPackageImpl implements Iso42010Package {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass adElementEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass architectureDescriptionEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass stakeholderEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass architectureViewpointEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass modelKindEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass architectureModelEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass architectureViewEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass concernEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass systemEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass architectureEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass architectureRationaleEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass correspondenceEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass correspondenceRuleEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass architectureDecisionEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass architectureFrameworkEClass = null;

-

-	/**

-	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

-	 * package URI value.

-	 * <p>

-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private Iso42010PackageImpl() {

-		super(eNS_URI, Iso42010Factory.eINSTANCE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private static boolean isInited = false;

-

-	/**

-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 *

-	 * <p>

-	 * This method is used to initialize {@link Iso42010Package#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see #eNS_URI

-	 * @see #createPackageContents()

-	 * @see #initializePackageContents()

-	 * @generated

-	 */

-	public static Iso42010Package init() {

-		if (isInited) {

-			return (Iso42010Package) EPackage.Registry.INSTANCE.getEPackage(Iso42010Package.eNS_URI);

-		}

-

-		// Obtain or create and register package

-		Iso42010PackageImpl theIso42010Package = (Iso42010PackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Iso42010PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Iso42010PackageImpl());

-

-		isInited = true;

-

-		// Create package meta-data objects

-		theIso42010Package.createPackageContents();

-

-		// Initialize created meta-data

-		theIso42010Package.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theIso42010Package.freeze();

-

-

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(Iso42010Package.eNS_URI, theIso42010Package);

-		return theIso42010Package;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getADElement() {

-		return adElementEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getADElement_Name() {

-		return (EAttribute) adElementEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getADElement_AffectedBy() {

-		return (EReference) adElementEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getArchitectureDescription() {

-		return architectureDescriptionEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getArchitectureDescription_Stakeholders() {

-		return (EReference) architectureDescriptionEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getArchitectureDescription_Concerns() {

-		return (EReference) architectureDescriptionEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getArchitectureDescription_Viewpoints() {

-		return (EReference) architectureDescriptionEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getArchitectureDescription_Views() {

-		return (EReference) architectureDescriptionEClass.getEStructuralFeatures().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getArchitectureDescription_System() {

-		return (EReference) architectureDescriptionEClass.getEStructuralFeatures().get(4);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getArchitectureDescription_Expresses() {

-		return (EReference) architectureDescriptionEClass.getEStructuralFeatures().get(5);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getArchitectureDescription_Rationales() {

-		return (EReference) architectureDescriptionEClass.getEStructuralFeatures().get(6);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getArchitectureDescription_Correspondences() {

-		return (EReference) architectureDescriptionEClass.getEStructuralFeatures().get(7);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getArchitectureDescription_Rules() {

-		return (EReference) architectureDescriptionEClass.getEStructuralFeatures().get(8);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getArchitectureDescription_Decisions() {

-		return (EReference) architectureDescriptionEClass.getEStructuralFeatures().get(9);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getStakeholder() {

-		return stakeholderEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getStakeholder_Concerns() {

-		return (EReference) stakeholderEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getStakeholder_Viewpoints() {

-		return (EReference) stakeholderEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getStakeholder_HasInterestIn() {

-		return (EReference) stakeholderEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getArchitectureViewpoint() {

-		return architectureViewpointEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getArchitectureViewpoint_ModelKinds() {

-		return (EReference) architectureViewpointEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getArchitectureViewpoint_Governs() {

-		return (EReference) architectureViewpointEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getArchitectureViewpoint_Frames() {

-		return (EReference) architectureViewpointEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getModelKind() {

-		return modelKindEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getModelKind_Governs() {

-		return (EReference) modelKindEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getModelKind_Viewpoint() {

-		return (EReference) modelKindEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getArchitectureModel() {

-		return architectureModelEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getArchitectureModel_GovernedBy() {

-		return (EReference) architectureModelEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getArchitectureModel_View() {

-		return (EReference) architectureModelEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getArchitectureView() {

-		return architectureViewEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getArchitectureView_GovernedBy() {

-		return (EReference) architectureViewEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getArchitectureView_Models() {

-		return (EReference) architectureViewEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getArchitectureView_Addresses() {

-		return (EReference) architectureViewEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getConcern() {

-		return concernEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getConcern_FramedBy() {

-		return (EReference) concernEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getConcern_AddressedBy() {

-		return (EReference) concernEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getConcern_Stakeholders() {

-		return (EReference) concernEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getConcern_RaisedBy() {

-		return (EReference) concernEClass.getEStructuralFeatures().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getConcern_Decisions() {

-		return (EReference) concernEClass.getEStructuralFeatures().get(4);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getSystem() {

-		return systemEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getSystem_Name() {

-		return (EAttribute) systemEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getSystem_Stakeholders() {

-		return (EReference) systemEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getSystem_Exhibits() {

-		return (EReference) systemEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getArchitecture() {

-		return architectureEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getArchitecture_ExhibitedIn() {

-		return (EReference) architectureEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getArchitectureRationale() {

-		return architectureRationaleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getArchitectureRationale_Justifies() {

-		return (EReference) architectureRationaleEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getCorrespondence() {

-		return correspondenceEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getCorrespondence_GovernedBy() {

-		return (EReference) correspondenceEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getCorrespondence_Relates() {

-		return (EReference) correspondenceEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getCorrespondenceRule() {

-		return correspondenceRuleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getCorrespondenceRule_Governs() {

-		return (EReference) correspondenceRuleEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getArchitectureDecision() {

-		return architectureDecisionEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getArchitectureDecision_JustifiedBy() {

-		return (EReference) architectureDecisionEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getArchitectureDecision_DependsUpon() {

-		return (EReference) architectureDecisionEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getArchitectureDecision_Dependents() {

-		return (EReference) architectureDecisionEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getArchitectureDecision_Raises() {

-		return (EReference) architectureDecisionEClass.getEStructuralFeatures().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getArchitectureDecision_PertainsTo() {

-		return (EReference) architectureDecisionEClass.getEStructuralFeatures().get(4);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getArchitectureDecision_Affects() {

-		return (EReference) architectureDecisionEClass.getEStructuralFeatures().get(5);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getArchitectureFramework() {

-		return architectureFrameworkEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getArchitectureFramework_Stakeholders() {

-		return (EReference) architectureFrameworkEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getArchitectureFramework_Viewpoints() {

-		return (EReference) architectureFrameworkEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getArchitectureFramework_Rules() {

-		return (EReference) architectureFrameworkEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getArchitectureFramework_Concerns() {

-		return (EReference) architectureFrameworkEClass.getEStructuralFeatures().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Iso42010Factory getIso42010Factory() {

-		return (Iso42010Factory) getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * Creates the meta-model objects for the package. This method is

-	 * guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void createPackageContents() {

-		if (isCreated) {

-			return;

-		}

-		isCreated = true;

-

-		// Create classes and their features

-		adElementEClass = createEClass(AD_ELEMENT);

-		createEAttribute(adElementEClass, AD_ELEMENT__NAME);

-		createEReference(adElementEClass, AD_ELEMENT__AFFECTED_BY);

-

-		architectureDescriptionEClass = createEClass(ARCHITECTURE_DESCRIPTION);

-		createEReference(architectureDescriptionEClass, ARCHITECTURE_DESCRIPTION__STAKEHOLDERS);

-		createEReference(architectureDescriptionEClass, ARCHITECTURE_DESCRIPTION__CONCERNS);

-		createEReference(architectureDescriptionEClass, ARCHITECTURE_DESCRIPTION__VIEWPOINTS);

-		createEReference(architectureDescriptionEClass, ARCHITECTURE_DESCRIPTION__VIEWS);

-		createEReference(architectureDescriptionEClass, ARCHITECTURE_DESCRIPTION__SYSTEM);

-		createEReference(architectureDescriptionEClass, ARCHITECTURE_DESCRIPTION__EXPRESSES);

-		createEReference(architectureDescriptionEClass, ARCHITECTURE_DESCRIPTION__RATIONALES);

-		createEReference(architectureDescriptionEClass, ARCHITECTURE_DESCRIPTION__CORRESPONDENCES);

-		createEReference(architectureDescriptionEClass, ARCHITECTURE_DESCRIPTION__RULES);

-		createEReference(architectureDescriptionEClass, ARCHITECTURE_DESCRIPTION__DECISIONS);

-

-		stakeholderEClass = createEClass(STAKEHOLDER);

-		createEReference(stakeholderEClass, STAKEHOLDER__CONCERNS);

-		createEReference(stakeholderEClass, STAKEHOLDER__VIEWPOINTS);

-		createEReference(stakeholderEClass, STAKEHOLDER__HAS_INTEREST_IN);

-

-		architectureViewpointEClass = createEClass(ARCHITECTURE_VIEWPOINT);

-		createEReference(architectureViewpointEClass, ARCHITECTURE_VIEWPOINT__MODEL_KINDS);

-		createEReference(architectureViewpointEClass, ARCHITECTURE_VIEWPOINT__GOVERNS);

-		createEReference(architectureViewpointEClass, ARCHITECTURE_VIEWPOINT__FRAMES);

-

-		modelKindEClass = createEClass(MODEL_KIND);

-		createEReference(modelKindEClass, MODEL_KIND__GOVERNS);

-		createEReference(modelKindEClass, MODEL_KIND__VIEWPOINT);

-

-		architectureModelEClass = createEClass(ARCHITECTURE_MODEL);

-		createEReference(architectureModelEClass, ARCHITECTURE_MODEL__GOVERNED_BY);

-		createEReference(architectureModelEClass, ARCHITECTURE_MODEL__VIEW);

-

-		architectureViewEClass = createEClass(ARCHITECTURE_VIEW);

-		createEReference(architectureViewEClass, ARCHITECTURE_VIEW__GOVERNED_BY);

-		createEReference(architectureViewEClass, ARCHITECTURE_VIEW__MODELS);

-		createEReference(architectureViewEClass, ARCHITECTURE_VIEW__ADDRESSES);

-

-		concernEClass = createEClass(CONCERN);

-		createEReference(concernEClass, CONCERN__FRAMED_BY);

-		createEReference(concernEClass, CONCERN__ADDRESSED_BY);

-		createEReference(concernEClass, CONCERN__STAKEHOLDERS);

-		createEReference(concernEClass, CONCERN__RAISED_BY);

-		createEReference(concernEClass, CONCERN__DECISIONS);

-

-		systemEClass = createEClass(SYSTEM);

-		createEAttribute(systemEClass, SYSTEM__NAME);

-		createEReference(systemEClass, SYSTEM__STAKEHOLDERS);

-		createEReference(systemEClass, SYSTEM__EXHIBITS);

-

-		architectureEClass = createEClass(ARCHITECTURE);

-		createEReference(architectureEClass, ARCHITECTURE__EXHIBITED_IN);

-

-		architectureRationaleEClass = createEClass(ARCHITECTURE_RATIONALE);

-		createEReference(architectureRationaleEClass, ARCHITECTURE_RATIONALE__JUSTIFIES);

-

-		correspondenceEClass = createEClass(CORRESPONDENCE);

-		createEReference(correspondenceEClass, CORRESPONDENCE__GOVERNED_BY);

-		createEReference(correspondenceEClass, CORRESPONDENCE__RELATES);

-

-		correspondenceRuleEClass = createEClass(CORRESPONDENCE_RULE);

-		createEReference(correspondenceRuleEClass, CORRESPONDENCE_RULE__GOVERNS);

-

-		architectureDecisionEClass = createEClass(ARCHITECTURE_DECISION);

-		createEReference(architectureDecisionEClass, ARCHITECTURE_DECISION__JUSTIFIED_BY);

-		createEReference(architectureDecisionEClass, ARCHITECTURE_DECISION__DEPENDS_UPON);

-		createEReference(architectureDecisionEClass, ARCHITECTURE_DECISION__DEPENDENTS);

-		createEReference(architectureDecisionEClass, ARCHITECTURE_DECISION__RAISES);

-		createEReference(architectureDecisionEClass, ARCHITECTURE_DECISION__PERTAINS_TO);

-		createEReference(architectureDecisionEClass, ARCHITECTURE_DECISION__AFFECTS);

-

-		architectureFrameworkEClass = createEClass(ARCHITECTURE_FRAMEWORK);

-		createEReference(architectureFrameworkEClass, ARCHITECTURE_FRAMEWORK__STAKEHOLDERS);

-		createEReference(architectureFrameworkEClass, ARCHITECTURE_FRAMEWORK__VIEWPOINTS);

-		createEReference(architectureFrameworkEClass, ARCHITECTURE_FRAMEWORK__RULES);

-		createEReference(architectureFrameworkEClass, ARCHITECTURE_FRAMEWORK__CONCERNS);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * Complete the initialization of the package and its meta-model. This

-	 * method is guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void initializePackageContents() {

-		if (isInitialized) {

-			return;

-		}

-		isInitialized = true;

-

-		// Initialize package

-		setName(eNAME);

-		setNsPrefix(eNS_PREFIX);

-		setNsURI(eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		stakeholderEClass.getESuperTypes().add(this.getADElement());

-		architectureViewpointEClass.getESuperTypes().add(this.getADElement());

-		modelKindEClass.getESuperTypes().add(this.getADElement());

-		architectureModelEClass.getESuperTypes().add(this.getADElement());

-		architectureViewEClass.getESuperTypes().add(this.getADElement());

-		concernEClass.getESuperTypes().add(this.getADElement());

-		architectureRationaleEClass.getESuperTypes().add(this.getADElement());

-		architectureDecisionEClass.getESuperTypes().add(this.getADElement());

-

-		// Initialize classes, features, and operations; add parameters

-		initEClass(adElementEClass, ADElement.class, "ADElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getADElement_Name(), ecorePackage.getEString(), "name", null, 1, 1, ADElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getADElement_AffectedBy(), this.getArchitectureDecision(), this.getArchitectureDecision_Affects(), "affectedBy", null, 0, -1, ADElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,

-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(architectureDescriptionEClass, ArchitectureDescription.class, "ArchitectureDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getArchitectureDescription_Stakeholders(), this.getStakeholder(), null, "stakeholders", null, 1, -1, ArchitectureDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getArchitectureDescription_Concerns(), this.getConcern(), null, "concerns", null, 1, -1, ArchitectureDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,

-				!IS_DERIVED, IS_ORDERED);

-		initEReference(getArchitectureDescription_Viewpoints(), this.getArchitectureViewpoint(), null, "viewpoints", null, 1, -1, ArchitectureDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getArchitectureDescription_Views(), this.getArchitectureView(), null, "views", null, 1, -1, ArchitectureDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,

-				!IS_DERIVED, IS_ORDERED);

-		initEReference(getArchitectureDescription_System(), this.getSystem(), null, "system", null, 1, 1, ArchitectureDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,

-				IS_ORDERED);

-		initEReference(getArchitectureDescription_Expresses(), this.getArchitecture(), null, "expresses", null, 1, 1, ArchitectureDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,

-				!IS_DERIVED, IS_ORDERED);

-		initEReference(getArchitectureDescription_Rationales(), this.getArchitectureRationale(), null, "rationales", null, 1, -1, ArchitectureDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getArchitectureDescription_Correspondences(), this.getCorrespondence(), null, "correspondences", null, 0, -1, ArchitectureDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getArchitectureDescription_Rules(), this.getCorrespondenceRule(), null, "rules", null, 0, -1, ArchitectureDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,

-				!IS_DERIVED, IS_ORDERED);

-		initEReference(getArchitectureDescription_Decisions(), this.getArchitectureDecision(), null, "decisions", null, 0, -1, ArchitectureDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(stakeholderEClass, Stakeholder.class, "Stakeholder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getStakeholder_Concerns(), this.getConcern(), this.getConcern_Stakeholders(), "concerns", null, 1, -1, Stakeholder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,

-				!IS_DERIVED, IS_ORDERED);

-		initEReference(getStakeholder_Viewpoints(), this.getArchitectureViewpoint(), null, "viewpoints", null, 1, -1, Stakeholder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,

-				IS_ORDERED);

-		initEReference(getStakeholder_HasInterestIn(), this.getSystem(), this.getSystem_Stakeholders(), "hasInterestIn", null, 1, 1, Stakeholder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,

-				!IS_DERIVED, IS_ORDERED);

-

-		initEClass(architectureViewpointEClass, ArchitectureViewpoint.class, "ArchitectureViewpoint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getArchitectureViewpoint_ModelKinds(), this.getModelKind(), this.getModelKind_Viewpoint(), "modelKinds", null, 1, -1, ArchitectureViewpoint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,

-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getArchitectureViewpoint_Governs(), this.getArchitectureView(), this.getArchitectureView_GovernedBy(), "governs", null, 1, 1, ArchitectureViewpoint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,

-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getArchitectureViewpoint_Frames(), this.getConcern(), this.getConcern_FramedBy(), "frames", null, 1, -1, ArchitectureViewpoint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(modelKindEClass, ModelKind.class, "ModelKind", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getModelKind_Governs(), this.getArchitectureModel(), this.getArchitectureModel_GovernedBy(), "governs", null, 1, -1, ModelKind.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getModelKind_Viewpoint(), this.getArchitectureViewpoint(), this.getArchitectureViewpoint_ModelKinds(), "viewpoint", null, 1, 1, ModelKind.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,

-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(architectureModelEClass, ArchitectureModel.class, "ArchitectureModel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getArchitectureModel_GovernedBy(), this.getModelKind(), this.getModelKind_Governs(), "governedBy", null, 1, 1, ArchitectureModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getArchitectureModel_View(), this.getArchitectureView(), this.getArchitectureView_Models(), "view", null, 1, 1, ArchitectureModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(architectureViewEClass, ArchitectureView.class, "ArchitectureView", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getArchitectureView_GovernedBy(), this.getArchitectureViewpoint(), this.getArchitectureViewpoint_Governs(), "governedBy", null, 1, 1, ArchitectureView.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,

-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getArchitectureView_Models(), this.getArchitectureModel(), this.getArchitectureModel_View(), "models", null, 1, -1, ArchitectureView.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getArchitectureView_Addresses(), this.getConcern(), this.getConcern_AddressedBy(), "addresses", null, 1, -1, ArchitectureView.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(concernEClass, Concern.class, "Concern", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getConcern_FramedBy(), this.getArchitectureViewpoint(), this.getArchitectureViewpoint_Frames(), "framedBy", null, 1, -1, Concern.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getConcern_AddressedBy(), this.getArchitectureView(), this.getArchitectureView_Addresses(), "addressedBy", null, 1, -1, Concern.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getConcern_Stakeholders(), this.getStakeholder(), this.getStakeholder_Concerns(), "stakeholders", null, 1, -1, Concern.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,

-				!IS_DERIVED, IS_ORDERED);

-		initEReference(getConcern_RaisedBy(), this.getArchitectureDecision(), this.getArchitectureDecision_Raises(), "raisedBy", null, 0, -1, Concern.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getConcern_Decisions(), this.getArchitectureDecision(), this.getArchitectureDecision_PertainsTo(), "decisions", null, 0, -1, Concern.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(systemEClass, org.eclipse.papyrus.infra.viewpoints.iso42010.System.class, "System", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getSystem_Name(), ecorePackage.getEString(), "name", null, 1, 1, org.eclipse.papyrus.infra.viewpoints.iso42010.System.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getSystem_Stakeholders(), this.getStakeholder(), this.getStakeholder_HasInterestIn(), "stakeholders", null, 1, -1, org.eclipse.papyrus.infra.viewpoints.iso42010.System.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,

-				IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getSystem_Exhibits(), this.getArchitecture(), this.getArchitecture_ExhibitedIn(), "exhibits", null, 1, 1, org.eclipse.papyrus.infra.viewpoints.iso42010.System.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,

-				IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(architectureEClass, Architecture.class, "Architecture", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getArchitecture_ExhibitedIn(), this.getSystem(), this.getSystem_Exhibits(), "exhibitedIn", null, 1, 1, Architecture.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,

-				!IS_DERIVED, IS_ORDERED);

-

-		initEClass(architectureRationaleEClass, ArchitectureRationale.class, "ArchitectureRationale", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getArchitectureRationale_Justifies(), this.getArchitectureDecision(), this.getArchitectureDecision_JustifiedBy(), "justifies", null, 1, -1, ArchitectureRationale.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,

-				IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(correspondenceEClass, Correspondence.class, "Correspondence", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getCorrespondence_GovernedBy(), this.getCorrespondenceRule(), this.getCorrespondenceRule_Governs(), "governedBy", null, 0, -1, Correspondence.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,

-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getCorrespondence_Relates(), this.getADElement(), null, "relates", null, 2, -1, Correspondence.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(correspondenceRuleEClass, CorrespondenceRule.class, "CorrespondenceRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getCorrespondenceRule_Governs(), this.getCorrespondence(), this.getCorrespondence_GovernedBy(), "governs", null, 1, -1, CorrespondenceRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,

-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(architectureDecisionEClass, ArchitectureDecision.class, "ArchitectureDecision", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getArchitectureDecision_JustifiedBy(), this.getArchitectureRationale(), this.getArchitectureRationale_Justifies(), "justifiedBy", null, 0, -1, ArchitectureDecision.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,

-				IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getArchitectureDecision_DependsUpon(), this.getArchitectureDecision(), this.getArchitectureDecision_Dependents(), "dependsUpon", null, 0, -1, ArchitectureDecision.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,

-				IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getArchitectureDecision_Dependents(), this.getArchitectureDecision(), this.getArchitectureDecision_DependsUpon(), "dependents", null, 0, -1, ArchitectureDecision.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,

-				IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getArchitectureDecision_Raises(), this.getConcern(), this.getConcern_RaisedBy(), "raises", null, 0, -1, ArchitectureDecision.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getArchitectureDecision_PertainsTo(), this.getConcern(), this.getConcern_Decisions(), "pertainsTo", null, 1, -1, ArchitectureDecision.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getArchitectureDecision_Affects(), this.getADElement(), this.getADElement_AffectedBy(), "affects", null, 1, -1, ArchitectureDecision.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(architectureFrameworkEClass, ArchitectureFramework.class, "ArchitectureFramework", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getArchitectureFramework_Stakeholders(), this.getStakeholder(), null, "stakeholders", null, 1, -1, ArchitectureFramework.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,

-				!IS_DERIVED, IS_ORDERED);

-		initEReference(getArchitectureFramework_Viewpoints(), this.getArchitectureViewpoint(), null, "viewpoints", null, 1, -1, ArchitectureFramework.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getArchitectureFramework_Rules(), this.getCorrespondenceRule(), null, "rules", null, 0, -1, ArchitectureFramework.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,

-				!IS_DERIVED, IS_ORDERED);

-		initEReference(getArchitectureFramework_Concerns(), this.getConcern(), null, "concerns", null, 1, -1, ArchitectureFramework.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,

-				IS_ORDERED);

-

-		// Create resource

-		createResource(eNS_URI);

-	}

-

-} // Iso42010PackageImpl

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/ModelKindImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/ModelKindImpl.java
deleted file mode 100755
index 4dfc2fd7174..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/ModelKindImpl.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010.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.util.EObjectWithInverseResolvingEList;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureModel;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ModelKind;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Model Kind</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ModelKindImpl#getGoverns <em>Governs</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.ModelKindImpl#getViewpoint <em>Viewpoint</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ModelKindImpl extends ADElementImpl implements ModelKind {

-	/**

-	 * The cached value of the '{@link #getGoverns() <em>Governs</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getGoverns()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ArchitectureModel> governs;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ModelKindImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return Iso42010Package.Literals.MODEL_KIND;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<ArchitectureModel> getGoverns() {

-		if (governs == null) {

-			governs = new EObjectWithInverseResolvingEList<ArchitectureModel>(ArchitectureModel.class, this, Iso42010Package.MODEL_KIND__GOVERNS, Iso42010Package.ARCHITECTURE_MODEL__GOVERNED_BY);

-		}

-		return governs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ArchitectureViewpoint getViewpoint() {

-		if (eContainerFeatureID() != Iso42010Package.MODEL_KIND__VIEWPOINT) {

-			return null;

-		}

-		return (ArchitectureViewpoint) eInternalContainer();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetViewpoint(ArchitectureViewpoint newViewpoint, NotificationChain msgs) {

-		msgs = eBasicSetContainer((InternalEObject) newViewpoint, Iso42010Package.MODEL_KIND__VIEWPOINT, msgs);

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setViewpoint(ArchitectureViewpoint newViewpoint) {

-		if (newViewpoint != eInternalContainer() || (eContainerFeatureID() != Iso42010Package.MODEL_KIND__VIEWPOINT && newViewpoint != null)) {

-			if (EcoreUtil.isAncestor(this, newViewpoint)) {

-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());

-			}

-			NotificationChain msgs = null;

-			if (eInternalContainer() != null) {

-				msgs = eBasicRemoveFromContainer(msgs);

-			}

-			if (newViewpoint != null) {

-				msgs = ((InternalEObject) newViewpoint).eInverseAdd(this, Iso42010Package.ARCHITECTURE_VIEWPOINT__MODEL_KINDS, ArchitectureViewpoint.class, msgs);

-			}

-			msgs = basicSetViewpoint(newViewpoint, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, Iso42010Package.MODEL_KIND__VIEWPOINT, newViewpoint, newViewpoint));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case Iso42010Package.MODEL_KIND__GOVERNS:

-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getGoverns()).basicAdd(otherEnd, msgs);

-		case Iso42010Package.MODEL_KIND__VIEWPOINT:

-			if (eInternalContainer() != null) {

-				msgs = eBasicRemoveFromContainer(msgs);

-			}

-			return basicSetViewpoint((ArchitectureViewpoint) 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 Iso42010Package.MODEL_KIND__GOVERNS:

-			return ((InternalEList<?>) getGoverns()).basicRemove(otherEnd, msgs);

-		case Iso42010Package.MODEL_KIND__VIEWPOINT:

-			return basicSetViewpoint(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {

-		switch (eContainerFeatureID()) {

-		case Iso42010Package.MODEL_KIND__VIEWPOINT:

-			return eInternalContainer().eInverseRemove(this, Iso42010Package.ARCHITECTURE_VIEWPOINT__MODEL_KINDS, ArchitectureViewpoint.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 Iso42010Package.MODEL_KIND__GOVERNS:

-			return getGoverns();

-		case Iso42010Package.MODEL_KIND__VIEWPOINT:

-			return getViewpoint();

-		}

-		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 Iso42010Package.MODEL_KIND__GOVERNS:

-			getGoverns().clear();

-			getGoverns().addAll((Collection<? extends ArchitectureModel>) newValue);

-			return;

-		case Iso42010Package.MODEL_KIND__VIEWPOINT:

-			setViewpoint((ArchitectureViewpoint) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case Iso42010Package.MODEL_KIND__GOVERNS:

-			getGoverns().clear();

-			return;

-		case Iso42010Package.MODEL_KIND__VIEWPOINT:

-			setViewpoint((ArchitectureViewpoint) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case Iso42010Package.MODEL_KIND__GOVERNS:

-			return governs != null && !governs.isEmpty();

-		case Iso42010Package.MODEL_KIND__VIEWPOINT:

-			return getViewpoint() != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // ModelKindImpl

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/StakeholderImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/StakeholderImpl.java
deleted file mode 100755
index 6d0403806dd..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/StakeholderImpl.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010.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.util.EObjectResolvingEList;

-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Concern;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Stakeholder</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.StakeholderImpl#getConcerns <em>Concerns</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.StakeholderImpl#getViewpoints <em>Viewpoints</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.StakeholderImpl#getHasInterestIn <em>Has Interest In</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class StakeholderImpl extends ADElementImpl implements Stakeholder {

-	/**

-	 * The cached value of the '{@link #getConcerns() <em>Concerns</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getConcerns()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Concern> concerns;

-

-	/**

-	 * The cached value of the '{@link #getViewpoints() <em>Viewpoints</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getViewpoints()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ArchitectureViewpoint> viewpoints;

-

-	/**

-	 * The cached value of the '{@link #getHasInterestIn() <em>Has Interest In</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getHasInterestIn()

-	 * @generated

-	 * @ordered

-	 */

-	protected org.eclipse.papyrus.infra.viewpoints.iso42010.System hasInterestIn;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected StakeholderImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return Iso42010Package.Literals.STAKEHOLDER;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<Concern> getConcerns() {

-		if (concerns == null) {

-			concerns = new EObjectWithInverseResolvingEList.ManyInverse<Concern>(Concern.class, this, Iso42010Package.STAKEHOLDER__CONCERNS, Iso42010Package.CONCERN__STAKEHOLDERS);

-		}

-		return concerns;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<ArchitectureViewpoint> getViewpoints() {

-		if (viewpoints == null) {

-			viewpoints = new EObjectResolvingEList<ArchitectureViewpoint>(ArchitectureViewpoint.class, this, Iso42010Package.STAKEHOLDER__VIEWPOINTS);

-		}

-		return viewpoints;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public org.eclipse.papyrus.infra.viewpoints.iso42010.System getHasInterestIn() {

-		if (hasInterestIn != null && hasInterestIn.eIsProxy()) {

-			InternalEObject oldHasInterestIn = (InternalEObject) hasInterestIn;

-			hasInterestIn = (org.eclipse.papyrus.infra.viewpoints.iso42010.System) eResolveProxy(oldHasInterestIn);

-			if (hasInterestIn != oldHasInterestIn) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Iso42010Package.STAKEHOLDER__HAS_INTEREST_IN, oldHasInterestIn, hasInterestIn));

-				}

-			}

-		}

-		return hasInterestIn;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public org.eclipse.papyrus.infra.viewpoints.iso42010.System basicGetHasInterestIn() {

-		return hasInterestIn;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetHasInterestIn(org.eclipse.papyrus.infra.viewpoints.iso42010.System newHasInterestIn, NotificationChain msgs) {

-		org.eclipse.papyrus.infra.viewpoints.iso42010.System oldHasInterestIn = hasInterestIn;

-		hasInterestIn = newHasInterestIn;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Iso42010Package.STAKEHOLDER__HAS_INTEREST_IN, oldHasInterestIn, newHasInterestIn);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setHasInterestIn(org.eclipse.papyrus.infra.viewpoints.iso42010.System newHasInterestIn) {

-		if (newHasInterestIn != hasInterestIn) {

-			NotificationChain msgs = null;

-			if (hasInterestIn != null) {

-				msgs = ((InternalEObject) hasInterestIn).eInverseRemove(this, Iso42010Package.SYSTEM__STAKEHOLDERS, org.eclipse.papyrus.infra.viewpoints.iso42010.System.class, msgs);

-			}

-			if (newHasInterestIn != null) {

-				msgs = ((InternalEObject) newHasInterestIn).eInverseAdd(this, Iso42010Package.SYSTEM__STAKEHOLDERS, org.eclipse.papyrus.infra.viewpoints.iso42010.System.class, msgs);

-			}

-			msgs = basicSetHasInterestIn(newHasInterestIn, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, Iso42010Package.STAKEHOLDER__HAS_INTEREST_IN, newHasInterestIn, newHasInterestIn));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case Iso42010Package.STAKEHOLDER__CONCERNS:

-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getConcerns()).basicAdd(otherEnd, msgs);

-		case Iso42010Package.STAKEHOLDER__HAS_INTEREST_IN:

-			if (hasInterestIn != null) {

-				msgs = ((InternalEObject) hasInterestIn).eInverseRemove(this, Iso42010Package.SYSTEM__STAKEHOLDERS, org.eclipse.papyrus.infra.viewpoints.iso42010.System.class, msgs);

-			}

-			return basicSetHasInterestIn((org.eclipse.papyrus.infra.viewpoints.iso42010.System) 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 Iso42010Package.STAKEHOLDER__CONCERNS:

-			return ((InternalEList<?>) getConcerns()).basicRemove(otherEnd, msgs);

-		case Iso42010Package.STAKEHOLDER__HAS_INTEREST_IN:

-			return basicSetHasInterestIn(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 Iso42010Package.STAKEHOLDER__CONCERNS:

-			return getConcerns();

-		case Iso42010Package.STAKEHOLDER__VIEWPOINTS:

-			return getViewpoints();

-		case Iso42010Package.STAKEHOLDER__HAS_INTEREST_IN:

-			if (resolve) {

-				return getHasInterestIn();

-			}

-			return basicGetHasInterestIn();

-		}

-		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 Iso42010Package.STAKEHOLDER__CONCERNS:

-			getConcerns().clear();

-			getConcerns().addAll((Collection<? extends Concern>) newValue);

-			return;

-		case Iso42010Package.STAKEHOLDER__VIEWPOINTS:

-			getViewpoints().clear();

-			getViewpoints().addAll((Collection<? extends ArchitectureViewpoint>) newValue);

-			return;

-		case Iso42010Package.STAKEHOLDER__HAS_INTEREST_IN:

-			setHasInterestIn((org.eclipse.papyrus.infra.viewpoints.iso42010.System) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case Iso42010Package.STAKEHOLDER__CONCERNS:

-			getConcerns().clear();

-			return;

-		case Iso42010Package.STAKEHOLDER__VIEWPOINTS:

-			getViewpoints().clear();

-			return;

-		case Iso42010Package.STAKEHOLDER__HAS_INTEREST_IN:

-			setHasInterestIn((org.eclipse.papyrus.infra.viewpoints.iso42010.System) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case Iso42010Package.STAKEHOLDER__CONCERNS:

-			return concerns != null && !concerns.isEmpty();

-		case Iso42010Package.STAKEHOLDER__VIEWPOINTS:

-			return viewpoints != null && !viewpoints.isEmpty();

-		case Iso42010Package.STAKEHOLDER__HAS_INTEREST_IN:

-			return hasInterestIn != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // StakeholderImpl

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/SystemImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/SystemImpl.java
deleted file mode 100755
index faac8a250e7..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/impl/SystemImpl.java
+++ /dev/null
@@ -1,367 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010.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.MinimalEObjectImpl;

-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Architecture;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>System</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.SystemImpl#getName <em>Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.SystemImpl#getStakeholders <em>Stakeholders</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.iso42010.impl.SystemImpl#getExhibits <em>Exhibits</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class SystemImpl extends MinimalEObjectImpl.Container implements org.eclipse.papyrus.infra.viewpoints.iso42010.System {

-	/**

-	 * 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;

-

-	/**

-	 * The cached value of the '{@link #getStakeholders() <em>Stakeholders</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getStakeholders()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Stakeholder> stakeholders;

-

-	/**

-	 * The cached value of the '{@link #getExhibits() <em>Exhibits</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getExhibits()

-	 * @generated

-	 * @ordered

-	 */

-	protected Architecture exhibits;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected SystemImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return Iso42010Package.Literals.SYSTEM;

-	}

-

-	/**

-	 * <!-- 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, Iso42010Package.SYSTEM__NAME, oldName, name));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<Stakeholder> getStakeholders() {

-		if (stakeholders == null) {

-			stakeholders = new EObjectWithInverseResolvingEList<Stakeholder>(Stakeholder.class, this, Iso42010Package.SYSTEM__STAKEHOLDERS, Iso42010Package.STAKEHOLDER__HAS_INTEREST_IN);

-		}

-		return stakeholders;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Architecture getExhibits() {

-		if (exhibits != null && exhibits.eIsProxy()) {

-			InternalEObject oldExhibits = (InternalEObject) exhibits;

-			exhibits = (Architecture) eResolveProxy(oldExhibits);

-			if (exhibits != oldExhibits) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Iso42010Package.SYSTEM__EXHIBITS, oldExhibits, exhibits));

-				}

-			}

-		}

-		return exhibits;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Architecture basicGetExhibits() {

-		return exhibits;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetExhibits(Architecture newExhibits, NotificationChain msgs) {

-		Architecture oldExhibits = exhibits;

-		exhibits = newExhibits;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Iso42010Package.SYSTEM__EXHIBITS, oldExhibits, newExhibits);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setExhibits(Architecture newExhibits) {

-		if (newExhibits != exhibits) {

-			NotificationChain msgs = null;

-			if (exhibits != null) {

-				msgs = ((InternalEObject) exhibits).eInverseRemove(this, Iso42010Package.ARCHITECTURE__EXHIBITED_IN, Architecture.class, msgs);

-			}

-			if (newExhibits != null) {

-				msgs = ((InternalEObject) newExhibits).eInverseAdd(this, Iso42010Package.ARCHITECTURE__EXHIBITED_IN, Architecture.class, msgs);

-			}

-			msgs = basicSetExhibits(newExhibits, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, Iso42010Package.SYSTEM__EXHIBITS, newExhibits, newExhibits));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case Iso42010Package.SYSTEM__STAKEHOLDERS:

-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getStakeholders()).basicAdd(otherEnd, msgs);

-		case Iso42010Package.SYSTEM__EXHIBITS:

-			if (exhibits != null) {

-				msgs = ((InternalEObject) exhibits).eInverseRemove(this, Iso42010Package.ARCHITECTURE__EXHIBITED_IN, Architecture.class, msgs);

-			}

-			return basicSetExhibits((Architecture) 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 Iso42010Package.SYSTEM__STAKEHOLDERS:

-			return ((InternalEList<?>) getStakeholders()).basicRemove(otherEnd, msgs);

-		case Iso42010Package.SYSTEM__EXHIBITS:

-			return basicSetExhibits(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 Iso42010Package.SYSTEM__NAME:

-			return getName();

-		case Iso42010Package.SYSTEM__STAKEHOLDERS:

-			return getStakeholders();

-		case Iso42010Package.SYSTEM__EXHIBITS:

-			if (resolve) {

-				return getExhibits();

-			}

-			return basicGetExhibits();

-		}

-		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 Iso42010Package.SYSTEM__NAME:

-			setName((String) newValue);

-			return;

-		case Iso42010Package.SYSTEM__STAKEHOLDERS:

-			getStakeholders().clear();

-			getStakeholders().addAll((Collection<? extends Stakeholder>) newValue);

-			return;

-		case Iso42010Package.SYSTEM__EXHIBITS:

-			setExhibits((Architecture) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case Iso42010Package.SYSTEM__NAME:

-			setName(NAME_EDEFAULT);

-			return;

-		case Iso42010Package.SYSTEM__STAKEHOLDERS:

-			getStakeholders().clear();

-			return;

-		case Iso42010Package.SYSTEM__EXHIBITS:

-			setExhibits((Architecture) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case Iso42010Package.SYSTEM__NAME:

-			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

-		case Iso42010Package.SYSTEM__STAKEHOLDERS:

-			return stakeholders != null && !stakeholders.isEmpty();

-		case Iso42010Package.SYSTEM__EXHIBITS:

-			return exhibits != 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(" (name: ");

-		result.append(name);

-		result.append(')');

-		return result.toString();

-	}

-

-} // SystemImpl

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/util/Iso42010AdapterFactory.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/util/Iso42010AdapterFactory.java
deleted file mode 100755
index 125347a090b..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/util/Iso42010AdapterFactory.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010.util;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ADElement;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Architecture;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureFramework;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureModel;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureRationale;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureView;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Concern;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Correspondence;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.CorrespondenceRule;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ModelKind;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Adapter Factory</b> for the model.

- * It provides an adapter <code>createXXX</code> method for each class of the model.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package

- * @generated

- */

-public class Iso42010AdapterFactory extends AdapterFactoryImpl {

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static Iso42010Package modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Iso42010AdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = Iso42010Package.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Returns whether this factory is applicable for the type of the object.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return whether this factory is applicable for the type of the object.

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

-			return true;

-		}

-		if (object instanceof EObject) {

-			return ((EObject) object).eClass().getEPackage() == modelPackage;

-		}

-		return false;

-	}

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Iso42010Switch<Adapter> modelSwitch =

-			new Iso42010Switch<Adapter>() {

-				@Override

-				public Adapter caseADElement(ADElement object) {

-					return createADElementAdapter();

-				}

-

-				@Override

-				public Adapter caseArchitectureDescription(ArchitectureDescription object) {

-					return createArchitectureDescriptionAdapter();

-				}

-

-				@Override

-				public Adapter caseStakeholder(Stakeholder object) {

-					return createStakeholderAdapter();

-				}

-

-				@Override

-				public Adapter caseArchitectureViewpoint(ArchitectureViewpoint object) {

-					return createArchitectureViewpointAdapter();

-				}

-

-				@Override

-				public Adapter caseModelKind(ModelKind object) {

-					return createModelKindAdapter();

-				}

-

-				@Override

-				public Adapter caseArchitectureModel(ArchitectureModel object) {

-					return createArchitectureModelAdapter();

-				}

-

-				@Override

-				public Adapter caseArchitectureView(ArchitectureView object) {

-					return createArchitectureViewAdapter();

-				}

-

-				@Override

-				public Adapter caseConcern(Concern object) {

-					return createConcernAdapter();

-				}

-

-				@Override

-				public Adapter caseSystem(org.eclipse.papyrus.infra.viewpoints.iso42010.System object) {

-					return createSystemAdapter();

-				}

-

-				@Override

-				public Adapter caseArchitecture(Architecture object) {

-					return createArchitectureAdapter();

-				}

-

-				@Override

-				public Adapter caseArchitectureRationale(ArchitectureRationale object) {

-					return createArchitectureRationaleAdapter();

-				}

-

-				@Override

-				public Adapter caseCorrespondence(Correspondence object) {

-					return createCorrespondenceAdapter();

-				}

-

-				@Override

-				public Adapter caseCorrespondenceRule(CorrespondenceRule object) {

-					return createCorrespondenceRuleAdapter();

-				}

-

-				@Override

-				public Adapter caseArchitectureDecision(ArchitectureDecision object) {

-					return createArchitectureDecisionAdapter();

-				}

-

-				@Override

-				public Adapter caseArchitectureFramework(ArchitectureFramework object) {

-					return createArchitectureFrameworkAdapter();

-				}

-

-				@Override

-				public Adapter defaultCase(EObject object) {

-					return createEObjectAdapter();

-				}

-			};

-

-	/**

-	 * Creates an adapter for the <code>target</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param target

-	 *            the object to adapt.

-	 * @return the adapter for the <code>target</code>.

-	 * @generated

-	 */

-	@Override

-	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject) target);

-	}

-

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ADElement <em>AD Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ADElement

-	 * @generated

-	 */

-	public Adapter createADElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription <em>Architecture Description</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription

-	 * @generated

-	 */

-	public Adapter createArchitectureDescriptionAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder <em>Stakeholder</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder

-	 * @generated

-	 */

-	public Adapter createStakeholderAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint <em>Architecture Viewpoint</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint

-	 * @generated

-	 */

-	public Adapter createArchitectureViewpointAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ModelKind <em>Model Kind</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ModelKind

-	 * @generated

-	 */

-	public Adapter createModelKindAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureModel <em>Architecture Model</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureModel

-	 * @generated

-	 */

-	public Adapter createArchitectureModelAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureView <em>Architecture View</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureView

-	 * @generated

-	 */

-	public Adapter createArchitectureViewAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Concern <em>Concern</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Concern

-	 * @generated

-	 */

-	public Adapter createConcernAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.System <em>System</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.System

-	 * @generated

-	 */

-	public Adapter createSystemAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Architecture <em>Architecture</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Architecture

-	 * @generated

-	 */

-	public Adapter createArchitectureAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureRationale <em>Architecture Rationale</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureRationale

-	 * @generated

-	 */

-	public Adapter createArchitectureRationaleAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.Correspondence <em>Correspondence</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Correspondence

-	 * @generated

-	 */

-	public Adapter createCorrespondenceAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.CorrespondenceRule <em>Correspondence Rule</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.CorrespondenceRule

-	 * @generated

-	 */

-	public Adapter createCorrespondenceRuleAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision <em>Architecture Decision</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision

-	 * @generated

-	 */

-	public Adapter createArchitectureDecisionAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureFramework <em>Architecture Framework</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureFramework

-	 * @generated

-	 */

-	public Adapter createArchitectureFrameworkAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for the default case.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @generated

-	 */

-	public Adapter createEObjectAdapter() {

-		return null;

-	}

-

-} // Iso42010AdapterFactory

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/util/Iso42010Switch.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/util/Iso42010Switch.java
deleted file mode 100755
index 48537a448c9..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/src/org/eclipse/papyrus/infra/viewpoints/iso42010/util/Iso42010Switch.java
+++ /dev/null
@@ -1,518 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.iso42010.util;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ADElement;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Architecture;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDecision;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureDescription;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureFramework;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureModel;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureRationale;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureView;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Concern;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Correspondence;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.CorrespondenceRule;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.ModelKind;

-import org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

- * starting with the actual class of the object

- * and proceeding up the inheritance hierarchy

- * until a non-null result is returned,

- * which is the result of the switch.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package

- * @generated

- */

-public class Iso42010Switch<T> extends Switch<T> {

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static Iso42010Package modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Iso42010Switch() {

-		if (modelPackage == null) {

-			modelPackage = Iso42010Package.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Checks whether this is a switch for the given package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @parameter ePackage the package in question.

-	 * @return whether this is a switch for the given package.

-	 * @generated

-	 */

-	@Override

-	protected boolean isSwitchFor(EPackage ePackage) {

-		return ePackage == modelPackage;

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	@Override

-	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-		case Iso42010Package.AD_ELEMENT: {

-			ADElement adElement = (ADElement) theEObject;

-			T result = caseADElement(adElement);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case Iso42010Package.ARCHITECTURE_DESCRIPTION: {

-			ArchitectureDescription architectureDescription = (ArchitectureDescription) theEObject;

-			T result = caseArchitectureDescription(architectureDescription);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case Iso42010Package.STAKEHOLDER: {

-			Stakeholder stakeholder = (Stakeholder) theEObject;

-			T result = caseStakeholder(stakeholder);

-			if (result == null) {

-				result = caseADElement(stakeholder);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case Iso42010Package.ARCHITECTURE_VIEWPOINT: {

-			ArchitectureViewpoint architectureViewpoint = (ArchitectureViewpoint) theEObject;

-			T result = caseArchitectureViewpoint(architectureViewpoint);

-			if (result == null) {

-				result = caseADElement(architectureViewpoint);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case Iso42010Package.MODEL_KIND: {

-			ModelKind modelKind = (ModelKind) theEObject;

-			T result = caseModelKind(modelKind);

-			if (result == null) {

-				result = caseADElement(modelKind);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case Iso42010Package.ARCHITECTURE_MODEL: {

-			ArchitectureModel architectureModel = (ArchitectureModel) theEObject;

-			T result = caseArchitectureModel(architectureModel);

-			if (result == null) {

-				result = caseADElement(architectureModel);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case Iso42010Package.ARCHITECTURE_VIEW: {

-			ArchitectureView architectureView = (ArchitectureView) theEObject;

-			T result = caseArchitectureView(architectureView);

-			if (result == null) {

-				result = caseADElement(architectureView);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case Iso42010Package.CONCERN: {

-			Concern concern = (Concern) theEObject;

-			T result = caseConcern(concern);

-			if (result == null) {

-				result = caseADElement(concern);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case Iso42010Package.SYSTEM: {

-			org.eclipse.papyrus.infra.viewpoints.iso42010.System system = (org.eclipse.papyrus.infra.viewpoints.iso42010.System) theEObject;

-			T result = caseSystem(system);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case Iso42010Package.ARCHITECTURE: {

-			Architecture architecture = (Architecture) theEObject;

-			T result = caseArchitecture(architecture);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case Iso42010Package.ARCHITECTURE_RATIONALE: {

-			ArchitectureRationale architectureRationale = (ArchitectureRationale) theEObject;

-			T result = caseArchitectureRationale(architectureRationale);

-			if (result == null) {

-				result = caseADElement(architectureRationale);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case Iso42010Package.CORRESPONDENCE: {

-			Correspondence correspondence = (Correspondence) theEObject;

-			T result = caseCorrespondence(correspondence);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case Iso42010Package.CORRESPONDENCE_RULE: {

-			CorrespondenceRule correspondenceRule = (CorrespondenceRule) theEObject;

-			T result = caseCorrespondenceRule(correspondenceRule);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case Iso42010Package.ARCHITECTURE_DECISION: {

-			ArchitectureDecision architectureDecision = (ArchitectureDecision) theEObject;

-			T result = caseArchitectureDecision(architectureDecision);

-			if (result == null) {

-				result = caseADElement(architectureDecision);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case Iso42010Package.ARCHITECTURE_FRAMEWORK: {

-			ArchitectureFramework architectureFramework = (ArchitectureFramework) theEObject;

-			T result = caseArchitectureFramework(architectureFramework);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>AD Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>AD Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseADElement(ADElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Architecture Description</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>Architecture Description</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseArchitectureDescription(ArchitectureDescription object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Stakeholder</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>Stakeholder</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseStakeholder(Stakeholder object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Architecture Viewpoint</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>Architecture Viewpoint</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseArchitectureViewpoint(ArchitectureViewpoint object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Model Kind</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>Model Kind</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseModelKind(ModelKind object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Architecture Model</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>Architecture Model</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseArchitectureModel(ArchitectureModel object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Architecture View</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>Architecture View</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseArchitectureView(ArchitectureView object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Concern</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>Concern</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseConcern(Concern object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>System</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>System</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseSystem(org.eclipse.papyrus.infra.viewpoints.iso42010.System object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Architecture</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>Architecture</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseArchitecture(Architecture object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Architecture Rationale</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>Architecture Rationale</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseArchitectureRationale(ArchitectureRationale object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Correspondence</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>Correspondence</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseCorrespondence(Correspondence object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Correspondence Rule</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>Correspondence Rule</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseCorrespondenceRule(CorrespondenceRule object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Architecture Decision</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>Architecture Decision</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseArchitectureDecision(ArchitectureDecision object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Architecture Framework</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>Architecture Framework</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseArchitectureFramework(ArchitectureFramework object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch, but this is the last case anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

-	 * @generated

-	 */

-	@Override

-	public T defaultCase(EObject object) {

-		return null;

-	}

-

-} // Iso42010Switch

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF
index 892eaad5336..718a04164d7 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF
@@ -1,23 +1,32 @@
 Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.viewpoints.policy,
- org.eclipse.papyrus.infra.viewpoints.policy.listener,
+Export-Package: org.eclipse.papyrus.infra.viewpoints.configuration,
+ org.eclipse.papyrus.infra.viewpoints.configuration.impl,
+ org.eclipse.papyrus.infra.viewpoints.configuration.util,
+ org.eclipse.papyrus.infra.viewpoints.policy,
  org.eclipse.papyrus.infra.viewpoints.policy.query,
  org.eclipse.papyrus.infra.viewpoints.style,
  org.eclipse.papyrus.infra.viewpoints.style.impl,
  org.eclipse.papyrus.infra.viewpoints.style.util
 Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)";visibility:=reexport,
+ org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.core.architecture;visibility:=reexport,
+ org.eclipse.papyrus.infra.viewpoints.policy;visibility:=reexport,
  org.eclipse.gmf.runtime.notation;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
  org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)",
  org.eclipse.papyrus.infra.core.pluginexplorer;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.viewpoints.iso42010;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.types;visibility:=reexport,
  org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.architecture;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.architecture.representation;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.nattable.representation;bundle-version="[1.0.0,2.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/build.properties b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/build.properties
index 1aa2624ab66..2e1d2cc1451 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/build.properties
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/build.properties
@@ -1,14 +1,13 @@
-source.. = src/,\

-           src-gen/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               about.html,\

-               plugin.properties,\

-               builtin/,\

-               messages.properties,\

-               icons/,\

-               schema/,\

-               model/

-src.includes = about.html

+source.. = src/,\
+           src-gen/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               about.html,\
+               plugin.properties,\
+               messages.properties,\
+               icons/,\
+               schema/,\
+               model/
+src.includes = about.html
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration
deleted file mode 100755
index 6d2c68ceacf..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<configuration:PapyrusConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmi:id="_7wLmkNxhEeOqHvRyiN87hA" defaultStakeholder="_7wLmkdxhEeOqHvRyiN87hA">

-  <stakeholders xmi:id="_7wLmkdxhEeOqHvRyiN87hA" name="Default Modeler" viewpoints="_7wLmktxhEeOqHvRyiN87hA"/>

-  <viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="_7wLmktxhEeOqHvRyiN87hA" name="Default Papyrus Viewpoint"/>

-  <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>

-  <categories xmi:id="_7wNb4txhEeOqHvRyiN87hA" name="uml"/>

-  <categories xmi:id="_7wNb49xhEeOqHvRyiN87hA" name="sysml"/>

-  <categories xmi:id="_7wNb5NxhEeOqHvRyiN87hA" name="profile"/>

-  <categories xmi:id="_7wNb5dxhEeOqHvRyiN87hA" name="generic"/>

-</configuration:PapyrusConfiguration>

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/model/configuration.ecore b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/model/configuration.ecore
new file mode 100644
index 00000000000..4c9ff521845
--- /dev/null
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/model/configuration.ecore
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="configuration" nsURI="http://www.eclipse.org/papyrus/infra/viewpoints/configuration"
+    nsPrefix="configuration">
+  <eClassifiers xsi:type="ecore:EClass" name="PapyrusView">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="icon" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="implementationID" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="PapyrusDiagram" eSuperTypes="#//PapyrusView"/>
+  <eClassifiers xsi:type="ecore:EClass" name="PapyrusSyncTable" eSuperTypes="#//PapyrusView"/>
+  <eClassifiers xsi:type="ecore:EClass" name="PapyrusTable" eSuperTypes="#//PapyrusView"/>
+</ecore:EPackage>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/model/configuration.genmodel b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/model/configuration.genmodel
new file mode 100755
index 00000000000..b2052ed963e
--- /dev/null
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/model/configuration.genmodel
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2015 CEA LIST and others.&#xD;&#xA;&#xD;&#xA; All rights reserved. This program and the accompanying materials&#xD;&#xA; are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA; which accompanies this distribution, and is available at&#xD;&#xA; http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA; &#xD;&#xA; Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation&#xD;&#xA; &#xD;&#xA;"
+    modelDirectory="/org.eclipse.papyrus.infra.viewpoints.policy/src-gen" creationIcons="false"
+    editDirectory="/org.eclipse.papyrus.infra.viewpoints.policy.edit/src-gen" editorDirectory="/org.eclipse.papyrus.infra.viewpoints.policy.editor/src-gen"
+    modelPluginID="org.eclipse.papyrus.infra.viewpoints.policy" modelName="Configuration"
+    editPluginClass="org.eclipse.papyrus.infra.viewpoints.style.provider.StyleEditPlugin"
+    editorPluginClass="org.eclipse.papyrus.infra.viewpoints.style.presentation.StyleEditorPlugin"
+    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" codeFormatting="true"
+    testsDirectory="/org.eclipse.papyrus.infra.viewpoints.policy.tests/src-gen" importerID="org.eclipse.emf.importer.ecore"
+    complianceLevel="6.0" copyrightFields="false" editPluginID="org.eclipse.papyrus.infra.viewpoints.policy.edit"
+    editorPluginID="org.eclipse.papyrus.infra.viewpoints.policy.editor" operationReflection="true"
+    importOrganizing="true" cleanup="true">
+  <foreignModel>configuration.ecore</foreignModel>
+  <genPackages prefix="Configuration" basePackage="org.eclipse.papyrus.infra.viewpoints"
+      disposableProviderFactory="true" generateExampleClass="false" extensibleProviderFactory="true"
+      childCreationExtenders="true" ecorePackage="configuration.ecore#/">
+    <genClasses ecoreClass="configuration.ecore#//PapyrusView">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute configuration.ecore#//PapyrusView/name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute configuration.ecore#//PapyrusView/icon"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute configuration.ecore#//PapyrusView/implementationID"/>
+    </genClasses>
+    <genClasses ecoreClass="configuration.ecore#//PapyrusDiagram"/>
+    <genClasses ecoreClass="configuration.ecore#//PapyrusSyncTable"/>
+    <genClasses ecoreClass="configuration.ecore#//PapyrusTable"/>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/model/style.ecore b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/model/style.ecore
index e5b84a950e0..ee7c05211e2 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/model/style.ecore
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/model/style.ecore
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="style" nsURI="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style"

-    nsPrefix="style">

-  <eClassifiers xsi:type="ecore:EClass" name="PapyrusViewStyle" eSuperTypes="../../org.eclipse.gmf.runtime.notation/model/notation.ecore#//Style">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="owner" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="configuration" eType="ecore:EClass ../../org.eclipse.papyrus.infra.viewpoints.configuration/model/configuration.ecore#//PapyrusView"/>

-  </eClassifiers>

-</ecore:EPackage>

+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="style" nsURI="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style"
+    nsPrefix="style">
+  <eClassifiers xsi:type="ecore:EClass" name="PapyrusViewStyle" eSuperTypes="../../org.eclipse.gmf.runtime.notation/model/notation.ecore#//Style">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="owner" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="configuration" eType="ecore:EClass configuration.ecore#//PapyrusView"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/model/style.genmodel b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/model/style.genmodel
index 0ee548a293e..23e208890fa 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/model/style.genmodel
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/model/style.genmodel
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2013 CEA LIST.&#xD;&#xA;&#xD;&#xA; All rights reserved. This program and the accompanying materials&#xD;&#xA; are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA; which accompanies this distribution, and is available at&#xD;&#xA; http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA; &#xD;&#xA; Contributors:&#xD;&#xA; Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation&#xD;&#xA; &#xD;&#xA;"
-    modelDirectory="/org.eclipse.papyrus.infra.viewpoints.policy/src-gen" modelPluginID="org.eclipse.papyrus.infra.viewpoints.policy"
-    modelName="Style" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    modelDirectory="/org.eclipse.papyrus.infra.viewpoints.policy/src-gen" editDirectory="/org.eclipse.papyrus.infra.viewpoints.policy.edit/src-gen"
+    editorDirectory="/org.eclipse.papyrus.infra.viewpoints.policy.editor/src-gen"
+    modelPluginID="org.eclipse.papyrus.infra.viewpoints.policy" modelName="Style"
+    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory="/org.eclipse.papyrus.infra.viewpoints.policy.tests/src-gen"
+    testSuiteClass="org.eclipse.papyrus.infra.viewpoints.configuration.tests.StyleAllTests"
     importerID="org.eclipse.emf.importer.ecore" complianceLevel="6.0" copyrightFields="false"
-    language="" usedGenPackages="../../org.eclipse.papyrus.infra.viewpoints.configuration/model/configuration.genmodel#//configuration platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.papyrus.infra.viewpoints.iso42010/model/iso42010.genmodel#//iso42010 ../../org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation ../../org.eclipse.papyrus.infra.constraints/Model/Constraints.genmodel#//constraints"
+    language="" usedGenPackages="configuration.genmodel#//configuration platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation"
     operationReflection="true" importOrganizing="true">
   <foreignModel>style.ecore</foreignModel>
   <genPackages prefix="Style" basePackage="org.eclipse.papyrus.infra.viewpoints" resource="XMI"
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/plugin.xml b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/plugin.xml
index 190ef26820a..5879f89eedf 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/plugin.xml
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/plugin.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <plugin>
-   <extension-point id="org.eclipse.papyrus.infra.viewpoints.policy.custom" name="Custom Viewpoints Policy" schema="schema/custom.exsd"/>
    <extension-point id="org.eclipse.papyrus.infra.viewpoints.policy.profilehelper" name="Viewpoints Policy Profile Helper" schema="schema/profilehelper.exsd"/>
    <extension-point id="org.eclipse.papyrus.infra.viewpoints.policy.viewType" name="View Type Definition" schema="schema/viewType.exsd"/>
-   <extension-point id="org.eclipse.papyrus.infra.viewpoints.policy.policycheckerlistener" name="PolicyChecker Listener" schema="schema/policycheckerlistener.exsd"/>
    <extension
          point="org.eclipse.emf.ecore.generated_package">
       <package
@@ -49,11 +47,19 @@
       <view
             category="org.eclipse.papyrus.views.category"
             class="org.eclipse.papyrus.infra.viewpoints.policy.ViewpointExplorer"
-            icon="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/obj16/PapyrusViewpoint.png"
+            icon="platform:/plugin/org.eclipse.papyrus.infra.core.architecture.edit/icons/full/obj16/ArchitectureViewpoint.gif"
             id="org.eclipse.papyrus.infra.viewpoints.policy.ViewpointExplorer"
             name="Viewpoint Explorer">
       </view>
    </extension>
 
 
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated configuration -->
+      <package
+            uri="http://www.eclipse.org/papyrus/infra/viewpoints/configuration"
+            class="org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage"
+            genModel="model/configuration.genmodel"/>
+   </extension>
+
 </plugin>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/schema/custom.exsd b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/schema/custom.exsd
deleted file mode 100755
index e626d8e4a34..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/schema/custom.exsd
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.viewpoints.policy" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appinfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.viewpoints.policy" id="org.eclipse.papyrus.infra.viewpoints.policy.custom" name="Custom Viewpoints Policy"/>

-      </appinfo>

-      <documentation>

-         Definition of Papyrus viewpoints configuration.

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appinfo>

-            <meta.element />

-         </appinfo>

-      </annotation>

-      <complexType>

-         <sequence>

-            <element ref="configuration" minOccurs="0" maxOccurs="unbounded"/>

-            <element ref="contribution" minOccurs="0" maxOccurs="unbounded"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute translatable="true"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="configuration">

-      <annotation>

-         <documentation>

-            Represents the definition of a custom viewpoints configuration

-         </documentation>

-      </annotation>

-      <complexType>

-         <attribute name="file" type="string" use="required">

-            <annotation>

-               <documentation>

-                  URI of a .configuration file containing the Papyrus viewpoints configuration to be applied

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="resource"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-         <attribute name="priority" type="string" use="required">

-            <annotation>

-               <documentation>

-                  Priority of the policy between 0 (least) and 100 (most)

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="contribution">

-      <annotation>

-         <documentation>

-            Represents the contribution to an existing configuration

-         </documentation>

-      </annotation>

-      <complexType>

-         <attribute name="original" type="string" use="required">

-            <annotation>

-               <documentation>

-                  The original configuration that is contributed to

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="resource"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-         <attribute name="file" type="string" use="required">

-            <annotation>

-               <documentation>

-                  The configuration that is contributing

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="resource"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-

-

-

-

-

-</schema>

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/schema/policycheckerlistener.exsd b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/schema/policycheckerlistener.exsd
index 45e9ff9d96b..c344da218fa 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/schema/policycheckerlistener.exsd
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/schema/policycheckerlistener.exsd
@@ -1,102 +1,102 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.viewpoints.policy" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appinfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.viewpoints.policy" id="org.eclipse.papyrus.infra.viewpoints.policy.policycheckerlistener" name="PolicyChecker Listener"/>

-      </appinfo>

-      <documentation>

-         [Enter description of this extension point.]

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appinfo>

-            <meta.element />

-         </appinfo>

-      </annotation>

-      <complexType>

-         <sequence>

-            <element ref="policycheckerlistener"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute translatable="true"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="policycheckerlistener">

-      <complexType>

-         <attribute name="listenerClass" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.viewpoints.policy.listener.IPolicyCheckerListener"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="since"/>

-      </appinfo>

-      <documentation>

-         [Enter the first release in which this extension point appears.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="examples"/>

-      </appinfo>

-      <documentation>

-         [Enter extension point usage example here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="apiinfo"/>

-      </appinfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="implementation"/>

-      </appinfo>

-      <documentation>

-         [Enter information about supplied implementation of this extension point.]

-      </documentation>

-   </annotation>

-

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.viewpoints.policy" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.viewpoints.policy" id="org.eclipse.papyrus.infra.viewpoints.policy.policycheckerlistener" name="PolicyChecker Listener"/>
+      </appinfo>
+      <documentation>
+         [Enter description of this extension point.]
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="policycheckerlistener"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute translatable="true"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="policycheckerlistener">
+      <complexType>
+         <attribute name="listenerClass" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.viewpoints.policy.listener.IPolicyCheckerListener"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="since"/>
+      </appinfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="examples"/>
+      </appinfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="apiinfo"/>
+      </appinfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="implementation"/>
+      </appinfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+
+</schema>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/ConfigurationFactory.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/ConfigurationFactory.java
new file mode 100644
index 00000000000..3cb264bdf85
--- /dev/null
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/ConfigurationFactory.java
@@ -0,0 +1,80 @@
+/**
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  CEA LIST - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.viewpoints.configuration;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage
+ * @generated
+ */
+public interface ConfigurationFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	ConfigurationFactory eINSTANCE = org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Papyrus View</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Papyrus View</em>'.
+	 * @generated
+	 */
+	PapyrusView createPapyrusView();
+
+	/**
+	 * Returns a new object of class '<em>Papyrus Diagram</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Papyrus Diagram</em>'.
+	 * @generated
+	 */
+	PapyrusDiagram createPapyrusDiagram();
+
+	/**
+	 * Returns a new object of class '<em>Papyrus Sync Table</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Papyrus Sync Table</em>'.
+	 * @generated
+	 */
+	PapyrusSyncTable createPapyrusSyncTable();
+
+	/**
+	 * Returns a new object of class '<em>Papyrus Table</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Papyrus Table</em>'.
+	 * @generated
+	 */
+	PapyrusTable createPapyrusTable();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	ConfigurationPackage getConfigurationPackage();
+
+} //ConfigurationFactory
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/ConfigurationPackage.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/ConfigurationPackage.java
new file mode 100644
index 00000000000..f7876d30325
--- /dev/null
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/ConfigurationPackage.java
@@ -0,0 +1,452 @@
+/**
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *
+ */
+package org.eclipse.papyrus.infra.viewpoints.configuration;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ *   <li>each class,</li>
+ *   <li>each feature of each class,</li>
+ *   <li>each operation of each class,</li>
+ *   <li>each enum,</li>
+ *   <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface ConfigurationPackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "configuration";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/infra/viewpoints/configuration";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "configuration";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	ConfigurationPackage eINSTANCE = org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusViewImpl <em>Papyrus View</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusViewImpl
+	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getPapyrusView()
+	 * @generated
+	 */
+	int PAPYRUS_VIEW = 0;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_VIEW__NAME = 0;
+
+	/**
+	 * The feature id for the '<em><b>Icon</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_VIEW__ICON = 1;
+
+	/**
+	 * The feature id for the '<em><b>Implementation ID</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_VIEW__IMPLEMENTATION_ID = 2;
+
+	/**
+	 * The number of structural features of the '<em>Papyrus View</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_VIEW_FEATURE_COUNT = 3;
+
+	/**
+	 * The number of operations of the '<em>Papyrus View</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_VIEW_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusDiagramImpl <em>Papyrus Diagram</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusDiagramImpl
+	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getPapyrusDiagram()
+	 * @generated
+	 */
+	int PAPYRUS_DIAGRAM = 1;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_DIAGRAM__NAME = PAPYRUS_VIEW__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Icon</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_DIAGRAM__ICON = PAPYRUS_VIEW__ICON;
+
+	/**
+	 * The feature id for the '<em><b>Implementation ID</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_DIAGRAM__IMPLEMENTATION_ID = PAPYRUS_VIEW__IMPLEMENTATION_ID;
+
+	/**
+	 * The number of structural features of the '<em>Papyrus Diagram</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_DIAGRAM_FEATURE_COUNT = PAPYRUS_VIEW_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Papyrus Diagram</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_DIAGRAM_OPERATION_COUNT = PAPYRUS_VIEW_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusSyncTableImpl <em>Papyrus Sync Table</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusSyncTableImpl
+	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getPapyrusSyncTable()
+	 * @generated
+	 */
+	int PAPYRUS_SYNC_TABLE = 2;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_SYNC_TABLE__NAME = PAPYRUS_VIEW__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Icon</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_SYNC_TABLE__ICON = PAPYRUS_VIEW__ICON;
+
+	/**
+	 * The feature id for the '<em><b>Implementation ID</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_SYNC_TABLE__IMPLEMENTATION_ID = PAPYRUS_VIEW__IMPLEMENTATION_ID;
+
+	/**
+	 * The number of structural features of the '<em>Papyrus Sync Table</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_SYNC_TABLE_FEATURE_COUNT = PAPYRUS_VIEW_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Papyrus Sync Table</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_SYNC_TABLE_OPERATION_COUNT = PAPYRUS_VIEW_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusTableImpl <em>Papyrus Table</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusTableImpl
+	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getPapyrusTable()
+	 * @generated
+	 */
+	int PAPYRUS_TABLE = 3;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_TABLE__NAME = PAPYRUS_VIEW__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Icon</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_TABLE__ICON = PAPYRUS_VIEW__ICON;
+
+	/**
+	 * The feature id for the '<em><b>Implementation ID</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_TABLE__IMPLEMENTATION_ID = PAPYRUS_VIEW__IMPLEMENTATION_ID;
+
+	/**
+	 * The number of structural features of the '<em>Papyrus Table</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_TABLE_FEATURE_COUNT = PAPYRUS_VIEW_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Papyrus Table</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_TABLE_OPERATION_COUNT = PAPYRUS_VIEW_OPERATION_COUNT + 0;
+
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView <em>Papyrus View</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Papyrus View</em>'.
+	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView
+	 * @generated
+	 */
+	EClass getPapyrusView();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView#getName <em>Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Name</em>'.
+	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView#getName()
+	 * @see #getPapyrusView()
+	 * @generated
+	 */
+	EAttribute getPapyrusView_Name();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView#getIcon <em>Icon</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Icon</em>'.
+	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView#getIcon()
+	 * @see #getPapyrusView()
+	 * @generated
+	 */
+	EAttribute getPapyrusView_Icon();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView#getImplementationID <em>Implementation ID</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Implementation ID</em>'.
+	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView#getImplementationID()
+	 * @see #getPapyrusView()
+	 * @generated
+	 */
+	EAttribute getPapyrusView_ImplementationID();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram <em>Papyrus Diagram</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Papyrus Diagram</em>'.
+	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram
+	 * @generated
+	 */
+	EClass getPapyrusDiagram();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusSyncTable <em>Papyrus Sync Table</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Papyrus Sync Table</em>'.
+	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusSyncTable
+	 * @generated
+	 */
+	EClass getPapyrusSyncTable();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusTable <em>Papyrus Table</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Papyrus Table</em>'.
+	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusTable
+	 * @generated
+	 */
+	EClass getPapyrusTable();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	ConfigurationFactory getConfigurationFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 *   <li>each class,</li>
+	 *   <li>each feature of each class,</li>
+	 *   <li>each operation of each class,</li>
+	 *   <li>each enum,</li>
+	 *   <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusViewImpl <em>Papyrus View</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusViewImpl
+		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getPapyrusView()
+		 * @generated
+		 */
+		EClass PAPYRUS_VIEW = eINSTANCE.getPapyrusView();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PAPYRUS_VIEW__NAME = eINSTANCE.getPapyrusView_Name();
+
+		/**
+		 * The meta object literal for the '<em><b>Icon</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PAPYRUS_VIEW__ICON = eINSTANCE.getPapyrusView_Icon();
+
+		/**
+		 * The meta object literal for the '<em><b>Implementation ID</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PAPYRUS_VIEW__IMPLEMENTATION_ID = eINSTANCE.getPapyrusView_ImplementationID();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusDiagramImpl <em>Papyrus Diagram</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusDiagramImpl
+		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getPapyrusDiagram()
+		 * @generated
+		 */
+		EClass PAPYRUS_DIAGRAM = eINSTANCE.getPapyrusDiagram();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusSyncTableImpl <em>Papyrus Sync Table</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusSyncTableImpl
+		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getPapyrusSyncTable()
+		 * @generated
+		 */
+		EClass PAPYRUS_SYNC_TABLE = eINSTANCE.getPapyrusSyncTable();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusTableImpl <em>Papyrus Table</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusTableImpl
+		 * @see org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationPackageImpl#getPapyrusTable()
+		 * @generated
+		 */
+		EClass PAPYRUS_TABLE = eINSTANCE.getPapyrusTable();
+
+	}
+
+} //ConfigurationPackage
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/PapyrusDiagram.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/PapyrusDiagram.java
new file mode 100644
index 00000000000..4bb96930893
--- /dev/null
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/PapyrusDiagram.java
@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  CEA LIST - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.viewpoints.configuration;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Papyrus Diagram</b></em>'.
+ * @deprecated Use {@link org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram} instead
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getPapyrusDiagram()
+ * @model
+ * @generated
+ */
+public interface PapyrusDiagram extends PapyrusView {
+} // PapyrusDiagram
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/PapyrusSyncTable.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/PapyrusSyncTable.java
index 66841f834ae..add8bfaf07f 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/PapyrusSyncTable.java
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/PapyrusSyncTable.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013 CEA LIST.
+ * Copyright (c) 2015 CEA LIST and others.
  * 
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
@@ -7,7 +7,7 @@
  *  http://www.eclipse.org/legal/epl-v10.html
  *  
  *  Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *  CEA LIST - Initial API and implementation
  *  
  * 
  */
@@ -17,6 +17,7 @@ package org.eclipse.papyrus.infra.viewpoints.configuration;
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Papyrus Sync Table</b></em>'.
+ * @deprecated Use {@link org.eclipse.papyrus.infra.nattable.representation.PapyrusSyncTable} instead
  * <!-- end-user-doc -->
  *
  *
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/PapyrusTable.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/PapyrusTable.java
new file mode 100644
index 00000000000..d8c92747c3f
--- /dev/null
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/PapyrusTable.java
@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  CEA LIST - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.viewpoints.configuration;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Papyrus Table</b></em>'.
+ * @deprecated Use {@link org.eclipse.papyrus.infra.nattable.representation.PapyrusTable} instead
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getPapyrusTable()
+ * @model
+ * @generated
+ */
+public interface PapyrusTable extends PapyrusView {
+} // PapyrusTable
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/PapyrusView.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/PapyrusView.java
new file mode 100644
index 00000000000..586f241b0ef
--- /dev/null
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/PapyrusView.java
@@ -0,0 +1,116 @@
+/**
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *
+ */
+package org.eclipse.papyrus.infra.viewpoints.configuration;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Papyrus View</b></em>'.
+ * @deprecated Use {@link org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind} instead
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView#getIcon <em>Icon</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView#getImplementationID <em>Implementation ID</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getPapyrusView()
+ * @model
+ * @generated
+ */
+public interface PapyrusView 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.infra.viewpoints.configuration.ConfigurationPackage#getPapyrusView_Name()
+	 * @model
+	 * @generated
+	 */
+	String getName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView#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);
+
+	/**
+	 * 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.infra.viewpoints.configuration.ConfigurationPackage#getPapyrusView_Icon()
+	 * @model
+	 * @generated
+	 */
+	String getIcon();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView#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);
+
+	/**
+	 * Returns the value of the '<em><b>Implementation ID</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Implementation 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>Implementation ID</em>' attribute.
+	 * @see #setImplementationID(String)
+	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#getPapyrusView_ImplementationID()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getImplementationID();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView#getImplementationID <em>Implementation ID</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Implementation ID</em>' attribute.
+	 * @see #getImplementationID()
+	 * @generated
+	 */
+	void setImplementationID(String value);
+} // PapyrusView
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/ConfigurationFactoryImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/ConfigurationFactoryImpl.java
new file mode 100644
index 00000000000..a3e30e25f35
--- /dev/null
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/ConfigurationFactoryImpl.java
@@ -0,0 +1,142 @@
+/**
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  CEA LIST - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.viewpoints.configuration.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
+import org.eclipse.papyrus.infra.viewpoints.configuration.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ConfigurationFactoryImpl extends EFactoryImpl implements ConfigurationFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static ConfigurationFactory init() {
+		try {
+			ConfigurationFactory theConfigurationFactory = (ConfigurationFactory) EPackage.Registry.INSTANCE.getEFactory(ConfigurationPackage.eNS_URI);
+			if (theConfigurationFactory != null) {
+				return theConfigurationFactory;
+			}
+		} catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new ConfigurationFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ConfigurationFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+		case ConfigurationPackage.PAPYRUS_VIEW:
+			return createPapyrusView();
+		case ConfigurationPackage.PAPYRUS_DIAGRAM:
+			return createPapyrusDiagram();
+		case ConfigurationPackage.PAPYRUS_SYNC_TABLE:
+			return createPapyrusSyncTable();
+		case ConfigurationPackage.PAPYRUS_TABLE:
+			return createPapyrusTable();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public PapyrusView createPapyrusView() {
+		PapyrusViewImpl papyrusView = new PapyrusViewImpl();
+		return papyrusView;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public PapyrusDiagram createPapyrusDiagram() {
+		PapyrusDiagramImpl papyrusDiagram = new PapyrusDiagramImpl();
+		return papyrusDiagram;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public PapyrusSyncTable createPapyrusSyncTable() {
+		PapyrusSyncTableImpl papyrusSyncTable = new PapyrusSyncTableImpl();
+		return papyrusSyncTable;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public PapyrusTable createPapyrusTable() {
+		PapyrusTableImpl papyrusTable = new PapyrusTableImpl();
+		return papyrusTable;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ConfigurationPackage getConfigurationPackage() {
+		return (ConfigurationPackage) getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static ConfigurationPackage getPackage() {
+		return ConfigurationPackage.eINSTANCE;
+	}
+
+} //ConfigurationFactoryImpl
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/ConfigurationPackageImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/ConfigurationPackageImpl.java
new file mode 100644
index 00000000000..b6f075bb9e3
--- /dev/null
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/ConfigurationPackageImpl.java
@@ -0,0 +1,290 @@
+/**
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *
+ */
+package org.eclipse.papyrus.infra.viewpoints.configuration.impl;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+
+import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationFactory;
+import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
+import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram;
+import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusSyncTable;
+import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusTable;
+import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ConfigurationPackageImpl extends EPackageImpl implements ConfigurationPackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass papyrusViewEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass papyrusDiagramEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass papyrusSyncTableEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass papyrusTableEClass = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private ConfigurationPackageImpl() {
+		super(eNS_URI, ConfigurationFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 *
+	 * <p>This method is used to initialize {@link ConfigurationPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static ConfigurationPackage init() {
+		if (isInited) {
+			return (ConfigurationPackage) EPackage.Registry.INSTANCE.getEPackage(ConfigurationPackage.eNS_URI);
+		}
+
+		// Obtain or create and register package
+		ConfigurationPackageImpl theConfigurationPackage = (ConfigurationPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ConfigurationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ConfigurationPackageImpl());
+
+		isInited = true;
+
+		// Create package meta-data objects
+		theConfigurationPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theConfigurationPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theConfigurationPackage.freeze();
+
+
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(ConfigurationPackage.eNS_URI, theConfigurationPackage);
+		return theConfigurationPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getPapyrusView() {
+		return papyrusViewEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getPapyrusView_Name() {
+		return (EAttribute) papyrusViewEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getPapyrusView_Icon() {
+		return (EAttribute) papyrusViewEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getPapyrusView_ImplementationID() {
+		return (EAttribute) papyrusViewEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getPapyrusDiagram() {
+		return papyrusDiagramEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getPapyrusSyncTable() {
+		return papyrusSyncTableEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getPapyrusTable() {
+		return papyrusTableEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ConfigurationFactory getConfigurationFactory() {
+		return (ConfigurationFactory) getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) {
+			return;
+		}
+		isCreated = true;
+
+		// Create classes and their features
+		papyrusViewEClass = createEClass(PAPYRUS_VIEW);
+		createEAttribute(papyrusViewEClass, PAPYRUS_VIEW__NAME);
+		createEAttribute(papyrusViewEClass, PAPYRUS_VIEW__ICON);
+		createEAttribute(papyrusViewEClass, PAPYRUS_VIEW__IMPLEMENTATION_ID);
+
+		papyrusDiagramEClass = createEClass(PAPYRUS_DIAGRAM);
+
+		papyrusSyncTableEClass = createEClass(PAPYRUS_SYNC_TABLE);
+
+		papyrusTableEClass = createEClass(PAPYRUS_TABLE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) {
+			return;
+		}
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		papyrusDiagramEClass.getESuperTypes().add(this.getPapyrusView());
+		papyrusSyncTableEClass.getESuperTypes().add(this.getPapyrusView());
+		papyrusTableEClass.getESuperTypes().add(this.getPapyrusView());
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(papyrusViewEClass, PapyrusView.class, "PapyrusView", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getPapyrusView_Name(), ecorePackage.getEString(), "name", null, 0, 1, PapyrusView.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getPapyrusView_Icon(), ecorePackage.getEString(), "icon", null, 0, 1, PapyrusView.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getPapyrusView_ImplementationID(), ecorePackage.getEString(), "implementationID", null, 1, 1, PapyrusView.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(papyrusDiagramEClass, PapyrusDiagram.class, "PapyrusDiagram", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(papyrusSyncTableEClass, PapyrusSyncTable.class, "PapyrusSyncTable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(papyrusTableEClass, PapyrusTable.class, "PapyrusTable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		// Create resource
+		createResource(eNS_URI);
+	}
+
+} //ConfigurationPackageImpl
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/PapyrusDiagramImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/PapyrusDiagramImpl.java
new file mode 100644
index 00000000000..92eecd1f949
--- /dev/null
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/PapyrusDiagramImpl.java
@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  CEA LIST - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.viewpoints.configuration.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
+import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Papyrus Diagram</b></em>'.
+ * @deprecated Use {@link org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagramImpl} instead
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class PapyrusDiagramImpl extends PapyrusViewImpl implements PapyrusDiagram {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected PapyrusDiagramImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ConfigurationPackage.Literals.PAPYRUS_DIAGRAM;
+	}
+
+} //PapyrusDiagramImpl
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/PapyrusSyncTableImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/PapyrusSyncTableImpl.java
index d5b9aaeb71b..aabd91e4193 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/PapyrusSyncTableImpl.java
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/PapyrusSyncTableImpl.java
@@ -1,16 +1,15 @@
 /**
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- *
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
  *  which accompanies this distribution, and is available at
  *  http://www.eclipse.org/legal/epl-v10.html
- *
+ *  
  *  Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 463156
- *
- *
+ *  CEA LIST - Initial API and implementation
+ *  
+ * 
  */
 package org.eclipse.papyrus.infra.viewpoints.configuration.impl;
 
@@ -22,6 +21,7 @@ import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusSyncTable;
 /**
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Papyrus Sync Table</b></em>'.
+ * @deprecated Use {@link org.eclipse.papyrus.infra.nattable.representation.PapyrusSyncTableImpl} instead
  * <!-- end-user-doc -->
  *
  * @generated
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/PapyrusTableImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/PapyrusTableImpl.java
new file mode 100644
index 00000000000..88dc6ca2b0f
--- /dev/null
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/PapyrusTableImpl.java
@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  CEA LIST - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.viewpoints.configuration.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
+import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusTable;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Papyrus Table</b></em>'.
+ * @deprecated Use {@link org.eclipse.papyrus.infra.nattable.representation.PapyrusTableImpl} instead
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class PapyrusTableImpl extends PapyrusViewImpl implements PapyrusTable {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected PapyrusTableImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ConfigurationPackage.Literals.PAPYRUS_TABLE;
+	}
+
+} //PapyrusTableImpl
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/PapyrusViewImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/PapyrusViewImpl.java
new file mode 100644
index 00000000000..0f7dd3cb610
--- /dev/null
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/impl/PapyrusViewImpl.java
@@ -0,0 +1,288 @@
+/**
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *
+ */
+package org.eclipse.papyrus.infra.viewpoints.configuration.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.MinimalEObjectImpl;
+
+import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
+import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Papyrus View</b></em>'.
+ * @deprecated Use {@link org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKindImpl} instead
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusViewImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusViewImpl#getIcon <em>Icon</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.impl.PapyrusViewImpl#getImplementationID <em>Implementation ID</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class PapyrusViewImpl extends MinimalEObjectImpl.Container implements PapyrusView {
+	/**
+	 * 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;
+	/**
+	 * 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;
+	/**
+	 * The default value of the '{@link #getImplementationID() <em>Implementation ID</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getImplementationID()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String IMPLEMENTATION_ID_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getImplementationID() <em>Implementation ID</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getImplementationID()
+	 * @generated
+	 * @ordered
+	 */
+	protected String implementationID = IMPLEMENTATION_ID_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected PapyrusViewImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ConfigurationPackage.Literals.PAPYRUS_VIEW;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setName(String newName) {
+		String oldName = name;
+		name = newName;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, ConfigurationPackage.PAPYRUS_VIEW__NAME, oldName, name));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getIcon() {
+		return icon;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setIcon(String newIcon) {
+		String oldIcon = icon;
+		icon = newIcon;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, ConfigurationPackage.PAPYRUS_VIEW__ICON, oldIcon, icon));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getImplementationID() {
+		return implementationID;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setImplementationID(String newImplementationID) {
+		String oldImplementationID = implementationID;
+		implementationID = newImplementationID;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, ConfigurationPackage.PAPYRUS_VIEW__IMPLEMENTATION_ID, oldImplementationID, implementationID));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case ConfigurationPackage.PAPYRUS_VIEW__NAME:
+			return getName();
+		case ConfigurationPackage.PAPYRUS_VIEW__ICON:
+			return getIcon();
+		case ConfigurationPackage.PAPYRUS_VIEW__IMPLEMENTATION_ID:
+			return getImplementationID();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case ConfigurationPackage.PAPYRUS_VIEW__NAME:
+			setName((String) newValue);
+			return;
+		case ConfigurationPackage.PAPYRUS_VIEW__ICON:
+			setIcon((String) newValue);
+			return;
+		case ConfigurationPackage.PAPYRUS_VIEW__IMPLEMENTATION_ID:
+			setImplementationID((String) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case ConfigurationPackage.PAPYRUS_VIEW__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case ConfigurationPackage.PAPYRUS_VIEW__ICON:
+			setIcon(ICON_EDEFAULT);
+			return;
+		case ConfigurationPackage.PAPYRUS_VIEW__IMPLEMENTATION_ID:
+			setImplementationID(IMPLEMENTATION_ID_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case ConfigurationPackage.PAPYRUS_VIEW__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case ConfigurationPackage.PAPYRUS_VIEW__ICON:
+			return ICON_EDEFAULT == null ? icon != null : !ICON_EDEFAULT.equals(icon);
+		case ConfigurationPackage.PAPYRUS_VIEW__IMPLEMENTATION_ID:
+			return IMPLEMENTATION_ID_EDEFAULT == null ? implementationID != null : !IMPLEMENTATION_ID_EDEFAULT.equals(implementationID);
+		}
+		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(", icon: ");
+		result.append(icon);
+		result.append(", implementationID: ");
+		result.append(implementationID);
+		result.append(')');
+		return result.toString();
+	}
+
+} //PapyrusViewImpl
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/util/ConfigurationAdapterFactory.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/util/ConfigurationAdapterFactory.java
new file mode 100644
index 00000000000..26c3328dd56
--- /dev/null
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/util/ConfigurationAdapterFactory.java
@@ -0,0 +1,188 @@
+/**
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  CEA LIST - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.viewpoints.configuration.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.papyrus.infra.viewpoints.configuration.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage
+ * @generated
+ */
+public class ConfigurationAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static ConfigurationPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ConfigurationAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = ConfigurationPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject) object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ConfigurationSwitch<Adapter> modelSwitch = new ConfigurationSwitch<Adapter>() {
+		@Override
+		public Adapter casePapyrusView(PapyrusView object) {
+			return createPapyrusViewAdapter();
+		}
+
+		@Override
+		public Adapter casePapyrusDiagram(PapyrusDiagram object) {
+			return createPapyrusDiagramAdapter();
+		}
+
+		@Override
+		public Adapter casePapyrusSyncTable(PapyrusSyncTable object) {
+			return createPapyrusSyncTableAdapter();
+		}
+
+		@Override
+		public Adapter casePapyrusTable(PapyrusTable object) {
+			return createPapyrusTableAdapter();
+		}
+
+		@Override
+		public Adapter defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject) target);
+	}
+
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView <em>Papyrus View</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView
+	 * @generated
+	 */
+	public Adapter createPapyrusViewAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram <em>Papyrus Diagram</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram
+	 * @generated
+	 */
+	public Adapter createPapyrusDiagramAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusSyncTable <em>Papyrus Sync Table</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusSyncTable
+	 * @generated
+	 */
+	public Adapter createPapyrusSyncTableAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusTable <em>Papyrus Table</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusTable
+	 * @generated
+	 */
+	public Adapter createPapyrusTableAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+
+} //ConfigurationAdapterFactory
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/util/ConfigurationSwitch.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/util/ConfigurationSwitch.java
new file mode 100644
index 00000000000..fb0ae0fad0d
--- /dev/null
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/util/ConfigurationSwitch.java
@@ -0,0 +1,195 @@
+/**
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  CEA LIST - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.viewpoints.configuration.util;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.util.Switch;
+
+import org.eclipse.papyrus.infra.viewpoints.configuration.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage
+ * @generated
+ */
+public class ConfigurationSwitch<T> extends Switch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static ConfigurationPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ConfigurationSwitch() {
+		if (modelPackage == null) {
+			modelPackage = ConfigurationPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+		case ConfigurationPackage.PAPYRUS_VIEW: {
+			PapyrusView papyrusView = (PapyrusView) theEObject;
+			T result = casePapyrusView(papyrusView);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ConfigurationPackage.PAPYRUS_DIAGRAM: {
+			PapyrusDiagram papyrusDiagram = (PapyrusDiagram) theEObject;
+			T result = casePapyrusDiagram(papyrusDiagram);
+			if (result == null)
+				result = casePapyrusView(papyrusDiagram);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ConfigurationPackage.PAPYRUS_SYNC_TABLE: {
+			PapyrusSyncTable papyrusSyncTable = (PapyrusSyncTable) theEObject;
+			T result = casePapyrusSyncTable(papyrusSyncTable);
+			if (result == null)
+				result = casePapyrusView(papyrusSyncTable);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ConfigurationPackage.PAPYRUS_TABLE: {
+			PapyrusTable papyrusTable = (PapyrusTable) theEObject;
+			T result = casePapyrusTable(papyrusTable);
+			if (result == null)
+				result = casePapyrusView(papyrusTable);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Papyrus View</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>Papyrus View</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T casePapyrusView(PapyrusView object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Papyrus Diagram</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>Papyrus Diagram</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T casePapyrusDiagram(PapyrusDiagram object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Papyrus Sync Table</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>Papyrus Sync Table</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T casePapyrusSyncTable(PapyrusSyncTable object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Papyrus Table</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>Papyrus Table</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T casePapyrusTable(PapyrusTable object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+
+} //ConfigurationSwitch
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/PapyrusViewStyle.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/PapyrusViewStyle.java
index 6691161a5ae..c2e6f8bdbf2 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/PapyrusViewStyle.java
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/PapyrusViewStyle.java
@@ -1,94 +1,92 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.style;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.notation.Style;

-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Papyrus View Style</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle#getOwner <em>Owner</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle#getConfiguration <em>Configuration</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.viewpoints.style.StylePackage#getPapyrusViewStyle()

- * @model

- * @generated

- */

-public interface PapyrusViewStyle extends Style {

-	/**

-	 * Returns the value of the '<em><b>Owner</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Owner</em>' reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Owner</em>' reference.

-	 * @see #setOwner(EObject)

-	 * @see org.eclipse.papyrus.infra.viewpoints.style.StylePackage#getPapyrusViewStyle_Owner()

-	 * @model required="true"

-	 * @generated

-	 */

-	EObject getOwner();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle#getOwner <em>Owner</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Owner</em>' reference.

-	 * @see #getOwner()

-	 * @generated

-	 */

-	void setOwner(EObject value);

-

-	/**

-	 * Returns the value of the '<em><b>Configuration</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Configuration</em>' reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Configuration</em>' reference.

-	 * @see #setConfiguration(PapyrusView)

-	 * @see org.eclipse.papyrus.infra.viewpoints.style.StylePackage#getPapyrusViewStyle_Configuration()

-	 * @model

-	 * @generated

-	 */

-	PapyrusView getConfiguration();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle#getConfiguration <em>Configuration</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Configuration</em>' reference.

-	 * @see #getConfiguration()

-	 * @generated

-	 */

-	void setConfiguration(PapyrusView value);

-

-} // PapyrusViewStyle

+/**
+ * Copyright (c) 2013 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.viewpoints.style;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.gmf.runtime.notation.Style;
+import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Papyrus View Style</b></em>'.
+ * @deprecated Use {@link org.eclipse.papyrus.infra.gmfdiag.style.PapyrusDiagramStyle} instead
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle#getOwner <em>Owner</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle#getConfiguration <em>Configuration</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.viewpoints.style.StylePackage#getPapyrusViewStyle()
+ * @model
+ * @generated
+ */
+public interface PapyrusViewStyle extends Style {
+	/**
+	 * Returns the value of the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Owner</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Owner</em>' reference.
+	 * @see #setOwner(EObject)
+	 * @see org.eclipse.papyrus.infra.viewpoints.style.StylePackage#getPapyrusViewStyle_Owner()
+	 * @model required="true"
+	 * @generated
+	 */
+	EObject getOwner();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle#getOwner <em>Owner</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Owner</em>' reference.
+	 * @see #getOwner()
+	 * @generated
+	 */
+	void setOwner(EObject value);
+
+	/**
+	 * Returns the value of the '<em><b>Configuration</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Configuration</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Configuration</em>' reference.
+	 * @see #setConfiguration(PapyrusView)
+	 * @see org.eclipse.papyrus.infra.viewpoints.style.StylePackage#getPapyrusViewStyle_Configuration()
+	 * @model
+	 * @generated
+	 */
+	PapyrusView getConfiguration();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle#getConfiguration <em>Configuration</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Configuration</em>' reference.
+	 * @see #getConfiguration()
+	 * @generated
+	 */
+	void setConfiguration(PapyrusView value);
+
+} // PapyrusViewStyle
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/StyleFactory.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/StyleFactory.java
index b25358482af..172b0ab8a3a 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/StyleFactory.java
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/StyleFactory.java
@@ -1,57 +1,53 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.style;

-

-import org.eclipse.emf.ecore.EFactory;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Factory</b> for the model.

- * It provides a create method for each non-abstract class of the model.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.infra.viewpoints.style.StylePackage

- * @generated

- */

-public interface StyleFactory extends EFactory {

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	StyleFactory eINSTANCE = org.eclipse.papyrus.infra.viewpoints.style.impl.StyleFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Papyrus View Style</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Papyrus View Style</em>'.

-	 * @generated

-	 */

-	PapyrusViewStyle createPapyrusViewStyle();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	StylePackage getStylePackage();

-

-} // StyleFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *
+ *
+ */
+package org.eclipse.papyrus.infra.viewpoints.style;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.viewpoints.style.StylePackage
+ * @generated
+ */
+public interface StyleFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	StyleFactory eINSTANCE = org.eclipse.papyrus.infra.viewpoints.style.impl.StyleFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Papyrus View Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Papyrus View Style</em>'.
+	 * @generated
+	 */
+	PapyrusViewStyle createPapyrusViewStyle();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	StylePackage getStylePackage();
+
+} // StyleFactory
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/StylePackage.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/StylePackage.java
index e0ac9a7e7eb..47a9a557b94 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/StylePackage.java
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/StylePackage.java
@@ -1,218 +1,200 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.style;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Package</b> for the model.

- * It contains accessors for the meta objects to represent

- * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each operation of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.infra.viewpoints.style.StyleFactory

- * @model kind="package"

- * @generated

- */

-public interface StylePackage extends EPackage {

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNAME = "style";

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/infra/viewpoints/policy/style";

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_PREFIX = "style";

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	StylePackage eINSTANCE = org.eclipse.papyrus.infra.viewpoints.style.impl.StylePackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.viewpoints.style.impl.PapyrusViewStyleImpl <em>Papyrus View Style</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.viewpoints.style.impl.PapyrusViewStyleImpl

-	 * @see org.eclipse.papyrus.infra.viewpoints.style.impl.StylePackageImpl#getPapyrusViewStyle()

-	 * @generated

-	 */

-	int PAPYRUS_VIEW_STYLE = 0;

-

-	/**

-	 * The feature id for the '<em><b>Owner</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int PAPYRUS_VIEW_STYLE__OWNER = NotationPackage.STYLE_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Configuration</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int PAPYRUS_VIEW_STYLE__CONFIGURATION = NotationPackage.STYLE_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of structural features of the '<em>Papyrus View Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int PAPYRUS_VIEW_STYLE_FEATURE_COUNT = NotationPackage.STYLE_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of operations of the '<em>Papyrus View Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int PAPYRUS_VIEW_STYLE_OPERATION_COUNT = 0;

-

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle <em>Papyrus View Style</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Papyrus View Style</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle

-	 * @generated

-	 */

-	EClass getPapyrusViewStyle();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle#getOwner <em>Owner</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference '<em>Owner</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle#getOwner()

-	 * @see #getPapyrusViewStyle()

-	 * @generated

-	 */

-	EReference getPapyrusViewStyle_Owner();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle#getConfiguration <em>Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference '<em>Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle#getConfiguration()

-	 * @see #getPapyrusViewStyle()

-	 * @generated

-	 */

-	EReference getPapyrusViewStyle_Configuration();

-

-	/**

-	 * Returns the factory that creates the instances of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the factory that creates the instances of the model.

-	 * @generated

-	 */

-	StyleFactory getStyleFactory();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * Defines literals for the meta objects that represent

-	 * <ul>

-	 * <li>each class,</li>

-	 * <li>each feature of each class,</li>

-	 * <li>each operation of each class,</li>

-	 * <li>each enum,</li>

-	 * <li>and each data type</li>

-	 * </ul>

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	interface Literals {

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.viewpoints.style.impl.PapyrusViewStyleImpl <em>Papyrus View Style</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.viewpoints.style.impl.PapyrusViewStyleImpl

-		 * @see org.eclipse.papyrus.infra.viewpoints.style.impl.StylePackageImpl#getPapyrusViewStyle()

-		 * @generated

-		 */

-		EClass PAPYRUS_VIEW_STYLE = eINSTANCE.getPapyrusViewStyle();

-

-		/**

-		 * The meta object literal for the '<em><b>Owner</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference PAPYRUS_VIEW_STYLE__OWNER = eINSTANCE.getPapyrusViewStyle_Owner();

-

-		/**

-		 * The meta object literal for the '<em><b>Configuration</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference PAPYRUS_VIEW_STYLE__CONFIGURATION = eINSTANCE.getPapyrusViewStyle_Configuration();

-

-	}

-

-} // StylePackage

+/**
+ * Copyright (c) 2013 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.viewpoints.style;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ *   <li>each class,</li>
+ *   <li>each feature of each class,</li>
+ *   <li>each operation of each class,</li>
+ *   <li>each enum,</li>
+ *   <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.viewpoints.style.StyleFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface StylePackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "style";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/infra/viewpoints/policy/style";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "style";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	StylePackage eINSTANCE = org.eclipse.papyrus.infra.viewpoints.style.impl.StylePackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.viewpoints.style.impl.PapyrusViewStyleImpl <em>Papyrus View Style</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.viewpoints.style.impl.PapyrusViewStyleImpl
+	 * @see org.eclipse.papyrus.infra.viewpoints.style.impl.StylePackageImpl#getPapyrusViewStyle()
+	 * @generated
+	 */
+	int PAPYRUS_VIEW_STYLE = 0;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_VIEW_STYLE__OWNER = NotationPackage.STYLE_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Configuration</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_VIEW_STYLE__CONFIGURATION = NotationPackage.STYLE_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Papyrus View Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_VIEW_STYLE_FEATURE_COUNT = NotationPackage.STYLE_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of operations of the '<em>Papyrus View Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 * @ordered
+	 */
+	int PAPYRUS_VIEW_STYLE_OPERATION_COUNT =  0;
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle <em>Papyrus View Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Papyrus View Style</em>'.
+	 * @see org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle
+	 * @generated
+	 */
+	EClass getPapyrusViewStyle();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle#getOwner <em>Owner</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Owner</em>'.
+	 * @see org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle#getOwner()
+	 * @see #getPapyrusViewStyle()
+	 * @generated
+	 */
+	EReference getPapyrusViewStyle_Owner();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle#getConfiguration <em>Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle#getConfiguration()
+	 * @see #getPapyrusViewStyle()
+	 * @generated
+	 */
+	EReference getPapyrusViewStyle_Configuration();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	StyleFactory getStyleFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 *   <li>each class,</li>
+	 *   <li>each feature of each class,</li>
+	 *   <li>each operation of each class,</li>
+	 *   <li>each enum,</li>
+	 *   <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.viewpoints.style.impl.PapyrusViewStyleImpl <em>Papyrus View Style</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.viewpoints.style.impl.PapyrusViewStyleImpl
+		 * @see org.eclipse.papyrus.infra.viewpoints.style.impl.StylePackageImpl#getPapyrusViewStyle()
+		 * @generated
+		 */
+		EClass PAPYRUS_VIEW_STYLE = eINSTANCE.getPapyrusViewStyle();
+
+		/**
+		 * The meta object literal for the '<em><b>Owner</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PAPYRUS_VIEW_STYLE__OWNER = eINSTANCE.getPapyrusViewStyle_Owner();
+
+		/**
+		 * The meta object literal for the '<em><b>Configuration</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PAPYRUS_VIEW_STYLE__CONFIGURATION = eINSTANCE.getPapyrusViewStyle_Configuration();
+
+	}
+
+} //StylePackage
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/impl/PapyrusViewStyleImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/impl/PapyrusViewStyleImpl.java
index 626aaccdb61..46e8dad5d91 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/impl/PapyrusViewStyleImpl.java
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/impl/PapyrusViewStyleImpl.java
@@ -1,248 +1,230 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.style.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView;

-import org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle;

-import org.eclipse.papyrus.infra.viewpoints.style.StylePackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Papyrus View Style</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.style.impl.PapyrusViewStyleImpl#getOwner <em>Owner</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.viewpoints.style.impl.PapyrusViewStyleImpl#getConfiguration <em>Configuration</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class PapyrusViewStyleImpl extends MinimalEObjectImpl.Container implements PapyrusViewStyle {

-	/**

-	 * The cached value of the '{@link #getOwner() <em>Owner</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getOwner()

-	 * @generated

-	 * @ordered

-	 */

-	protected EObject owner;

-

-	/**

-	 * The cached value of the '{@link #getConfiguration() <em>Configuration</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getConfiguration()

-	 * @generated

-	 * @ordered

-	 */

-	protected PapyrusView configuration;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected PapyrusViewStyleImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return StylePackage.Literals.PAPYRUS_VIEW_STYLE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EObject getOwner() {

-		if (owner != null && owner.eIsProxy()) {

-			InternalEObject oldOwner = (InternalEObject) owner;

-			owner = eResolveProxy(oldOwner);

-			if (owner != oldOwner) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, StylePackage.PAPYRUS_VIEW_STYLE__OWNER, oldOwner, owner));

-				}

-			}

-		}

-		return owner;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EObject basicGetOwner() {

-		return owner;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setOwner(EObject newOwner) {

-		EObject oldOwner = owner;

-		owner = newOwner;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, StylePackage.PAPYRUS_VIEW_STYLE__OWNER, oldOwner, owner));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public PapyrusView getConfiguration() {

-		if (configuration != null && configuration.eIsProxy()) {

-			InternalEObject oldConfiguration = (InternalEObject) configuration;

-			configuration = (PapyrusView) eResolveProxy(oldConfiguration);

-			if (configuration != oldConfiguration) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, StylePackage.PAPYRUS_VIEW_STYLE__CONFIGURATION, oldConfiguration, configuration));

-				}

-			}

-		}

-		return configuration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public PapyrusView basicGetConfiguration() {

-		return configuration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setConfiguration(PapyrusView newConfiguration) {

-		PapyrusView oldConfiguration = configuration;

-		configuration = newConfiguration;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, StylePackage.PAPYRUS_VIEW_STYLE__CONFIGURATION, oldConfiguration, configuration));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case StylePackage.PAPYRUS_VIEW_STYLE__OWNER:

-			if (resolve) {

-				return getOwner();

-			}

-			return basicGetOwner();

-		case StylePackage.PAPYRUS_VIEW_STYLE__CONFIGURATION:

-			if (resolve) {

-				return getConfiguration();

-			}

-			return basicGetConfiguration();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case StylePackage.PAPYRUS_VIEW_STYLE__OWNER:

-			setOwner((EObject) newValue);

-			return;

-		case StylePackage.PAPYRUS_VIEW_STYLE__CONFIGURATION:

-			setConfiguration((PapyrusView) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case StylePackage.PAPYRUS_VIEW_STYLE__OWNER:

-			setOwner((EObject) null);

-			return;

-		case StylePackage.PAPYRUS_VIEW_STYLE__CONFIGURATION:

-			setConfiguration((PapyrusView) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case StylePackage.PAPYRUS_VIEW_STYLE__OWNER:

-			return owner != null;

-		case StylePackage.PAPYRUS_VIEW_STYLE__CONFIGURATION:

-			return configuration != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // PapyrusViewStyleImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.viewpoints.style.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView;
+import org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle;
+import org.eclipse.papyrus.infra.viewpoints.style.StylePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Papyrus View Style</b></em>'.
+ * @deprecated Use {@link org.eclipse.papyrus.infra.gmfdiag.style.PapyrusDiagramStyleImpl} instead
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.viewpoints.style.impl.PapyrusViewStyleImpl#getOwner <em>Owner</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.viewpoints.style.impl.PapyrusViewStyleImpl#getConfiguration <em>Configuration</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class PapyrusViewStyleImpl extends MinimalEObjectImpl.Container implements PapyrusViewStyle {
+	/**
+	 * The cached value of the '{@link #getOwner() <em>Owner</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getOwner()
+	 * @generated
+	 * @ordered
+	 */
+	protected EObject owner;
+
+	/**
+	 * The cached value of the '{@link #getConfiguration() <em>Configuration</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getConfiguration()
+	 * @generated
+	 * @ordered
+	 */
+	protected PapyrusView configuration;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected PapyrusViewStyleImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return StylePackage.Literals.PAPYRUS_VIEW_STYLE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EObject getOwner() {
+		if (owner != null && owner.eIsProxy()) {
+			InternalEObject oldOwner = (InternalEObject)owner;
+			owner = eResolveProxy(oldOwner);
+			if (owner != oldOwner) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, StylePackage.PAPYRUS_VIEW_STYLE__OWNER, oldOwner, owner));
+			}
+		}
+		return owner;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EObject basicGetOwner() {
+		return owner;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setOwner(EObject newOwner) {
+		EObject oldOwner = owner;
+		owner = newOwner;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StylePackage.PAPYRUS_VIEW_STYLE__OWNER, oldOwner, owner));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public PapyrusView getConfiguration() {
+		if (configuration != null && configuration.eIsProxy()) {
+			InternalEObject oldConfiguration = (InternalEObject)configuration;
+			configuration = (PapyrusView)eResolveProxy(oldConfiguration);
+			if (configuration != oldConfiguration) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, StylePackage.PAPYRUS_VIEW_STYLE__CONFIGURATION, oldConfiguration, configuration));
+			}
+		}
+		return configuration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public PapyrusView basicGetConfiguration() {
+		return configuration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setConfiguration(PapyrusView newConfiguration) {
+		PapyrusView oldConfiguration = configuration;
+		configuration = newConfiguration;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StylePackage.PAPYRUS_VIEW_STYLE__CONFIGURATION, oldConfiguration, configuration));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case StylePackage.PAPYRUS_VIEW_STYLE__OWNER:
+				if (resolve) return getOwner();
+				return basicGetOwner();
+			case StylePackage.PAPYRUS_VIEW_STYLE__CONFIGURATION:
+				if (resolve) return getConfiguration();
+				return basicGetConfiguration();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case StylePackage.PAPYRUS_VIEW_STYLE__OWNER:
+				setOwner((EObject)newValue);
+				return;
+			case StylePackage.PAPYRUS_VIEW_STYLE__CONFIGURATION:
+				setConfiguration((PapyrusView)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case StylePackage.PAPYRUS_VIEW_STYLE__OWNER:
+				setOwner((EObject)null);
+				return;
+			case StylePackage.PAPYRUS_VIEW_STYLE__CONFIGURATION:
+				setConfiguration((PapyrusView)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case StylePackage.PAPYRUS_VIEW_STYLE__OWNER:
+				return owner != null;
+			case StylePackage.PAPYRUS_VIEW_STYLE__CONFIGURATION:
+				return configuration != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //PapyrusViewStyleImpl
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/impl/StyleFactoryImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/impl/StyleFactoryImpl.java
index d32d223ae30..f01338e1702 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/impl/StyleFactoryImpl.java
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/impl/StyleFactoryImpl.java
@@ -1,112 +1,103 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.style.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.impl.EFactoryImpl;

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle;

-import org.eclipse.papyrus.infra.viewpoints.style.StyleFactory;

-import org.eclipse.papyrus.infra.viewpoints.style.StylePackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class StyleFactoryImpl extends EFactoryImpl implements StyleFactory {

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static StyleFactory init() {

-		try {

-			StyleFactory theStyleFactory = (StyleFactory) EPackage.Registry.INSTANCE.getEFactory(StylePackage.eNS_URI);

-			if (theStyleFactory != null) {

-				return theStyleFactory;

-			}

-		} catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new StyleFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public StyleFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-		case StylePackage.PAPYRUS_VIEW_STYLE:

-			return createPapyrusViewStyle();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public PapyrusViewStyle createPapyrusViewStyle() {

-		PapyrusViewStyleImpl papyrusViewStyle = new PapyrusViewStyleImpl();

-		return papyrusViewStyle;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public StylePackage getStylePackage() {

-		return (StylePackage) getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static StylePackage getPackage() {

-		return StylePackage.eINSTANCE;

-	}

-

-} // StyleFactoryImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *
+ *
+ */
+package org.eclipse.papyrus.infra.viewpoints.style.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.infra.viewpoints.style.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class StyleFactoryImpl extends EFactoryImpl implements StyleFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static StyleFactory init() {
+		try {
+			StyleFactory theStyleFactory = (StyleFactory)EPackage.Registry.INSTANCE.getEFactory(StylePackage.eNS_URI);
+			if (theStyleFactory != null) {
+				return theStyleFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new StyleFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public StyleFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case StylePackage.PAPYRUS_VIEW_STYLE: return createPapyrusViewStyle();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public PapyrusViewStyle createPapyrusViewStyle() {
+		PapyrusViewStyleImpl papyrusViewStyle = new PapyrusViewStyleImpl();
+		return papyrusViewStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public StylePackage getStylePackage() {
+		return (StylePackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static StylePackage getPackage() {
+		return StylePackage.eINSTANCE;
+	}
+
+} // StyleFactoryImpl
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/impl/StylePackageImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/impl/StylePackageImpl.java
index f1239025ea5..e149009c914 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/impl/StylePackageImpl.java
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/impl/StylePackageImpl.java
@@ -1,231 +1,207 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.style.impl;

-

-import org.eclipse.emf.ecore.EClass;

-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.gmf.runtime.notation.NotationPackage;

-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;

-import org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle;

-import org.eclipse.papyrus.infra.viewpoints.style.StyleFactory;

-import org.eclipse.papyrus.infra.viewpoints.style.StylePackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class StylePackageImpl extends EPackageImpl implements StylePackage {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass papyrusViewStyleEClass = null;

-

-	/**

-	 * Creates an instance of the model <b>Package</b>, registered with

-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

-	 * package URI value.

-	 * <p>

-	 * Note: the correct way to create the package is via the static

-	 * factory method {@link #init init()}, which also performs

-	 * initialization of the package, or returns the registered package,

-	 * if one already exists.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.papyrus.infra.viewpoints.style.StylePackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private StylePackageImpl() {

-		super(eNS_URI, StyleFactory.eINSTANCE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private static boolean isInited = false;

-

-	/**

-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 *

-	 * <p>

-	 * This method is used to initialize {@link StylePackage#eINSTANCE} when that field is accessed.

-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see #eNS_URI

-	 * @see #createPackageContents()

-	 * @see #initializePackageContents()

-	 * @generated

-	 */

-	public static StylePackage init() {

-		if (isInited) {

-			return (StylePackage) EPackage.Registry.INSTANCE.getEPackage(StylePackage.eNS_URI);

-		}

-

-		// Obtain or create and register package

-		StylePackageImpl theStylePackage = (StylePackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof StylePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new StylePackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		ConfigurationPackage.eINSTANCE.eClass();

-		NotationPackage.eINSTANCE.eClass();

-

-		// Create package meta-data objects

-		theStylePackage.createPackageContents();

-

-		// Initialize created meta-data

-		theStylePackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theStylePackage.freeze();

-

-

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(StylePackage.eNS_URI, theStylePackage);

-		return theStylePackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getPapyrusViewStyle() {

-		return papyrusViewStyleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getPapyrusViewStyle_Owner() {

-		return (EReference) papyrusViewStyleEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getPapyrusViewStyle_Configuration() {

-		return (EReference) papyrusViewStyleEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public StyleFactory getStyleFactory() {

-		return (StyleFactory) getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * Creates the meta-model objects for the package. This method is

-	 * guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void createPackageContents() {

-		if (isCreated) {

-			return;

-		}

-		isCreated = true;

-

-		// Create classes and their features

-		papyrusViewStyleEClass = createEClass(PAPYRUS_VIEW_STYLE);

-		createEReference(papyrusViewStyleEClass, PAPYRUS_VIEW_STYLE__OWNER);

-		createEReference(papyrusViewStyleEClass, PAPYRUS_VIEW_STYLE__CONFIGURATION);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * Complete the initialization of the package and its meta-model. This

-	 * method is guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void initializePackageContents() {

-		if (isInitialized) {

-			return;

-		}

-		isInitialized = true;

-

-		// Initialize package

-		setName(eNAME);

-		setNsPrefix(eNS_PREFIX);

-		setNsURI(eNS_URI);

-

-		// Obtain other dependent packages

-		NotationPackage theNotationPackage = (NotationPackage) EPackage.Registry.INSTANCE.getEPackage(NotationPackage.eNS_URI);

-		EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);

-		ConfigurationPackage theConfigurationPackage = (ConfigurationPackage) EPackage.Registry.INSTANCE.getEPackage(ConfigurationPackage.eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		papyrusViewStyleEClass.getESuperTypes().add(theNotationPackage.getStyle());

-

-		// Initialize classes, features, and operations; add parameters

-		initEClass(papyrusViewStyleEClass, PapyrusViewStyle.class, "PapyrusViewStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getPapyrusViewStyle_Owner(), theEcorePackage.getEObject(), null, "owner", null, 1, 1, PapyrusViewStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,

-				IS_ORDERED);

-		initEReference(getPapyrusViewStyle_Configuration(), theConfigurationPackage.getPapyrusView(), null, "configuration", null, 0, 1, PapyrusViewStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		// Create resource

-		createResource(eNS_URI);

-	}

-

-} // StylePackageImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *
+ *
+ */
+package org.eclipse.papyrus.infra.viewpoints.style.impl;
+
+import org.eclipse.emf.ecore.EClass;
+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.gmf.runtime.notation.NotationPackage;
+import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
+import org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle;
+import org.eclipse.papyrus.infra.viewpoints.style.StyleFactory;
+import org.eclipse.papyrus.infra.viewpoints.style.StylePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class StylePackageImpl extends EPackageImpl implements StylePackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass papyrusViewStyleEClass = null;
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.papyrus.infra.viewpoints.style.StylePackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private StylePackageImpl() {
+		super(eNS_URI, StyleFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>This method is used to initialize {@link StylePackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static StylePackage init() {
+		if (isInited) return (StylePackage)EPackage.Registry.INSTANCE.getEPackage(StylePackage.eNS_URI);
+
+		// Obtain or create and register package
+		StylePackageImpl theStylePackage = (StylePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof StylePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new StylePackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		ConfigurationPackage.eINSTANCE.eClass();
+		NotationPackage.eINSTANCE.eClass();
+
+		// Create package meta-data objects
+		theStylePackage.createPackageContents();
+
+		// Initialize created meta-data
+		theStylePackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theStylePackage.freeze();
+
+  
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(StylePackage.eNS_URI, theStylePackage);
+		return theStylePackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getPapyrusViewStyle() {
+		return papyrusViewStyleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getPapyrusViewStyle_Owner() {
+		return (EReference)papyrusViewStyleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getPapyrusViewStyle_Configuration() {
+		return (EReference)papyrusViewStyleEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public StyleFactory getStyleFactory() {
+		return (StyleFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		papyrusViewStyleEClass = createEClass(PAPYRUS_VIEW_STYLE);
+		createEReference(papyrusViewStyleEClass, PAPYRUS_VIEW_STYLE__OWNER);
+		createEReference(papyrusViewStyleEClass, PAPYRUS_VIEW_STYLE__CONFIGURATION);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		NotationPackage theNotationPackage = (NotationPackage)EPackage.Registry.INSTANCE.getEPackage(NotationPackage.eNS_URI);
+		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+		ConfigurationPackage theConfigurationPackage = (ConfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(ConfigurationPackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		papyrusViewStyleEClass.getESuperTypes().add(theNotationPackage.getStyle());
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(papyrusViewStyleEClass, PapyrusViewStyle.class, "PapyrusViewStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getPapyrusViewStyle_Owner(), theEcorePackage.getEObject(), null, "owner", null, 1, 1, PapyrusViewStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getPapyrusViewStyle_Configuration(), theConfigurationPackage.getPapyrusView(), null, "configuration", null, 0, 1, PapyrusViewStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		// Create resource
+		createResource(eNS_URI);
+	}
+
+} // StylePackageImpl
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/util/StyleAdapterFactory.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/util/StyleAdapterFactory.java
index 7232969113e..a7bec871683 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/util/StyleAdapterFactory.java
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/util/StyleAdapterFactory.java
@@ -1,159 +1,146 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.style.util;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.notation.Style;

-import org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle;

-import org.eclipse.papyrus.infra.viewpoints.style.StylePackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Adapter Factory</b> for the model.

- * It provides an adapter <code>createXXX</code> method for each class of the model.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.infra.viewpoints.style.StylePackage

- * @generated

- */

-public class StyleAdapterFactory extends AdapterFactoryImpl {

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static StylePackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public StyleAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = StylePackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Returns whether this factory is applicable for the type of the object.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return whether this factory is applicable for the type of the object.

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

-			return true;

-		}

-		if (object instanceof EObject) {

-			return ((EObject) object).eClass().getEPackage() == modelPackage;

-		}

-		return false;

-	}

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected StyleSwitch<Adapter> modelSwitch = new StyleSwitch<Adapter>() {

-		@Override

-		public Adapter casePapyrusViewStyle(PapyrusViewStyle object) {

-			return createPapyrusViewStyleAdapter();

-		}

-

-		@Override

-		public Adapter caseStyle(Style object) {

-			return createStyleAdapter();

-		}

-

-		@Override

-		public Adapter defaultCase(EObject object) {

-			return createEObjectAdapter();

-		}

-	};

-

-	/**

-	 * Creates an adapter for the <code>target</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param target

-	 *            the object to adapt.

-	 * @return the adapter for the <code>target</code>.

-	 * @generated

-	 */

-	@Override

-	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject) target);

-	}

-

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle <em>Papyrus View Style</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle

-	 * @generated

-	 */

-	public Adapter createPapyrusViewStyleAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.Style <em>Style</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.gmf.runtime.notation.Style

-	 * @generated

-	 */

-	public Adapter createStyleAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for the default case.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @generated

-	 */

-	public Adapter createEObjectAdapter() {

-		return null;

-	}

-

-} // StyleAdapterFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *
+ *
+ */
+package org.eclipse.papyrus.infra.viewpoints.style.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.notation.Style;
+import org.eclipse.papyrus.infra.viewpoints.style.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.viewpoints.style.StylePackage
+ * @generated
+ */
+public class StyleAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static StylePackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public StyleAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = StylePackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected StyleSwitch<Adapter> modelSwitch = new StyleSwitch<Adapter>() {
+			@Override
+			public Adapter casePapyrusViewStyle(PapyrusViewStyle object) {
+				return createPapyrusViewStyleAdapter();
+			}
+			@Override
+			public Adapter caseStyle(Style object) {
+				return createStyleAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle <em>Papyrus View Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle
+	 * @generated
+	 */
+	public Adapter createPapyrusViewStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.runtime.notation.Style <em>Style</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.gmf.runtime.notation.Style
+	 * @generated
+	 */
+	public Adapter createStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+
+} // StyleAdapterFactory
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/util/StyleResourceFactoryImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/util/StyleResourceFactoryImpl.java
index 9391aee8cbe..7c124e562d1 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/util/StyleResourceFactoryImpl.java
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/util/StyleResourceFactoryImpl.java
@@ -21,7 +21,6 @@ import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
  * <!-- begin-user-doc -->
  * The <b>Resource Factory</b> associated with the package.
  * <!-- end-user-doc -->
- *
  * @see org.eclipse.papyrus.infra.viewpoints.style.util.StyleResourceImpl
  * @generated
  */
@@ -30,7 +29,6 @@ public class StyleResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public StyleResourceFactoryImpl() {
@@ -41,7 +39,6 @@ public class StyleResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/util/StyleResourceImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/util/StyleResourceImpl.java
index 464146f87b8..63de02e9109 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/util/StyleResourceImpl.java
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/util/StyleResourceImpl.java
@@ -20,7 +20,6 @@ import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
  * <!-- begin-user-doc -->
  * The <b>Resource </b> associated with the package.
  * <!-- end-user-doc -->
- *
  * @see org.eclipse.papyrus.infra.viewpoints.style.util.StyleResourceFactoryImpl
  * @generated
  */
@@ -29,9 +28,7 @@ public class StyleResourceImpl extends XMIResourceImpl {
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param uri
-	 *            the URI of the new resource.
+	 * @param uri the URI of the new resource.
 	 * @generated
 	 */
 	public StyleResourceImpl(URI uri) {
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/util/StyleSwitch.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/util/StyleSwitch.java
index a4f548f64aa..7e2e3ae167a 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/util/StyleSwitch.java
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/util/StyleSwitch.java
@@ -1,153 +1,135 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *

- */

-package org.eclipse.papyrus.infra.viewpoints.style.util;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.gmf.runtime.notation.Style;

-import org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle;

-import org.eclipse.papyrus.infra.viewpoints.style.StylePackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

- * starting with the actual class of the object

- * and proceeding up the inheritance hierarchy

- * until a non-null result is returned,

- * which is the result of the switch.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.infra.viewpoints.style.StylePackage

- * @generated

- */

-public class StyleSwitch<T> extends Switch<T> {

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static StylePackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public StyleSwitch() {

-		if (modelPackage == null) {

-			modelPackage = StylePackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Checks whether this is a switch for the given package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param ePackage

-	 *            the package in question.

-	 * @return whether this is a switch for the given package.

-	 * @generated

-	 */

-	@Override

-	protected boolean isSwitchFor(EPackage ePackage) {

-		return ePackage == modelPackage;

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	@Override

-	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-		case StylePackage.PAPYRUS_VIEW_STYLE: {

-			PapyrusViewStyle papyrusViewStyle = (PapyrusViewStyle) theEObject;

-			T result = casePapyrusViewStyle(papyrusViewStyle);

-			if (result == null) {

-				result = caseStyle(papyrusViewStyle);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Papyrus View Style</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>Papyrus View Style</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T casePapyrusViewStyle(PapyrusViewStyle object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Style</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>Style</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseStyle(Style object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch, but this is the last case anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

-	 * @generated

-	 */

-	@Override

-	public T defaultCase(EObject object) {

-		return null;

-	}

-

-} // StyleSwitch

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *
+ *
+ */
+package org.eclipse.papyrus.infra.viewpoints.style.util;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.gmf.runtime.notation.Style;
+import org.eclipse.papyrus.infra.viewpoints.style.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.viewpoints.style.StylePackage
+ * @generated
+ */
+public class StyleSwitch<T> extends Switch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static StylePackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public StyleSwitch() {
+		if (modelPackage == null) {
+			modelPackage = StylePackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case StylePackage.PAPYRUS_VIEW_STYLE: {
+				PapyrusViewStyle papyrusViewStyle = (PapyrusViewStyle)theEObject;
+				T result = casePapyrusViewStyle(papyrusViewStyle);
+				if (result == null) result = caseStyle(papyrusViewStyle);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Papyrus View Style</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>Papyrus View Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T casePapyrusViewStyle(PapyrusViewStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Style</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>Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseStyle(Style object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+
+} // StyleSwitch
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/IViewTypeHelper.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/IViewTypeHelper.java
index a0f26353408..57eaaee3d2a 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/IViewTypeHelper.java
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/IViewTypeHelper.java
@@ -1,60 +1,60 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.viewpoints.policy;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView;

-

-

-/**

- * Represents a helper for the handling of view creation commands

- *

- * @author Laurent Wouters

- */

-public interface IViewTypeHelper {

-	/**

-	 * Determines whether the given type of view is supported by this helper

-	 *

-	 * @return <code>true</code> if the type of view is supported by this helper

-	 */

-	boolean isSupported(EClass type);

-

-	/**

-	 * Determines whether the given object represents a view that is supported by this helper

-	 *

-	 * @param view

-	 *            The object to enquire

-	 * @return <code>true</code> if the object represents a view supported by this helper

-	 */

-	boolean isSupported(EObject view);

-

-	/**

-	 * Gets the prototype for the given configuration element

-	 *

-	 * @param configuration

-	 *            A view configuration element

-	 * @return The associated prototype

-	 */

-	ViewPrototype getPrototypeFor(PapyrusView configuration);

-

-	/**

-	 * Gets the prototype of the given view

-	 *

-	 * @param view

-	 *            The view

-	 * @return The prototype of the given view

-	 */

-	ViewPrototype getPrototypeOf(EObject view);

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.viewpoints.policy;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind;
+
+
+/**
+ * Represents a helper for the handling of view creation commands
+ *
+ * @author Laurent Wouters
+ */
+public interface IViewTypeHelper {
+	/**
+	 * Determines whether the given type of view is supported by this helper
+	 *
+	 * @return <code>true</code> if the type of view is supported by this helper
+	 */
+	boolean isSupported(EClass type);
+
+	/**
+	 * Determines whether the given object represents a view that is supported by this helper
+	 *
+	 * @param view
+	 *            The object to enquire
+	 * @return <code>true</code> if the object represents a view supported by this helper
+	 */
+	boolean isSupported(EObject view);
+
+	/**
+	 * Gets the prototype for the given configuration element
+	 *
+	 * @param configuration
+	 *            A view configuration element
+	 * @return The associated prototype
+	 */
+	ViewPrototype getPrototypeFor(PapyrusRepresentationKind configuration);
+
+	/**
+	 * Gets the prototype of the given view
+	 *
+	 * @param view
+	 *            The view
+	 * @return The prototype of the given view
+	 */
+	ViewPrototype getPrototypeOf(EObject view);
+}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ModelAddData.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ModelAddData.java
index 303335964be..2b4d148b5cf 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ModelAddData.java
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ModelAddData.java
@@ -1,202 +1,202 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.viewpoints.policy;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.papyrus.infra.viewpoints.configuration.PathElement;

-

-/**

- * Represents the set of data related to the insertion of a new model element in a view

- *

- * @author Laurent Wouters

- */

-public class ModelAddData {

-	private boolean permit;

-	private List<EReference> path;

-	private EObject undoOrigin;

-	private EReference undoReference;

-	private EObject undoValuePrevious;

-	private EObject undoValueNext;

-

-	/**

-	 * Determines whether the insertion is permitted

-	 *

-	 * @return <code>true</code> if it is permitted

-	 */

-	public boolean isPermitted() {

-		return permit;

-	}

-

-	/**

-	 * Determines whether an insertion path for the new element has been defined

-	 *

-	 * @return <code>true</code> if an insertion path has been defined

-	 */

-	public boolean isPathDefined() {

-		return (path != null);

-	}

-

-	/**

-	 * Initializes this set of data without an insertion path

-	 *

-	 * @param permit

-	 *            Is the insertion permitted?

-	 */

-	public ModelAddData(boolean permit) {

-		this.permit = permit;

-	}

-

-	/**

-	 * Initializes this set of data

-	 *

-	 * @param permit

-	 *            Is the insertion permitted?

-	 * @param insertionPath

-	 *            The insertion path

-	 */

-	public ModelAddData(boolean permit, EList<PathElement> insertionPath) {

-		this.permit = permit;

-		if (insertionPath != null && !insertionPath.isEmpty()) {

-			this.path = new ArrayList<EReference>(insertionPath.size());

-			for (int i = 0; i != insertionPath.size(); i++) {

-				path.add(insertionPath.get(i).getFeature());

-			}

-		}

-	}

-

-	/**

-	 * Execute the insertion represented by this object on the given origin object

-	 *

-	 * @param origin

-	 *            The origin object

-	 * @param target

-	 *            The object to insert

-	 * @return <code>true</code> if the insertion was successful

-	 */

-	public boolean execute(EObject origin, EObject target) {

-		EObject current = origin;

-		int index = 0;

-		while (index < path.size() - 1) {

-			current = buildPathStep(current, path.get(index));

-			if (current == null) {

-				return false;

-			}

-			index++;

-		}

-		EReference feature = path.get(path.size() - 1);

-		if (feature.isMany()) {

-			EList list = (EList) current.eGet(feature);

-			list.add(target);

-			setUndo(current, feature, null, target);

-		} else {

-			setUndo(current, feature, (EObject) current.eGet(feature), target);

-			current.eSet(feature, target);

-		}

-		return true;

-	}

-

-	/**

-	 * Undo the effect of a previous execute

-	 */

-	public void undoExecute() {

-		if (undoReference.isMany()) {

-			((EList) undoOrigin.eGet(undoReference)).remove(undoValueNext);

-		} else {

-			undoOrigin.eSet(undoReference, undoValuePrevious);

-		}

-	}

-

-	/**

-	 * Re-execute the insertion represented by this object

-	 */

-	public void redoExecute() {

-		if (undoReference.isMany()) {

-			((EList) undoOrigin.eGet(undoReference)).add(undoValueNext);

-		} else {

-			undoOrigin.eSet(undoReference, undoValueNext);

-		}

-	}

-

-	/**

-	 * Executes a step in the insertion path

-	 *

-	 * @param current

-	 *            The current object

-	 * @param feature

-	 *            The feature to resolve on the object

-	 * @return The resolved object at this step that is now contained in current.feature

-	 */

-	private EObject buildPathStep(EObject current, EReference feature) {

-		Object value = current.eGet(feature);

-		if (value == null) {

-			// Try to create an instance of the type

-			EClass type = feature.getEReferenceType();

-			if (type.isAbstract())

-			{

-				return null; // Too bad, we can't fix this

-			}

-			EObject inst = EcoreUtil.create(type);

-			current.eSet(feature, inst);

-			setUndo(current, feature, null, inst);

-			return inst;

-		} else if (value instanceof EList) {

-			EList list = (EList) value;

-			// If we got at least one element, return the first one

-			if (!list.isEmpty()) {

-				return (EObject) list.get(0);

-			}

-			// We have to create one

-			EClass type = feature.getEReferenceType();

-			if (type.isAbstract())

-			{

-				return null; // Too bad, we can't fix this

-			}

-			EObject inst = EcoreUtil.create(type);

-			list.add(inst);

-			setUndo(current, feature, null, inst);

-			return inst;

-		} else {

-			return (EObject) value;

-		}

-	}

-

-	/**

-	 * Sets up the undo data if necessary

-	 *

-	 * @param origin

-	 *            The modified object

-	 * @param feature

-	 *            The modified feature

-	 * @param previous

-	 *            The previous value

-	 * @param next

-	 *            The target value

-	 */

-	private void setUndo(EObject origin, EReference feature, EObject previous, EObject next) {

-		if (undoReference == null) {

-			return;

-		}

-		undoOrigin = origin;

-		undoReference = feature;

-		undoValuePrevious = previous;

-		undoValueNext = next;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.viewpoints.policy;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.papyrus.infra.gmfdiag.representation.PathElement;
+
+/**
+ * Represents the set of data related to the insertion of a new model element in a view
+ *
+ * @author Laurent Wouters
+ */
+public class ModelAddData {
+	private boolean permit;
+	private List<EReference> path;
+	private EObject undoOrigin;
+	private EReference undoReference;
+	private EObject undoValuePrevious;
+	private EObject undoValueNext;
+
+	/**
+	 * Determines whether the insertion is permitted
+	 *
+	 * @return <code>true</code> if it is permitted
+	 */
+	public boolean isPermitted() {
+		return permit;
+	}
+
+	/**
+	 * Determines whether an insertion path for the new element has been defined
+	 *
+	 * @return <code>true</code> if an insertion path has been defined
+	 */
+	public boolean isPathDefined() {
+		return (path != null);
+	}
+
+	/**
+	 * Initializes this set of data without an insertion path
+	 *
+	 * @param permit
+	 *            Is the insertion permitted?
+	 */
+	public ModelAddData(boolean permit) {
+		this.permit = permit;
+	}
+
+	/**
+	 * Initializes this set of data
+	 *
+	 * @param permit
+	 *            Is the insertion permitted?
+	 * @param insertionPath
+	 *            The insertion path
+	 */
+	public ModelAddData(boolean permit, EList<PathElement> insertionPath) {
+		this.permit = permit;
+		if (insertionPath != null && !insertionPath.isEmpty()) {
+			this.path = new ArrayList<EReference>(insertionPath.size());
+			for (int i = 0; i != insertionPath.size(); i++) {
+				path.add(insertionPath.get(i).getFeature());
+			}
+		}
+	}
+
+	/**
+	 * Execute the insertion represented by this object on the given origin object
+	 *
+	 * @param origin
+	 *            The origin object
+	 * @param target
+	 *            The object to insert
+	 * @return <code>true</code> if the insertion was successful
+	 */
+	public boolean execute(EObject origin, EObject target) {
+		EObject current = origin;
+		int index = 0;
+		while (index < path.size() - 1) {
+			current = buildPathStep(current, path.get(index));
+			if (current == null) {
+				return false;
+			}
+			index++;
+		}
+		EReference feature = path.get(path.size() - 1);
+		if (feature.isMany()) {
+			EList list = (EList) current.eGet(feature);
+			list.add(target);
+			setUndo(current, feature, null, target);
+		} else {
+			setUndo(current, feature, (EObject) current.eGet(feature), target);
+			current.eSet(feature, target);
+		}
+		return true;
+	}
+
+	/**
+	 * Undo the effect of a previous execute
+	 */
+	public void undoExecute() {
+		if (undoReference.isMany()) {
+			((EList) undoOrigin.eGet(undoReference)).remove(undoValueNext);
+		} else {
+			undoOrigin.eSet(undoReference, undoValuePrevious);
+		}
+	}
+
+	/**
+	 * Re-execute the insertion represented by this object
+	 */
+	public void redoExecute() {
+		if (undoReference.isMany()) {
+			((EList) undoOrigin.eGet(undoReference)).add(undoValueNext);
+		} else {
+			undoOrigin.eSet(undoReference, undoValueNext);
+		}
+	}
+
+	/**
+	 * Executes a step in the insertion path
+	 *
+	 * @param current
+	 *            The current object
+	 * @param feature
+	 *            The feature to resolve on the object
+	 * @return The resolved object at this step that is now contained in current.feature
+	 */
+	private EObject buildPathStep(EObject current, EReference feature) {
+		Object value = current.eGet(feature);
+		if (value == null) {
+			// Try to create an instance of the type
+			EClass type = feature.getEReferenceType();
+			if (type.isAbstract())
+			{
+				return null; // Too bad, we can't fix this
+			}
+			EObject inst = EcoreUtil.create(type);
+			current.eSet(feature, inst);
+			setUndo(current, feature, null, inst);
+			return inst;
+		} else if (value instanceof EList) {
+			EList list = (EList) value;
+			// If we got at least one element, return the first one
+			if (!list.isEmpty()) {
+				return (EObject) list.get(0);
+			}
+			// We have to create one
+			EClass type = feature.getEReferenceType();
+			if (type.isAbstract())
+			{
+				return null; // Too bad, we can't fix this
+			}
+			EObject inst = EcoreUtil.create(type);
+			list.add(inst);
+			setUndo(current, feature, null, inst);
+			return inst;
+		} else {
+			return (EObject) value;
+		}
+	}
+
+	/**
+	 * Sets up the undo data if necessary
+	 *
+	 * @param origin
+	 *            The modified object
+	 * @param feature
+	 *            The modified feature
+	 * @param previous
+	 *            The previous value
+	 * @param next
+	 *            The target value
+	 */
+	private void setUndo(EObject origin, EReference feature, EObject previous, EObject next) {
+		if (undoReference == null) {
+			return;
+		}
+		undoOrigin = origin;
+		undoReference = feature;
+		undoValuePrevious = previous;
+		undoValueNext = next;
+	}
+}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ModelRuleConstraintEngine.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ModelRuleConstraintEngine.java
index a6f1fb08f0d..1558d2f64a3 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ModelRuleConstraintEngine.java
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ModelRuleConstraintEngine.java
@@ -28,7 +28,7 @@ import org.eclipse.papyrus.infra.constraints.constraints.Constraint;
 import org.eclipse.papyrus.infra.constraints.runtime.ConstraintEngine;
 import org.eclipse.papyrus.infra.constraints.runtime.ConstraintFactory;
 import org.eclipse.papyrus.infra.constraints.runtime.DefaultConstraintEngine;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ModelRule;
+import org.eclipse.papyrus.infra.architecture.representation.ModelRule;
 
 /**
  * {@link ConstraintEngine} for viewpoint {@link ModelRule}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/PolicyChecker.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/PolicyChecker.java
index cc3cc99dba0..e80bc997e8e 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/PolicyChecker.java
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/PolicyChecker.java
@@ -17,69 +17,39 @@ package org.eclipse.papyrus.infra.viewpoints.policy;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.Map;
 
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 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.util.EcoreUtil;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.core.pluginexplorer.Plugin;
-import org.eclipse.papyrus.infra.core.pluginexplorer.PluginEntry;
-import org.eclipse.papyrus.infra.viewpoints.configuration.AssistantRule;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ChildRule;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ModelAutoCreate;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ModelRule;
-import org.eclipse.papyrus.infra.viewpoints.configuration.OwningRule;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PaletteRule;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusConfiguration;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusViewpoint;
-import org.eclipse.papyrus.infra.viewpoints.iso42010.ArchitectureViewpoint;
-import org.eclipse.papyrus.infra.viewpoints.iso42010.ModelKind;
-import org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder;
-import org.eclipse.papyrus.infra.viewpoints.policy.listener.PolicyCheckerNotifier;
+import org.eclipse.papyrus.infra.core.architecture.RepresentationKind;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureContext;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureViewpoint;
+import org.eclipse.papyrus.infra.architecture.representation.ModelAutoCreate;
+import org.eclipse.papyrus.infra.architecture.representation.ModelRule;
+import org.eclipse.papyrus.infra.architecture.representation.OwningRule;
+import org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind;
+import org.eclipse.papyrus.infra.architecture.ArchitectureDomainManager;
+import org.eclipse.papyrus.infra.architecture.ArchitectureDescriptionUtils;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.gmfdiag.representation.AssistantRule;
+import org.eclipse.papyrus.infra.gmfdiag.representation.ChildRule;
+import org.eclipse.papyrus.infra.gmfdiag.representation.PaletteRule;
+import org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram;
 
 /**
- * The <code>PolicyChecker</code> enforces the viewpoints configuration as a policy in the user interface
+ * The <code>PolicyChecker</code> enforces the viewpoints description as a policy in the user interface
  *
  * @author Laurent Wouters
  */
 public class PolicyChecker {
 	/**
-	 * ID of the extension point defining the configurations
-	 */
-	private static final String EXTENSION_ID = "org.eclipse.papyrus.infra.viewpoints.policy.custom";
-	/**
-	 * The cache of loaded configurations
-	 */
-	private static final Map<String, PapyrusConfiguration> CONFIGURATIONS_CACHE = new HashMap<String, PapyrusConfiguration>();
-	/**
-	 * The resource set for our configuration cache. Use a single resource set for loading configurations so that configurations
-	 * for dynamic profiles don't cause the UML metamodel and all of its dependencies to be loaded repeatedly
-	 */
-	private static final ResourceSet CONFIGURATIONS_RESOURCE_SET = new ResourceSetImpl();
-	/**
-	 * The default built-in configuration
-	 */
-	private static final PapyrusConfiguration CONFIG_BUILTIN_DEFAULT = loadDefaultConfiguration("builtin/default.configuration");
-	/**
 	 * Default result when the current policy cannot determine whether an element can be added to a view
 	 */
 	private static final boolean DEFAULT_POLICY_UNKNOWN_CHILD = false;
@@ -87,8 +57,6 @@ public class PolicyChecker {
 	 * Default result when the current policy cannot determine whether a palette item should be exposed
 	 */
 	private static final boolean DEFAULT_POLICY_UNKNWON_PALETTE = true;
-
-
 	/**
 	 * Policy check result allowing an action
 	 */
@@ -102,379 +70,65 @@ public class PolicyChecker {
 	 */
 	private static final int RESULT_DENY = -1;
 
-	/**
-	 * Loads a built-in configuration
-	 *
-	 * @param name
-	 *            The name of the configuration
-	 * @return The loaded configuration
-	 */
-	private static PapyrusConfiguration loadDefaultConfiguration(String name) {
-		Plugin me = new Plugin(Activator.getDefault().getBundle());
-		PluginEntry entry = me.getEntry(name);
-		return loadConfigurationFrom(entry.getLogicalPath());
+	public static PolicyChecker getFor(EObject object) {
+		if (object.eResource() != null)
+			return getFor(object.eResource());
+		else
+			return getFor(ArchitectureDomainManager.getInstance().getDefaultArchitectureContext());
 	}
-
-	/**
-	 * Loads a viewpoints configuration from the given location.
-	 *
-	 * @param location
-	 *            The location from where to load the configuration
-	 * @return The loaded configuration, or <code>null</code> if the operation failed
-	 */
-	public static PapyrusConfiguration loadConfigurationFrom(String location) {
-		if (location == null) {
-			return null;
-		}
-		if (location.isEmpty()) {
-			return null;
-		}
-		URI uri = null;
-		if (location.startsWith("platform:/")) {
-			uri = URI.createURI(location);
-		} else {
-			uri = URI.createFileURI(location);
-		}
-		location = uri.toString();
-		PapyrusConfiguration config = CONFIGURATIONS_CACHE.get(location);
-		if (config != null) {
-			return config;
-		}
-		Resource res = CONFIGURATIONS_RESOURCE_SET.getResource(uri, true);
-		EList<EObject> contents = res.getContents();
-		if (contents.size() > 0) {
-			config = (PapyrusConfiguration) contents.get(0);
-			CONFIGURATIONS_CACHE.put(location, config);
-		}
-		return config;
+	
+	public static PolicyChecker getFor(Resource resource) {
+		if (resource.getResourceSet() != null)
+			return getFor(resource.getResourceSet());
+		else
+			return getFor(ArchitectureDomainManager.getInstance().getDefaultArchitectureContext());
 	}
 
-	/**
-	 * Gets the default configuration
-	 *
-	 * @return The default configuration
-	 */
-	public static PapyrusConfiguration getDefaultConfiguration() {
-		return CONFIG_BUILTIN_DEFAULT;
+	public static PolicyChecker getFor(ResourceSet resourceSet) {
+		if (resourceSet instanceof ModelSet)
+			return getFor((ModelSet) resourceSet);
+		else
+			return getFor(ArchitectureDomainManager.getInstance().getDefaultArchitectureContext());
 	}
 
-
-	private static Map<String, Collection<String>> CONTRIBUTIONS_DEFINITON = null;
-	private static Map<PapyrusConfiguration, Collection<PapyrusConfiguration>> CONTRIBUTIONS_CACHE = null;
-
-	/**
-	 * Gets the viewpoints contributing to the given viewpoint
-	 *
-	 * @param viewpoint
-	 *            A viewpoint
-	 * @return A collection of the other viewpoints contributing to the given one
-	 */
-	private static Collection<PapyrusViewpoint> getContributionsTo(PapyrusViewpoint viewpoint) {
-		Collection<PapyrusViewpoint> result = new ArrayList<PapyrusViewpoint>();
-		Collection<PapyrusConfiguration> contributions = getContributionsTo((PapyrusConfiguration) viewpoint.eContainer());
-		for (PapyrusConfiguration contrib : contributions) {
-			for (ArchitectureViewpoint vp : contrib.getViewpoints()) {
-				if (vp instanceof PapyrusViewpoint && vp.getName().equals(viewpoint.getName())) {
-					result.add((PapyrusViewpoint) vp);
-				}
-			}
-		}
-		return result;
+	public static PolicyChecker getFor(ModelSet modelSet) {
+		Collection<MergedArchitectureViewpoint> viewpoints = new ArchitectureDescriptionUtils(modelSet).getArchitectureViewpoints();
+		return getFor(viewpoints);
 	}
-
-	/**
-	 * Gets the configurations contributing to the given configuration
-	 *
-	 * @param config
-	 *            A configuration
-	 * @return A collection of the contributing configurations
-	 */
-	private static Collection<PapyrusConfiguration> getContributionsTo(PapyrusConfiguration config) {
-		if (CONTRIBUTIONS_CACHE == null) {
-			loadContributions();
-		}
-		Collection<PapyrusConfiguration> result = CONTRIBUTIONS_CACHE.get(config);
-		if (result != null) {
-			return result;
-		}
-		result = new ArrayList<PapyrusConfiguration>();
-		CONTRIBUTIONS_CACHE.put(config, result);
-		for (Map.Entry<String, PapyrusConfiguration> entry : CONFIGURATIONS_CACHE.entrySet()) {
-			if (entry.getValue() == config) {
-				Collection<String> contribURIs = CONTRIBUTIONS_DEFINITON.get(entry.getKey());
-				if (contribURIs != null) {
-					for (String uri : contribURIs) {
-						result.add(loadConfigurationFrom(uri));
-					}
-				}
-				return result;
-			}
-		}
-		return result;
+	
+	public static PolicyChecker getFor(MergedArchitectureContext context) {
+		return new PolicyChecker(context.getViewpoints());
 	}
 
-	/**
-	 * Loads the viewpoints contribution data from the extension points
-	 */
-	private static void loadContributions() {
-		CONTRIBUTIONS_DEFINITON = new HashMap<String, Collection<String>>();
-		CONTRIBUTIONS_CACHE = new HashMap<PapyrusConfiguration, Collection<PapyrusConfiguration>>();
-
-		IExtensionRegistry registry = Platform.getExtensionRegistry();
-		IExtensionPoint point = registry.getExtensionPoint(EXTENSION_ID);
-		IExtension[] extensions = point.getExtensions();
-
-		for (int i = 0; i != extensions.length; i++) {
-			String plugin = extensions[i].getContributor().getName();
-			IConfigurationElement[] elements = extensions[i].getConfigurationElements();
-			for (int j = 0; j != elements.length; j++) {
-				if (elements[j].getName().equals("contribution")) {
-					String uriOriginal = getCanonicalURI(plugin, elements[j].getAttribute("original"));
-					String uriContrib = getCanonicalURI(plugin, elements[j].getAttribute("file"));
-					Collection<String> list = CONTRIBUTIONS_DEFINITON.get(uriOriginal);
-					if (list == null) {
-						list = new ArrayList<String>();
-						CONTRIBUTIONS_DEFINITON.put(uriOriginal, list);
-					}
-					list.add(uriContrib);
-				}
-			}
-		}
+	public static PolicyChecker getFor(Collection<MergedArchitectureViewpoint> viewpoints) {
+		return new PolicyChecker(viewpoints);
 	}
 
 	/**
-	 * Gets the canonical (absolute) URI from a potentially plugin-relative URI
-	 *
-	 * @param plugin
-	 *            The container plugin
-	 * @param uri
-	 *            The URI to canonicalize
-	 * @return The canonical (absolute) URI
-	 */
-	private static String getCanonicalURI(String plugin, String uri) {
-		if (uri.startsWith(PreferenceConstants.P_CONF_PATH_SCHEME_PLUGIN_VALUE)) {
-			return uri;
-		}
-		return PreferenceConstants.P_CONF_PATH_SCHEME_PLUGIN_VALUE + plugin + "/" + uri;
-	}
-
-
-	/**
-	 * Gets the preference store for the viewpoints-related preferences
-	 *
-	 * @return The preference store for the viewpoints-related preferences
-	 */
-	public static IPreferenceStore getPreferences() {
-		return Activator.getDefault().getPreferenceStore();
-	}
-
-
-	/**
-	 * The current (global) instance
-	 */
-	private static PolicyChecker currentPolicyChecker;
-
-	/**
-	 * Gets the policy checker currently enforcing the viewpoints configuration
-	 *
-	 * @return The current policy checker
-	 */
-	public static synchronized PolicyChecker getCurrent() {
-		if (currentPolicyChecker == null) {
-			currentPolicyChecker = new PolicyChecker();
-			PolicyCheckerNotifier.getInstance().fire(currentPolicyChecker);
-		}
-		return currentPolicyChecker;
-	}
-
-	/**
-	 * Sets the policy checker currently enforcing the viewpoints configuration
-	 *
-	 * @param pc
-	 *            The new policy checker
-	 */
-	public static void setCurrent(PolicyChecker pc) {
-		currentPolicyChecker = pc;
-		PolicyCheckerNotifier.getInstance().fire(pc);
-	}
-
-
-	/**
-	 * The checker's configuration
-	 */
-	private PapyrusConfiguration configuration;
-
-	/**
-	 * Force only one type of view per model element
-	 */
-	private boolean oneViewPerElem;
-
-	/**
-	 * The current stakeholder
-	 */
-	private Stakeholder selectedStakeholder;
-
-	/**
-	 * The current viewpoint
-	 */
-	private PapyrusViewpoint selectedViewpoint;
-
-	/**
-	 * The cache of applicable viewpoints, with all contributing configurations taken into account
-	 */
-	private Collection<PapyrusViewpoint> applicableViewpoints;
-
-	/**
 	 * The current profile helper
 	 */
 	private IProfileHelper profileHelper;
 
 	/**
-	 * Gets the configuration enforced by this object
-	 *
-	 * @return The configuration
-	 */
-	public PapyrusConfiguration getConfiguration() {
-		return configuration;
-	}
-
-	/**
-	 * Gets the stakeholder represented by this object
-	 *
-	 * @return The stakeholder
+	 * The architecture viewpoints
 	 */
-	public Stakeholder getStakeholder() {
-		return selectedStakeholder;
-	}
+	private Collection<MergedArchitectureViewpoint> viewpoints;
 
 	/**
 	 * Gets the viewpoint enforced by this object
 	 *
 	 * @return The enforced viewpoint
 	 */
-	public PapyrusViewpoint getViewpoint() {
-		return selectedViewpoint;
+	public Collection<MergedArchitectureViewpoint> getViewpoints() {
+		return viewpoints;
 	}
 
 	/**
 	 * Initializes this instance from the current preferences
 	 */
-	private PolicyChecker() {
-		IPreferenceStore store = getPreferences();
-		String prefType = store.getString(PreferenceConstants.P_CONF_TYPE);
-		String prefForce = store.getString(PreferenceConstants.P_FORCE_MULTIPLICITY);
-		String prefViewpoint = store.getString(PreferenceConstants.P_VIEWPOINT);
-
-		this.profileHelper = ProfileUtils.getProfileHelper();
-		this.oneViewPerElem = "true".equals(prefForce);
-		if (PreferenceConstants.P_CONF_TYPE_DEFAULT_VALUE.equals(prefType)) {
-			this.configuration = CONFIG_BUILTIN_DEFAULT;
-		} else if (PreferenceConstants.P_CONF_TYPE_EXTENSION_VALUE.equals(prefType)) {
-			WeightedConfiguration wc = WeightedConfiguration.getTopConfiguration();
-			this.configuration = (wc != null ? wc.getConfiguration() : null);
-		} else {
-			String scheme = store.getString(PreferenceConstants.P_CONF_PATH_SCHEME);
-			String path = store.getString(PreferenceConstants.P_CONF_PATH);
-			if (PreferenceConstants.P_CONF_PATH_SCHEME_WORKSPACE_VALUE.equals(scheme)) {
-				path = PreferenceConstants.P_CONF_PATH_SCHEME_WORKSPACE_VALUE + path;
-			}
-			this.configuration = loadConfigurationFrom(path);
-		}
-		if (this.configuration == null) {
-			this.configuration = CONFIG_BUILTIN_DEFAULT;
-		}
-
-		if (prefViewpoint != null && !prefViewpoint.isEmpty()) {
-			for (Stakeholder stakeholder : this.configuration.getStakeholders()) {
-				for (ArchitectureViewpoint vp : stakeholder.getViewpoints()) {
-					if (prefViewpoint.equals(vp.getName())) {
-						this.selectedStakeholder = stakeholder;
-						this.selectedViewpoint = (PapyrusViewpoint) vp;
-						buildApplicableViewpoints();
-						return;
-					}
-				}
-			}
-		}
-		this.selectedStakeholder = this.configuration.getDefaultStakeholder();
-		this.selectedViewpoint = (PapyrusViewpoint) this.selectedStakeholder.getViewpoints().get(0);
-		buildApplicableViewpoints();
-	}
-
-	/**
-	 * Initializes this policy checker with the default configuration and viewpoint
-	 *
-	 * @param oneViewPerElem
-	 *            Force only one type of view per model element
-	 */
-	public PolicyChecker(boolean oneViewPerElem) {
-		this.configuration = CONFIG_BUILTIN_DEFAULT;
-		this.oneViewPerElem = oneViewPerElem;
-		this.selectedStakeholder = this.configuration.getDefaultStakeholder();
-		this.selectedViewpoint = (PapyrusViewpoint) this.selectedStakeholder.getViewpoints().get(0);
+	private PolicyChecker(Collection<MergedArchitectureViewpoint> viewpoints) {
 		this.profileHelper = ProfileUtils.getProfileHelper();
-		buildApplicableViewpoints();
-	}
-
-	/**
-	 * Initializes this policy checker with the given configuration and viewpoint
-	 *
-	 * @param config
-	 *            The configuration to enforce
-	 * @param viewpoint
-	 *            The viewpoint to enforce
-	 * @param oneViewPerElem
-	 *            Force only one type of view per model element
-	 */
-	public PolicyChecker(PapyrusConfiguration config, PapyrusViewpoint viewpoint, boolean oneViewPerElem) {
-		this.configuration = config;
-		this.oneViewPerElem = oneViewPerElem;
-		this.selectedViewpoint = viewpoint;
-		this.profileHelper = ProfileUtils.getProfileHelper();
-		buildApplicableViewpoints();
-		for (Stakeholder stakeholder : configuration.getStakeholders()) {
-			if (stakeholder.getViewpoints().contains(viewpoint)) {
-				this.selectedStakeholder = stakeholder;
-				return;
-			}
-		}
-	}
-
-
-	/**
-	 * Builds the <code>applicableViewpoints</code> member from the selected viewpoint.
-	 */
-	private void buildApplicableViewpoints() {
-		applicableViewpoints = new ArrayList<PapyrusViewpoint>();
-		buildApplicableViewpoints(selectedViewpoint);
-	}
-
-	/**
-	 * Builds the <code>applicableViewpoints</code> member from the given viewpoint by adding it,
-	 * as well as its parents and its and all its contributions, recursively
-	 *
-	 * @param vp
-	 *            the viewpoint to add
-	 */
-	private void buildApplicableViewpoints(PapyrusViewpoint vp) {
-		// Guard against cycles, redundant contributions, contributions having the
-		// same parent, and other ways of repeating the processing of any viewpoint
-		if (!applicableViewpoints.contains(vp)) {
-			// This viewpoint
-			applicableViewpoints.add(vp);
-
-			// Its contributions, recursively. Process these first because they
-			// are more likely to be more pertinent to the selected stakeholder
-			// than the inherited viewpoint(s)
-			for (PapyrusViewpoint contrib : getContributionsTo(vp)) {
-				buildApplicableViewpoints(contrib);
-			}
-
-			// Its parents, recursively
-			if ((vp.getParent() != null) && !vp.getParent().eIsProxy()) {
-				buildApplicableViewpoints(vp.getParent());
-			}
-		}
+		this.viewpoints = viewpoints;
 	}
 
 	/**
@@ -492,13 +146,13 @@ public class PolicyChecker {
 		if (prototype == null) {
 			return false;
 		}
-		if (!matchesProfiles(prototype.configuration, profileHelper.getAppliedProfiles(owner))) {
+		if (!matchesProfiles(prototype.representationKind, profileHelper.getAppliedProfiles(owner))) {
 			return false;
 		}
-		if (!matchesProfiles(prototype.configuration, profileHelper.getAppliedProfiles(element))) {
+		if (!matchesProfiles(prototype.representationKind, profileHelper.getAppliedProfiles(element))) {
 			return false;
 		}
-		if (!matchesCreationRoot(prototype.configuration, element, profileHelper.getAppliedStereotypes(element), prototype.getViewCountOn(element))) {
+		if (!matchesCreationRoot(prototype.representationKind, element, profileHelper.getAppliedStereotypes(element), prototype.getViewCountOn(element))) {
 			return false;
 		}
 		return true;
@@ -522,7 +176,7 @@ public class PolicyChecker {
 			return new ModelAddData(false);
 		}
 
-		PapyrusDiagram config = (PapyrusDiagram) prototype.configuration;
+		PapyrusDiagram config = (PapyrusDiagram) prototype.representationKind;
 		Collection<EClass> stereotypes = profileHelper.getAppliedStereotypes(child);
 		while (config != null) {
 			for (ChildRule rule : config.getChildRules()) {
@@ -554,7 +208,7 @@ public class PolicyChecker {
 			return new ModelAddData(false);
 		}
 
-		PapyrusDiagram config = (PapyrusDiagram) prototype.configuration;
+		PapyrusDiagram config = (PapyrusDiagram) prototype.representationKind;
 		while (config != null) {
 			for (ChildRule rule : config.getChildRules()) {
 				int result = allows(rule, parentType, childType, new ArrayList<EClass>(0));
@@ -583,7 +237,7 @@ public class PolicyChecker {
 			return false;
 		}
 
-		PapyrusDiagram config = (PapyrusDiagram) prototype.configuration;
+		PapyrusDiagram config = (PapyrusDiagram) prototype.representationKind;
 		while (config != null) {
 			for (PaletteRule rule : config.getPaletteRules()) {
 				int result = allows(rule, entryID);
@@ -612,7 +266,7 @@ public class PolicyChecker {
 			return false;
 		}
 
-		PapyrusDiagram config = (PapyrusDiagram) prototype.configuration;
+		PapyrusDiagram config = (PapyrusDiagram) prototype.representationKind;
 		while (config != null) {
 			for (AssistantRule rule : config.getAssistantRules()) {
 				int result = allows(rule, elementType);
@@ -626,17 +280,16 @@ public class PolicyChecker {
 	}
 
 	/**
-	 * Determines whether the given view configuration element is part of the current viewpoint
+	 * Determines whether the given view description element is part of the current viewpoint
 	 *
 	 * @param config
-	 *            A view configuration element
+	 *            A view description element
 	 * @return <code>true</code> if the element is part of the current viewpoint
 	 */
-	public boolean isInViewpoint(PapyrusView config) {
-		for (PapyrusViewpoint viewpoint : applicableViewpoints) {
-			for (ModelKind kind : viewpoint.getModelKinds()) {
-				PapyrusView view = (PapyrusView) kind;
-				if (EcoreUtil.equals(view, config)) {
+	public boolean isInViewpoint(PapyrusRepresentationKind kind) {
+		for (MergedArchitectureViewpoint viewpoint : getViewpoints()) {
+			for (RepresentationKind aKind : viewpoint.getRepresentationKinds()) {
+				if (aKind.getQualifiedName().equals(kind.getQualifiedName())) {
 					return true;
 				}
 			}
@@ -651,9 +304,9 @@ public class PolicyChecker {
 	 */
 	public Collection<ViewPrototype> getAllPrototypes() {
 		Collection<ViewPrototype> result = new ArrayList<ViewPrototype>();
-		for (PapyrusViewpoint viewpoint : applicableViewpoints) {
-			for (ModelKind kind : viewpoint.getModelKinds()) {
-				PapyrusView view = (PapyrusView) kind;
+		for (MergedArchitectureViewpoint viewpoint : getViewpoints()) {
+			for (RepresentationKind kind : viewpoint.getRepresentationKinds()) {
+				PapyrusRepresentationKind view = (PapyrusRepresentationKind) kind;
 				ViewPrototype proto = ViewPrototype.get(view);
 				if (proto != null) {
 					result.add(proto);
@@ -671,12 +324,12 @@ public class PolicyChecker {
 	 * @return A list of the prototypes that can be instantiated
 	 */
 	public Collection<ViewPrototype> getPrototypesFor(EObject element) {
-		Collection<ViewPrototype> result = new ArrayList<ViewPrototype>();
+		Collection<ViewPrototype> result = new LinkedHashSet<ViewPrototype>();
 		Collection<EPackage> profiles = profileHelper.getAppliedProfiles(element);
 		Collection<EClass> stereotypes = profileHelper.getAppliedStereotypes(element);
-		for (PapyrusViewpoint viewpoint : applicableViewpoints) {
-			for (ModelKind kind : viewpoint.getModelKinds()) {
-				PapyrusView view = (PapyrusView) kind;
+		for (MergedArchitectureViewpoint viewpoint : getViewpoints()) {
+			for (RepresentationKind kind : viewpoint.getRepresentationKinds()) {
+				PapyrusRepresentationKind view = (PapyrusRepresentationKind) kind;
 				if (!matchesProfiles(view, profiles)) {
 					continue;
 				}
@@ -719,12 +372,12 @@ public class PolicyChecker {
 	public OwningRule getOwningRuleFor(ViewPrototype prototype, EObject owner) {
 		Collection<EClass> stereotypes = profileHelper.getAppliedStereotypes(owner);
 		int count = prototype.getOwnedViewCount(owner);
-		OwningRule rule = matchesCreationOwner(prototype.configuration, owner, stereotypes, count);
+		OwningRule rule = matchesCreationOwner(prototype.representationKind, owner, stereotypes, count);
 		return rule;
 	}
 
 	/**
-	 * Tries to match a view configuration from the given info
+	 * Tries to match a view description from the given info
 	 *
 	 * @param implem
 	 *            The implementation ID
@@ -734,10 +387,10 @@ public class PolicyChecker {
 	 *            The root element
 	 * @return The matching view, or <code>null</code> if none was found
 	 */
-	protected PapyrusView getViewFrom(String implem, EObject owner, EObject root) {
-		for (PapyrusViewpoint viewpoint : applicableViewpoints) {
-			for (ModelKind kind : viewpoint.getModelKinds()) {
-				PapyrusView view = (PapyrusView) kind;
+	protected PapyrusRepresentationKind getRepresentationKindFrom(String implem, EObject owner, EObject root) {
+		for (MergedArchitectureViewpoint viewpoint : getViewpoints()) {
+			for (RepresentationKind kind : viewpoint.getRepresentationKinds()) {
+				PapyrusRepresentationKind view = (PapyrusRepresentationKind) kind;
 				if (matches(view, implem, owner, root)) {
 					return view;
 				}
@@ -747,22 +400,19 @@ public class PolicyChecker {
 	}
 
 	/**
-	 * Tries to match a view configuration with the given info
+	 * Tries to match a view description with the given info
 	 *
 	 * @param view
-	 *            A view configuration
+	 *            A view description
 	 * @param implem
 	 *            The implementation ID
 	 * @param owner
 	 *            The owner
 	 * @param root
 	 *            The root element
-	 * @return <code>true</code> if the configuration matches
+	 * @return <code>true</code> if the description matches
 	 */
-	private boolean matches(PapyrusView view, String implem, EObject owner, EObject root) {
-		if (!ViewPrototype.isNatural(view)) {
-			return false;
-		}
+	private boolean matches(PapyrusRepresentationKind view, String implem, EObject owner, EObject root) {
 		if (!view.getImplementationID().equals(implem)) {
 			return false;
 		}
@@ -794,10 +444,10 @@ public class PolicyChecker {
 	 *            The applied profiles
 	 * @return <code>true</code> if the prototype is matching
 	 */
-	private boolean matchesProfiles(PapyrusView view, Collection<EPackage> profiles) {
-		PapyrusView current = view;
+	private boolean matchesProfiles(PapyrusRepresentationKind view, Collection<EPackage> profiles) {
+		PapyrusRepresentationKind current = view;
 		while (current != null) {
-			for (EPackage profile : view.getProfiles()) {
+			for (EPackage profile : view.getLanguage().getProfiles()) {
 				if (!profiles.contains(profile)) {
 					return false;
 				}
@@ -818,8 +468,8 @@ public class PolicyChecker {
 	 *            The stereotypes applied on the owning element
 	 * @return <code>true</code> if the prototype is matching
 	 */
-	private boolean matchesExistingOwner(PapyrusView view, EObject owner, Collection<EClass> stereotypes) {
-		PapyrusView current = view;
+	private boolean matchesExistingOwner(PapyrusRepresentationKind view, EObject owner, Collection<EClass> stereotypes) {
+		PapyrusRepresentationKind current = view;
 		while (current != null) {
 			for (OwningRule rule : current.getOwningRules()) {
 				int result = allows(rule, owner, stereotypes);
@@ -848,8 +498,8 @@ public class PolicyChecker {
 	 *            The current cardinality for the owning element
 	 * @return The matching rule that allows the owner
 	 */
-	private OwningRule matchesCreationOwner(PapyrusView view, EObject owner, Collection<EClass> stereotypes, int count) {
-		PapyrusView current = view;
+	private OwningRule matchesCreationOwner(PapyrusRepresentationKind view, EObject owner, Collection<EClass> stereotypes, int count) {
+		PapyrusRepresentationKind current = view;
 		while (current != null) {
 			for (OwningRule rule : current.getOwningRules()) {
 				int allow = allows(rule, owner, stereotypes);
@@ -882,8 +532,8 @@ public class PolicyChecker {
 	 *            The stereotypes applied on the root element
 	 * @return <code>true</code> if the prototype is matching
 	 */
-	private boolean matchesExistingRoot(PapyrusView view, EObject root, Collection<EClass> stereotypes) {
-		PapyrusView current = view;
+	private boolean matchesExistingRoot(PapyrusRepresentationKind view, EObject root, Collection<EClass> stereotypes) {
+		PapyrusRepresentationKind current = view;
 		while (current != null) {
 			for (ModelRule rule : current.getModelRules()) {
 				int result = allows(rule, root, stereotypes);
@@ -912,8 +562,8 @@ public class PolicyChecker {
 	 *            The current cardinality for the root element
 	 * @return <code>true</code> if the prototype is matching
 	 */
-	private boolean matchesCreationRoot(PapyrusView view, EObject root, Collection<EClass> stereotypes, int count) {
-		PapyrusView current = view;
+	private boolean matchesCreationRoot(PapyrusRepresentationKind view, EObject root, Collection<EClass> stereotypes, int count) {
+		PapyrusRepresentationKind current = view;
 		while (current != null) {
 			for (ModelRule rule : current.getModelRules()) {
 				int allow = allows(rule, root, stereotypes);
@@ -923,7 +573,7 @@ public class PolicyChecker {
 				if (allow == RESULT_UNKNOWN) {
 					continue;
 				}
-				int multiplicity = (oneViewPerElem ? 1 : rule.getMultiplicity());
+				int multiplicity = rule.getMultiplicity();
 				if (multiplicity == -1 || count < multiplicity) {
 					return true;
 				}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ProfileUtils.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ProfileUtils.java
index 8e1cb3a40bb..849c8032c97 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ProfileUtils.java
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ProfileUtils.java
@@ -1,87 +1,87 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.viewpoints.policy;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.IExtension;

-import org.eclipse.core.runtime.IExtensionPoint;

-import org.eclipse.core.runtime.IExtensionRegistry;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-

-

-/**

- * Helper class for the ProfileHelper extension point

- *

- * @author Laurent Wouters

- */

-class ProfileUtils {

-	/**

-	 * ID of the extension point

-	 */

-	private static final String EXTENSION_ID = "org.eclipse.papyrus.infra.viewpoints.policy.profilehelper";

-

-	/**

-	 * Gets a instance of the <code>IProfileHelper</code> interface

-	 *

-	 * @return an instance of <code>IProfileHelper</code>

-	 */

-	public static IProfileHelper getProfileHelper() {

-		IExtensionRegistry registry = Platform.getExtensionRegistry();

-		IExtensionPoint point = registry.getExtensionPoint(EXTENSION_ID);

-		IExtension[] extensions = point.getExtensions();

-

-		for (int i = 0; i != extensions.length; i++) {

-			IConfigurationElement[] elements = extensions[i].getConfigurationElements();

-			for (int j = 0; j != elements.length; j++) {

-				try {

-					IProfileHelper instance = (IProfileHelper) elements[j].createExecutableExtension("class");

-					if (instance != null) {

-						return instance;

-					}

-				} catch (CoreException e) {

-				}

-			}

-		}

-		return new DefaultProfileHelper();

-	}

-

-	/**

-	 * Represents a default implementation of the profile helper

-	 *

-	 * @author Laurent Wouters

-	 */

-	private static class DefaultProfileHelper implements IProfileHelper {

-		/**

-		 * @see org.eclipse.papyrus.infra.viewpoints.policy.IProfileHelper#getAppliedProfiles(org.eclipse.emf.ecore.EObject)

-		 */

-		public Collection<EPackage> getAppliedProfiles(EObject model) {

-			return new ArrayList<EPackage>(0);

-		}

-

-		/**

-		 * @see org.eclipse.papyrus.infra.viewpoints.policy.IProfileHelper#getAppliedStereotypes(org.eclipse.emf.ecore.EObject)

-		 */

-		public Collection<EClass> getAppliedStereotypes(EObject object) {

-			return new ArrayList<EClass>(0);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.viewpoints.policy;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtension;
+import org.eclipse.core.runtime.IExtensionPoint;
+import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+
+/**
+ * Helper class for the ProfileHelper extension point
+ *
+ * @author Laurent Wouters
+ */
+public class ProfileUtils {
+	/**
+	 * ID of the extension point
+	 */
+	private static final String EXTENSION_ID = "org.eclipse.papyrus.infra.viewpoints.policy.profilehelper";
+
+	/**
+	 * Gets a instance of the <code>IProfileHelper</code> interface
+	 *
+	 * @return an instance of <code>IProfileHelper</code>
+	 */
+	public static IProfileHelper getProfileHelper() {
+		IExtensionRegistry registry = Platform.getExtensionRegistry();
+		IExtensionPoint point = registry.getExtensionPoint(EXTENSION_ID);
+		IExtension[] extensions = point.getExtensions();
+
+		for (int i = 0; i != extensions.length; i++) {
+			IConfigurationElement[] elements = extensions[i].getConfigurationElements();
+			for (int j = 0; j != elements.length; j++) {
+				try {
+					IProfileHelper instance = (IProfileHelper) elements[j].createExecutableExtension("class");
+					if (instance != null) {
+						return instance;
+					}
+				} catch (CoreException e) {
+				}
+			}
+		}
+		return new DefaultProfileHelper();
+	}
+
+	/**
+	 * Represents a default implementation of the profile helper
+	 *
+	 * @author Laurent Wouters
+	 */
+	private static class DefaultProfileHelper implements IProfileHelper {
+		/**
+		 * @see org.eclipse.papyrus.infra.viewpoints.policy.IProfileHelper#getAppliedProfiles(org.eclipse.emf.ecore.EObject)
+		 */
+		public Collection<EPackage> getAppliedProfiles(EObject model) {
+			return new ArrayList<EPackage>(0);
+		}
+
+		/**
+		 * @see org.eclipse.papyrus.infra.viewpoints.policy.IProfileHelper#getAppliedStereotypes(org.eclipse.emf.ecore.EObject)
+		 */
+		public Collection<EClass> getAppliedStereotypes(EObject object) {
+			return new ArrayList<EClass>(0);
+		}
+	}
+}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/RuleConstraintManager.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/RuleConstraintManager.java
index dc4275b5656..34a249dcabd 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/RuleConstraintManager.java
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/RuleConstraintManager.java
@@ -17,7 +17,7 @@ import java.util.List;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ModelRule;
+import org.eclipse.papyrus.infra.architecture.representation.ModelRule;
 
 /**
  * Manager for the rule constraints
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/UnavailableViewPrototype.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/UnavailableViewPrototype.java
index 9689ea5ad15..10666f9ce20 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/UnavailableViewPrototype.java
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/UnavailableViewPrototype.java
@@ -1,154 +1,133 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *  Christian W. Damus - bug 474467

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.viewpoints.policy;

-

-import java.util.Collection;

-import java.util.Collections;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.viewpoints.configuration.Category;

-

-

-/**

- * Represents a view prototype that is not available in the current viewpoints configuration

- *

- * @author Laurent Wouters

- */

-public class UnavailableViewPrototype extends ViewPrototype {

-

-	private String name;

-

-	private String icon;

-

-	/**

-	 * Constructor.

-	 */

-	protected UnavailableViewPrototype(String name, String icon) {

-		super(null);

-		this.name = name;

-		this.icon = icon;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype#isNatural()

-	 */

-	@Override

-	public boolean isNatural() {

-		return true;

-	}

-

-	@Override

-	public boolean isUnavailable() {

-		return true;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype#getImplementation()

-	 */

-	@Override

-	public String getImplementation() {

-		return "PapyrusUnavailableView";

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype#getLabel()

-	 */

-	@Override

-	public String getLabel() {

-		return "Unavailable " + name;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype#getQualifiedName()

-	 */

-	@Override

-	public String getQualifiedName() {

-		return "Default Papyrus Viewpoint :: " + getLabel();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype#getIconURI()

-	 */

-	@Override

-	public String getIconURI() {

-		return "platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/icons/Unavailable" + icon + ".gif";

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype#isOwnerReassignable()

-	 */

-	@Override

-	public boolean isOwnerReassignable() {

-		return false;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype#instantiateOn(org.eclipse.emf.ecore.EObject)

-	 */

-	@Override

-	public boolean instantiateOn(EObject owner) {

-		return false;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype#instantiateOn(org.eclipse.emf.ecore.EObject, java.lang.String)

-	 */

-	@Override

-	public boolean instantiateOn(EObject owner, String name) {

-		return false;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype#getCommandChangeOwner(org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EObject)

-	 */

-	@Override

-	public Command getCommandChangeOwner(EObject view, EObject target) {

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype#getCommandChangeRoot(org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EObject)

-	 */

-	@Override

-	public Command getCommandChangeRoot(EObject view, EObject target) {

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype#getOwnerOf(org.eclipse.emf.ecore.EObject)

-	 */

-	@Override

-	public EObject getOwnerOf(EObject view) {

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype#getRootOf(org.eclipse.emf.ecore.EObject)

-	 */

-	@Override

-	public EObject getRootOf(EObject view) {

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype#getCategories()

-	 *

-	 * @return

-	 */

-	@Override

-	public Collection<Category> getCategories() {

-		return Collections.emptyList();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 474467
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.viewpoints.policy;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EObject;
+
+
+/**
+ * Represents a view prototype that is not available in the current viewpoints configuration
+ *
+ * @author Laurent Wouters
+ */
+public class UnavailableViewPrototype extends ViewPrototype {
+
+	private String name;
+
+	private String icon;
+
+	/**
+	 * Constructor.
+	 */
+	protected UnavailableViewPrototype(String name, String icon) {
+		super(null);
+		this.name = name;
+		this.icon = icon;
+	}
+
+	@Override
+	public boolean isUnavailable() {
+		return true;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype#getImplementation()
+	 */
+	@Override
+	public String getImplementation() {
+		return "PapyrusUnavailableView";
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype#getLabel()
+	 */
+	@Override
+	public String getLabel() {
+		return "Unavailable " + name;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype#getQualifiedName()
+	 */
+	@Override
+	public String getQualifiedName() {
+		return "Default Papyrus Viewpoint :: " + getLabel();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype#getIconURI()
+	 */
+	@Override
+	public String getIconURI() {
+		return "platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/icons/Unavailable" + icon + ".gif";
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype#isOwnerReassignable()
+	 */
+	@Override
+	public boolean isOwnerReassignable() {
+		return false;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype#instantiateOn(org.eclipse.emf.ecore.EObject)
+	 */
+	@Override
+	public boolean instantiateOn(EObject owner) {
+		return false;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype#instantiateOn(org.eclipse.emf.ecore.EObject, java.lang.String)
+	 */
+	@Override
+	public boolean instantiateOn(EObject owner, String name) {
+		return false;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype#getCommandChangeOwner(org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EObject)
+	 */
+	@Override
+	public Command getCommandChangeOwner(EObject view, EObject target) {
+		return null;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype#getCommandChangeRoot(org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EObject)
+	 */
+	@Override
+	public Command getCommandChangeRoot(EObject view, EObject target) {
+		return null;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype#getOwnerOf(org.eclipse.emf.ecore.EObject)
+	 */
+	@Override
+	public EObject getOwnerOf(EObject view) {
+		return null;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype#getRootOf(org.eclipse.emf.ecore.EObject)
+	 */
+	@Override
+	public EObject getRootOf(EObject view) {
+		return null;
+	}
+
+}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ViewPrototype.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ViewPrototype.java
index 69b0ace8d67..e450ba96a87 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ViewPrototype.java
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ViewPrototype.java
@@ -32,13 +32,12 @@ import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.papyrus.infra.viewpoints.configuration.Category;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ModelRule;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusSyncTable;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusTable;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusViewpoint;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage;
+import org.eclipse.papyrus.infra.architecture.representation.ModelRule;
+import org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind;
+import org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram;
+import org.eclipse.papyrus.infra.nattable.representation.PapyrusSyncTable;
+import org.eclipse.papyrus.infra.nattable.representation.PapyrusTable;
 import org.eclipse.swt.graphics.Image;
 
 
@@ -53,16 +52,6 @@ public abstract class ViewPrototype {
 	 */
 	public static final ViewPrototype UNAVAILABLE_VIEW = new UnavailableViewPrototype("View", "View");
 	/**
-	 * Singleton for unavailable views (diagrams)
-	 */
-	public static final ViewPrototype UNAVAILABLE_DIAGRAM = new UnavailableViewPrototype("Diagram", "Diagram");
-
-	/**
-	 * Singleton for unavailable views (tables)
-	 */
-	public static final ViewPrototype UNAVAILABLE_TABLE = new UnavailableViewPrototype("Table", "Table");
-
-	/**
 	 * ID of the extension point for Papyrus diagrams
 	 */
 	protected static final String EXTENSION_ID = "org.eclipse.papyrus.infra.viewpoints.policy.viewType";
@@ -99,17 +88,6 @@ public abstract class ViewPrototype {
 	}
 
 	/**
-	 * Determines whether the given configuration element applies on a natural view
-	 *
-	 * @param config
-	 *            The configuration element
-	 * @return <code>true</code> if the configuration applies on a natural view
-	 */
-	public static boolean isNatural(PapyrusView config) {
-		return config.getName() == null && config.getIcon() == null;
-	}
-
-	/**
 	 * Determines whether the given object is a supported view object
 	 *
 	 * @param object
@@ -126,30 +104,22 @@ public abstract class ViewPrototype {
 	}
 
 	/**
-	 * Gets the prototype for the given configuration element
+	 * Gets the prototype for the given representationKind element
 	 *
 	 * @param config
-	 *            The configuration element
+	 *            The representationKind element
 	 * @return The prototype
 	 */
-	public static ViewPrototype get(PapyrusView config) {
+	public static ViewPrototype get(PapyrusRepresentationKind representationKind) {
 		for (IViewTypeHelper helper : HELPERS) {
-			if (helper.isSupported(config.eClass())) {
-				ViewPrototype proto = helper.getPrototypeFor(config);
+			if (helper.isSupported(representationKind.eClass())) {
+				ViewPrototype proto = helper.getPrototypeFor(representationKind);
 				if (proto != null) {
 					return proto;
 				}
 			}
 		}
-		if (config instanceof PapyrusDiagram) {
-			return UNAVAILABLE_DIAGRAM;
-		} else if (config instanceof PapyrusTable) {
-			return UNAVAILABLE_TABLE;
-		} else if (config instanceof PapyrusSyncTable) {
-			return UNAVAILABLE_TABLE;
-		} else {
-			return UNAVAILABLE_VIEW;
-		}
+		return UNAVAILABLE_VIEW;
 	}
 
 	/**
@@ -182,10 +152,10 @@ public abstract class ViewPrototype {
 	 *            The root element
 	 * @return The prototype
 	 */
-	public static ViewPrototype get(String implem, EObject owner, EObject root) {
-		PapyrusView view = PolicyChecker.getCurrent().getViewFrom(implem, owner, root);
+	public static ViewPrototype get(PolicyChecker policy, String implem, EObject owner, EObject root) {
+		PapyrusRepresentationKind view = policy.getRepresentationKindFrom(implem, owner, root);
 		if (view == null) {
-			// The given implementation has been inhibited by the current viewpoint configuration
+			// The given implementation has been inhibited by the current viewpoint representationKind
 			return UNAVAILABLE_VIEW;
 		}
 		return get(view);
@@ -193,36 +163,27 @@ public abstract class ViewPrototype {
 
 
 	/**
-	 * The configuration element of this view
+	 * The representation kind of this view
 	 */
-	protected final PapyrusView configuration;
+	protected final PapyrusRepresentationKind representationKind;
 
 	/**
 	 * Constructor.
 	 *
-	 * @param configuration
-	 *            The configuration element
-	 */
-	protected ViewPrototype(PapyrusView configuration) {
-		this.configuration = configuration;
-	}
-
-	/**
-	 * Gets the configuration element for this view prototype
-	 *
-	 * @return The configuration element
+	 * @param representationKind
+	 *            The representation kind element
 	 */
-	public PapyrusView getConfiguration() {
-		return configuration;
+	protected ViewPrototype(PapyrusRepresentationKind representationKind) {
+		this.representationKind = representationKind;
 	}
 
 	/**
-	 * Gets whether the represented view is the raw implementation
+	 * Gets the representation kind for this view prototype
 	 *
-	 * @return <code>true</code> if this is a natural view
+	 * @return The representation kind
 	 */
-	public boolean isNatural() {
-		return isNatural(configuration);
+	public PapyrusRepresentationKind getRepresentationKind() {
+		return representationKind;
 	}
 
 	/**
@@ -242,7 +203,7 @@ public abstract class ViewPrototype {
 	 * @return The implementation ID
 	 */
 	public String getImplementation() {
-		return configuration.getImplementationID();
+		return representationKind.getImplementationID();
 	}
 
 	/**
@@ -251,7 +212,7 @@ public abstract class ViewPrototype {
 	 * @return The label
 	 */
 	public String getLabel() {
-		return configuration.getName();
+		return representationKind.getName();
 	}
 
 	/**
@@ -263,7 +224,7 @@ public abstract class ViewPrototype {
 		StringBuilder builder = new StringBuilder(getLabel());
 		builder.append(" for ");
 		boolean first = true;
-		for (ModelRule rule : configuration.getModelRules()) {
+		for (ModelRule rule : representationKind.getModelRules()) {
 			if (rule.getStereotypes() != null && rule.getStereotypes().size() > 0) {
 				for (EClass stereotype : rule.getStereotypes()) {
 					if (!first) {
@@ -291,8 +252,8 @@ public abstract class ViewPrototype {
 	 * @return The qualified name
 	 */
 	public String getQualifiedName() {
-		PapyrusViewpoint vp = (PapyrusViewpoint) configuration.eContainer();
-		return vp.getName() + " :: " + getLabel();
+		ArchitectureDescriptionLanguage lang = (ArchitectureDescriptionLanguage) representationKind.eContainer();
+		return lang.getName() + " :: " + getLabel();
 	}
 
 	/**
@@ -301,7 +262,7 @@ public abstract class ViewPrototype {
 	 * @return The icon's URI
 	 */
 	public String getIconURI() {
-		return configuration.getIcon();
+		return representationKind.getIcon();
 	}
 
 	/**
@@ -329,15 +290,6 @@ public abstract class ViewPrototype {
 	}
 
 	/**
-	 * Gets the categories of this view prototype
-	 *
-	 * @return The prototype's categories
-	 */
-	public Collection<Category> getCategories() {
-		return configuration.getCategories();
-	}
-
-	/**
 	 * Determines whether the instances of this prototype can change owners
 	 *
 	 * @return <code>true</code> if the owner is reassignable
@@ -410,7 +362,7 @@ public abstract class ViewPrototype {
 	 * @author Laurent Wouters
 	 */
 	public static class Comp implements Comparator<ViewPrototype> {
-		private static final Map<Class<? extends PapyrusView>, Integer> priorities = new HashMap<Class<? extends PapyrusView>, Integer>();
+		private static final Map<Class<? extends PapyrusRepresentationKind>, Integer> priorities = new HashMap<Class<? extends PapyrusRepresentationKind>, Integer>();
 		{
 			priorities.put(PapyrusDiagram.class, 1);
 			priorities.put(PapyrusTable.class, 2);
@@ -418,8 +370,8 @@ public abstract class ViewPrototype {
 		}
 
 		private static Integer getPriority(ViewPrototype proto) {
-			for (Map.Entry<Class<? extends PapyrusView>, Integer> entry : priorities.entrySet()) {
-				if (entry.getKey().isAssignableFrom(proto.configuration.getClass())) {
+			for (Map.Entry<Class<? extends PapyrusRepresentationKind>, Integer> entry : priorities.entrySet()) {
+				if (entry.getKey().isAssignableFrom(proto.representationKind.getClass())) {
 					return entry.getValue();
 				}
 			}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ViewPrototypeContentProvider.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ViewPrototypeContentProvider.java
index 6a90c6e5358..c0384d26743 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ViewPrototypeContentProvider.java
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ViewPrototypeContentProvider.java
@@ -1,301 +1,258 @@
-/*****************************************************************************

- * Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *  Christian W. Damus - bug 485220

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.viewpoints.policy;

-

-import java.net.MalformedURLException;

-import java.net.URL;

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.jface.resource.ImageRegistry;

-import org.eclipse.jface.resource.JFaceResources;

-import org.eclipse.jface.viewers.ITreeContentProvider;

-import org.eclipse.jface.viewers.LabelProvider;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.viewpoints.configuration.Category;

-import org.eclipse.papyrus.infra.viewpoints.configuration.ModelRule;

-import org.eclipse.papyrus.infra.viewpoints.configuration.OwningRule;

-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusViewpoint;

-import org.eclipse.swt.graphics.Image;

-

-/**

- * Content provider of ViewPrototypes

- *

- * @author Laurent Wouters

- *

- */

-public class ViewPrototypeContentProvider implements ITreeContentProvider {

-

-	private static ImageDescriptor loadImage(String uri) {

-		URL url = null;

-		try {

-			url = new URL(uri);

-		} catch (MalformedURLException e) {

-		}

-		return ImageDescriptor.createFromURL(url);

-	}

-

-	public static class LP extends LabelProvider {

-		private static final String IMG_CATEGORY = "imageCategory"; //$NON-NLS-1$

-		private static final String IMG_VIEWPOINT = "imageViewpoint"; //$NON-NLS-1$

-		private static final String IMG_PROFILE = "imageProfile"; //$NON-NLS-1$

-		private static final String IMG_MODEL = "imageModel"; //$NON-NLS-1$

-		private static final String IMG_OWNER = "imageOwner"; //$NON-NLS-1$

-

-		private ImageRegistry images = new ImageRegistry(JFaceResources.getResources());

-

-		{

-			images.put(IMG_CATEGORY, loadImage("platform:/plugin/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/obj16/PapyrusView.png"));

-			images.put(IMG_VIEWPOINT, loadImage("platform:/plugin/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/obj16/PapyrusViewpoint.png"));

-			images.put(IMG_PROFILE, loadImage("platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/icons/Profile.gif"));

-			images.put(IMG_MODEL, loadImage("platform:/plugin/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/obj16/ModelRule.png"));

-			images.put(IMG_OWNER, loadImage("platform:/plugin/org.eclipse.papyrus.infra.viewpoints.configuration.edit/icons/full/obj16/OwningRule.png"));

-		}

-

-		@Override

-		public void dispose() {

-			super.dispose();

-

-			images.dispose();

-		}

-

-		@Override

-		public String getText(Object element) {

-			if (element instanceof Category) {

-				return "Category " + ((Category) element).getName();

-			}

-			if (element instanceof ViewPrototype) {

-				return ((ViewPrototype) element).getLabel();

-			}

-			if (element instanceof PapyrusViewpoint) {

-				return "Available in viewpoint: " + ((PapyrusViewpoint) element).getName();

-			}

-			if (element instanceof EPackage) {

-				return "Required profile: " + ((EPackage) element).getNsURI();

-			}

-			if (element instanceof ModelRule) {

-				return getText((ModelRule) element);

-			}

-			if (element instanceof OwningRule) {

-				return getText((OwningRule) element);

-			}

-			return element.toString();

-		}

-

-		private String getText(ModelRule rule) {

-			StringBuilder builder = new StringBuilder("Possible root: ");

-			boolean first = true;

-			for (EClass ste : rule.getStereotypes()) {

-				if (!first) {

-					builder.append(", ");

-				}

-				builder.append("<<");

-				builder.append(ste.getEPackage().getNsPrefix());

-				builder.append("::");

-				builder.append(ste.getName());

-				builder.append(">>");

-				first = false;

-			}

-			if (rule.getElement() != null) {

-				if (!first) {

-					builder.append(" ");

-				}

-				builder.append(rule.getElement().getEPackage().getNsPrefix());

-				builder.append("::");

-				builder.append(rule.getElement().getName());

-			}

-			return builder.toString();

-		}

-

-		private String getText(OwningRule rule) {

-			StringBuilder builder = new StringBuilder("Possible owner: ");

-			boolean first = true;

-			for (EClass ste : rule.getStereotypes()) {

-				if (!first) {

-					builder.append(", ");

-				}

-				builder.append("<<");

-				builder.append(ste.getEPackage().getNsPrefix());

-				builder.append("::");

-				builder.append(ste.getName());

-				builder.append(">>");

-				first = false;

-			}

-			if (rule.getElement() != null) {

-				if (!first) {

-					builder.append(" ");

-				}

-				builder.append(rule.getElement().getEPackage().getNsPrefix());

-				builder.append("::");

-				builder.append(rule.getElement().getName());

-			}

-			return builder.toString();

-		}

-

-		@Override

-		public Image getImage(Object element) {

-			if (element instanceof Category) {

-				return images.get(IMG_CATEGORY);

-			}

-			if (element instanceof ViewPrototype) {

-				return ((ViewPrototype) element).getIcon();

-			}

-			if (element instanceof PapyrusViewpoint) {

-				return images.get(IMG_VIEWPOINT);

-			}

-			if (element instanceof EPackage) {

-				return images.get(IMG_PROFILE);

-			}

-			if (element instanceof ModelRule) {

-				return images.get(IMG_MODEL);

-			}

-			if (element instanceof OwningRule) {

-				return images.get(IMG_OWNER);

-			}

-			return null;

-		}

-	}

-

-	/**

-	 * The root of all views

-	 */

-	public static final Object treeRoot = new Object();

-

-	/**

-	 * The views

-	 */

-	private Map<Category, List<ViewPrototype>> views;

-

-	/**

-	 * The categories

-	 */

-	private List<Category> categories;

-

-	/**

-	 * Creates the provider

-	 *

-	 * @param views

-	 *            The views to provide

-	 */

-	public ViewPrototypeContentProvider() {

-		this.views = new HashMap<Category, List<ViewPrototype>>();

-		this.categories = new ArrayList<Category>();

-		for (ViewPrototype view : PolicyChecker.getCurrent().getAllPrototypes()) {

-			for (Category category : view.getCategories()) {

-				if (!categories.contains(category)) {

-					categories.add(category);

-					views.put(category, new ArrayList<ViewPrototype>());

-				}

-				views.get(category).add(view);

-			}

-		}

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()

-	 */

-	public void dispose() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)

-	 */

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getElements(java.lang.Object)

-	 */

-	public Object[] getElements(Object inputElement) {

-		return categories.toArray();

-	}

-

-

-	private Object[] getChildren(ViewPrototype view) {

-		if (view.getConfiguration() == null) {

-			return new String[0];

-		}

-		List<Object> data = new ArrayList<Object>();

-		data.add(view.getConfiguration().eContainer());

-		data.addAll(view.getConfiguration().getProfiles());

-		data.addAll(view.getConfiguration().getModelRules());

-		data.addAll(view.getConfiguration().getOwningRules());

-		return data.toArray();

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)

-	 */

-	public Object[] getChildren(Object element) {

-		if (element == treeRoot) {

-			return categories.toArray();

-		}

-		if (element instanceof Category) {

-			List<ViewPrototype> protos = new ArrayList<ViewPrototype>(views.get(element));

-			Collections.sort(protos, new ViewPrototype.Comp());

-			return protos.toArray();

-		}

-		if (element instanceof ViewPrototype) {

-			return getChildren((ViewPrototype) element);

-		}

-		return new Object[0];

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)

-	 */

-	public Object getParent(Object element) {

-		if (element == treeRoot) {

-			return null;

-		}

-		if (element instanceof Category) {

-			return treeRoot;

-		}

-		return null;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)

-	 */

-	public boolean hasChildren(Object element) {

-		if (element == treeRoot) {

-			return true;

-		}

-		if (element instanceof Category) {

-			return true;

-		}

-		if (element instanceof ViewPrototype) {

-			return true;

-		}

-		return false;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.viewpoints.policy;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.core.architecture.RepresentationKind;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureViewpoint;
+import org.eclipse.papyrus.infra.architecture.representation.ModelRule;
+import org.eclipse.papyrus.infra.architecture.representation.OwningRule;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * Content provider of ViewPrototypes
+ *
+ * @author Laurent Wouters
+ *
+ */
+public class ViewPrototypeContentProvider implements ITreeContentProvider {
+
+	private static ImageDescriptor loadImage(String uri) {
+		URL url = null;
+		try {
+			url = new URL(uri);
+		} catch (MalformedURLException e) {
+		}
+		return ImageDescriptor.createFromURL(url);
+	}
+
+	public static class LP extends LabelProvider {
+		private static final String IMG_VIEWPOINT = "imageViewpoint"; //$NON-NLS-1$
+		private static final String IMG_PROFILE = "imageProfile"; //$NON-NLS-1$
+		private static final String IMG_MODEL = "imageModel"; //$NON-NLS-1$
+		private static final String IMG_OWNER = "imageOwner"; //$NON-NLS-1$
+
+		private ImageRegistry images = new ImageRegistry(JFaceResources.getResources());
+
+		{
+			images.put(IMG_VIEWPOINT, loadImage("platform:/plugin/org.eclipse.papyrus.infra.core.architecture.edit/icons/full/obj16/MergedArchitectureViewpoint.gif"));
+			images.put(IMG_PROFILE, loadImage("platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/icons/Profile.gif"));
+			images.put(IMG_MODEL, loadImage("platform:/plugin/org.eclipse.papyrus.infra.core.architecture.edit/icons/full/obj16/ModelRule.gif"));
+			images.put(IMG_OWNER, loadImage("platform:/plugin/org.eclipse.papyrus.infra.core.architecture.edit/icons/full/obj16/OwningRule.gif"));
+		}
+
+		@Override
+		public void dispose() {
+			super.dispose();
+
+			images.dispose();
+		}
+
+		@Override
+		public String getText(Object element) {
+			if (element instanceof MergedArchitectureViewpoint) {
+				return "Viewpoint " + ((MergedArchitectureViewpoint) element).getName();
+			}
+			if (element instanceof ViewPrototype) {
+				return ((ViewPrototype) element).getLabel();
+			}
+			if (element instanceof EPackage) {
+				return "Required profile: " + ((EPackage) element).getNsURI();
+			}
+			if (element instanceof ModelRule) {
+				return getText((ModelRule) element);
+			}
+			if (element instanceof OwningRule) {
+				return getText((OwningRule) element);
+			}
+			return element.toString();
+		}
+
+		private String getText(ModelRule rule) {
+			StringBuilder builder = new StringBuilder("Possible root: ");
+			boolean first = true;
+			for (EClass ste : rule.getStereotypes()) {
+				if (!first) {
+					builder.append(", ");
+				}
+				builder.append("<<");
+				builder.append(ste.getEPackage().getNsPrefix());
+				builder.append("::");
+				builder.append(ste.getName());
+				builder.append(">>");
+				first = false;
+			}
+			if (rule.getElement() != null) {
+				if (!first) {
+					builder.append(" ");
+				}
+				builder.append(rule.getElement().getEPackage().getNsPrefix());
+				builder.append("::");
+				builder.append(rule.getElement().getName());
+			}
+			return builder.toString();
+		}
+
+		private String getText(OwningRule rule) {
+			StringBuilder builder = new StringBuilder("Possible owner: ");
+			boolean first = true;
+			for (EClass ste : rule.getStereotypes()) {
+				if (!first) {
+					builder.append(", ");
+				}
+				builder.append("<<");
+				builder.append(ste.getEPackage().getNsPrefix());
+				builder.append("::");
+				builder.append(ste.getName());
+				builder.append(">>");
+				first = false;
+			}
+			if (rule.getElement() != null) {
+				if (!first) {
+					builder.append(" ");
+				}
+				builder.append(rule.getElement().getEPackage().getNsPrefix());
+				builder.append("::");
+				builder.append(rule.getElement().getName());
+			}
+			return builder.toString();
+		}
+
+		@Override
+		public Image getImage(Object element) {
+			if (element instanceof MergedArchitectureViewpoint) {
+				return images.get(IMG_VIEWPOINT);
+			}
+			if (element instanceof ViewPrototype) {
+				return ((ViewPrototype) element).getIcon();
+			}
+			if (element instanceof EPackage) {
+				return images.get(IMG_PROFILE);
+			}
+			if (element instanceof ModelRule) {
+				return images.get(IMG_MODEL);
+			}
+			if (element instanceof OwningRule) {
+				return images.get(IMG_OWNER);
+			}
+			return null;
+		}
+	}
+
+
+	/**
+	 * Creates the provider
+	 *
+	 * @param views
+	 *            The views to provide
+	 */
+	public ViewPrototypeContentProvider() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
+	 */
+	public void dispose() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
+	 */
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getElements(java.lang.Object)
+	 */
+	public Object[] getElements(Object inputElement) {
+		return (Object[])inputElement;
+	}
+
+
+	private Object[] getChildren(ViewPrototype view) {
+		if (view.getRepresentationKind() == null) {
+			return new String[0];
+		}
+		List<Object> data = new ArrayList<Object>();
+		data.add(view.getRepresentationKind().eContainer());
+		data.addAll(view.getRepresentationKind().getLanguage().getProfiles());
+		data.addAll(view.getRepresentationKind().getModelRules());
+		data.addAll(view.getRepresentationKind().getOwningRules());
+		return data.toArray();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
+	 */
+	public Object[] getChildren(Object element) {
+		if (element instanceof MergedArchitectureViewpoint) {
+			MergedArchitectureViewpoint viewpoint = (MergedArchitectureViewpoint)element;
+			List<ViewPrototype> protos = new ArrayList<ViewPrototype>();
+			for (RepresentationKind kind : viewpoint.getRepresentationKinds()) {
+				protos.add(ViewPrototype.get(kind));
+			}
+			Collections.sort(protos, new ViewPrototype.Comp());
+			return protos.toArray();
+		}
+		if (element instanceof ViewPrototype) {
+			return getChildren((ViewPrototype) element);
+		}
+		return new Object[0];
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
+	 */
+	public Object getParent(Object element) {
+		return null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
+	 */
+	public boolean hasChildren(Object element) {
+		if (element instanceof MergedArchitectureViewpoint) {
+			return true;
+		}
+		if (element instanceof ViewPrototype) {
+			return true;
+		}
+		return false;
+	}
+}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ViewpointExplorer.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ViewpointExplorer.java
index 8c2cfa094e2..7f78549c621 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ViewpointExplorer.java
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ViewpointExplorer.java
@@ -1,91 +1,91 @@
-/*****************************************************************************

- * Copyright (c) 2014 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:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.viewpoints.policy;

-

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.jface.viewers.ViewerSorter;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.ui.part.ViewPart;

-

-/**

- * Eclipse view for the user to explore the current viewpoint

- *

- * @author Laurent Wouters

- *

- */

-public class ViewpointExplorer extends ViewPart {

-

-	private TreeViewer tree;

-

-	public ViewpointExplorer() {

-

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)

-	 */

-	@Override

-	public void createPartControl(Composite parent) {

-		GridLayout gridLayout = new GridLayout();

-		gridLayout.numColumns = 1;

-		parent.setLayout(gridLayout);

-

-		Composite inner = new Composite(parent, SWT.NONE);

-		inner.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.FILL_VERTICAL));

-		inner.setLayout(new FillLayout());

-

-		tree = new TreeViewer(inner, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);

-		tree.setLabelProvider(new ViewPrototypeContentProvider.LP());

-		tree.setSorter(getViewerSorter());

-		tree.setContentProvider(new ViewPrototypeContentProvider());

-		tree.setInput(ViewPrototypeContentProvider.treeRoot);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.part.WorkbenchPart#setFocus()

-	 */

-	@Override

-	public void setFocus() {

-

-	}

-

-

-	/**

-	 * Gets the viewer sorter for this dialog

-	 *

-	 * @return A viewer sorter

-	 */

-	private ViewerSorter getViewerSorter() {

-		return new ViewerSorter() {

-			@Override

-			public int compare(Viewer viewer, Object e1, Object e2) {

-				if (e1 instanceof ViewPrototype) {

-					ViewPrototype b1 = (ViewPrototype) e1;

-					ViewPrototype b2 = (ViewPrototype) e2;

-					return b1.getFullLabel().compareTo(b2.getFullLabel());

-				}

-				return super.compare(viewer, e1, e2);

-			}

-		};

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 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:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.viewpoints.policy;
+
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.part.ViewPart;
+
+/**
+ * Eclipse view for the user to explore the current viewpoint
+ *
+ * @author Laurent Wouters
+ *
+ */
+public class ViewpointExplorer extends ViewPart {
+
+	private TreeViewer tree;
+
+	public ViewpointExplorer() {
+
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
+	 */
+	@Override
+	public void createPartControl(Composite parent) {
+		GridLayout gridLayout = new GridLayout();
+		gridLayout.numColumns = 1;
+		parent.setLayout(gridLayout);
+
+		Composite inner = new Composite(parent, SWT.NONE);
+		inner.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.FILL_VERTICAL));
+		inner.setLayout(new FillLayout());
+
+		tree = new TreeViewer(inner, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
+		tree.setLabelProvider(new ViewPrototypeContentProvider.LP());
+		tree.setSorter(getViewerSorter());
+		tree.setContentProvider(new ViewPrototypeContentProvider());
+		//tree.setInput(ViewPrototypeContentProvider.treeRoot);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.part.WorkbenchPart#setFocus()
+	 */
+	@Override
+	public void setFocus() {
+
+	}
+
+
+	/**
+	 * Gets the viewer sorter for this dialog
+	 *
+	 * @return A viewer sorter
+	 */
+	private ViewerSorter getViewerSorter() {
+		return new ViewerSorter() {
+			@Override
+			public int compare(Viewer viewer, Object e1, Object e2) {
+				if (e1 instanceof ViewPrototype) {
+					ViewPrototype b1 = (ViewPrototype) e1;
+					ViewPrototype b2 = (ViewPrototype) e2;
+					return b1.getFullLabel().compareTo(b2.getFullLabel());
+				}
+				return super.compare(viewer, e1, e2);
+			}
+		};
+	}
+}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/WeightedConfiguration.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/WeightedConfiguration.java
deleted file mode 100755
index 253099990e8..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/WeightedConfiguration.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.viewpoints.policy;

-

-import java.io.Serializable;

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.IExtension;

-import org.eclipse.core.runtime.IExtensionPoint;

-import org.eclipse.core.runtime.IExtensionRegistry;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusConfiguration;

-

-

-/**

- * Represents a Papyrus viewpoints configuration associated to a priority

- *

- * @author Laurent Wouters

- */

-public class WeightedConfiguration {

-	/**

-	 * ID of the extension point defining the configurations

-	 */

-	private static final String EXTENSION_ID = "org.eclipse.papyrus.infra.viewpoints.policy.custom";

-

-	private String uri;

-	private int priority;

-	private PapyrusConfiguration config;

-

-	/**

-	 * Gets the URI of the is configuration

-	 *

-	 * @return The configuration's URI

-	 */

-	public String getURI() {

-		return uri;

-	}

-

-	/**

-	 * Gets the Papyrus configuration represented by this object

-	 *

-	 * @return A Papyrus Configuration

-	 */

-	public PapyrusConfiguration getConfiguration() {

-		if (this.config == null) {

-			this.config = PolicyChecker.loadConfigurationFrom(uri);

-		}

-		return this.config;

-	}

-

-	/**

-	 * Initializes the configuration from the given configuration element

-	 *

-	 * @param config

-	 *            The extension point configuration element

-	 */

-	private WeightedConfiguration(String plugin, IConfigurationElement config) {

-		this.uri = config.getAttribute("file");

-		if (!this.uri.startsWith(PreferenceConstants.P_CONF_PATH_SCHEME_PLUGIN_VALUE)) {

-			this.uri = PreferenceConstants.P_CONF_PATH_SCHEME_PLUGIN_VALUE + plugin + "/" + this.uri;

-		}

-		try {

-			this.priority = Integer.parseInt(config.getAttribute("priority"));

-		} catch (NumberFormatException ex) {

-		}

-	}

-

-

-	/**

-	 * Represents a comparator for weighted configurations

-	 *

-	 * @author Laurent Wouters

-	 */

-	private static class Comparator implements java.util.Comparator<WeightedConfiguration>, Serializable {

-		/**

-		 * Serial version

-		 */

-		private static final long serialVersionUID = 9025582514350440832L;

-

-		/**

-		 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)

-		 */

-		public int compare(WeightedConfiguration o1, WeightedConfiguration o2) {

-			return (o2.priority - o1.priority);

-		}

-	}

-

-	/**

-	 * Gets the configuration with the top priority

-	 *

-	 * @return The appropriate configuration, or <code>null</code> if none was found

-	 */

-	public static WeightedConfiguration getTopConfiguration() {

-		IExtensionRegistry registry = Platform.getExtensionRegistry();

-		IExtensionPoint point = registry.getExtensionPoint(EXTENSION_ID);

-		IExtension[] extensions = point.getExtensions();

-

-		List<WeightedConfiguration> configs = new ArrayList<WeightedConfiguration>();

-		for (int i = 0; i != extensions.length; i++) {

-			String plugin = extensions[i].getContributor().getName();

-			IConfigurationElement[] elements = extensions[i].getConfigurationElements();

-			for (int j = 0; j != elements.length; j++) {

-				if (elements[j].getName().equals("configuration")) {

-					configs.add(new WeightedConfiguration(plugin, elements[j]));

-				}

-			}

-		}

-		Collections.sort(configs, new Comparator());

-		if (configs.size() == 0) {

-			return null;

-		}

-		return configs.get(0);

-	}

-}

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/listener/IPolicyCheckerListenerExtensionPoint.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/listener/IPolicyCheckerListenerExtensionPoint.java
deleted file mode 100644
index 23391c4df46..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/listener/IPolicyCheckerListenerExtensionPoint.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.viewpoints.policy.listener;

-

-import org.eclipse.papyrus.infra.viewpoints.policy.Activator;

-

-/**

- * @since 1.2

- */

-public interface IPolicyCheckerListenerExtensionPoint {

-

-

-	/** ID of the extension point */

-	public final static String EXTENSION_POINT_ID = Activator.PLUGIN_ID + ".policycheckerlistener";

-

-	public static final String LISTENER_CLASS = "listenerClass";

-}

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/listener/PolicyCheckerNotifier.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/listener/PolicyCheckerNotifier.java
deleted file mode 100644
index bf9c372d65a..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/listener/PolicyCheckerNotifier.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.viewpoints.policy.listener;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.papyrus.infra.viewpoints.policy.Activator;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-

-/**

- * @since 1.2

- */

-public class PolicyCheckerNotifier {

-

-	private static PolicyCheckerNotifier notifier;

-

-	private static List<IPolicyCheckerListener> listeners;

-

-

-	public static synchronized PolicyCheckerNotifier getInstance() {

-		if (notifier == null) {

-			notifier = new PolicyCheckerNotifier();

-			listeners = new ArrayList<IPolicyCheckerListener>();

-			notifier.init();

-		}

-		return notifier;

-	}

-

-	public void clearListeners() {

-		listeners.clear();

-	}

-

-	public void fire(PolicyChecker policyChecker) {

-		for (IPolicyCheckerListener policyCheckerListener : listeners) {

-			policyCheckerListener.policyCheckerChanged(policyChecker);

-		}

-	}

-

-	void init() {

-		IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(IPolicyCheckerListenerExtensionPoint.EXTENSION_POINT_ID);

-		for (IConfigurationElement configurationElement : elements) {

-			try {

-				Object listenerClass = configurationElement.createExecutableExtension(IPolicyCheckerListenerExtensionPoint.LISTENER_CLASS);

-				if (listenerClass instanceof IPolicyCheckerListener) {

-					listeners.add((IPolicyCheckerListener) listenerClass);

-				}

-			} catch (CoreException e) {

-				Activator.log.error(e);

-			}

-		}

-	}

-}

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/.project b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/.project
deleted file mode 100755
index 2f2658d7b5b..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/.project
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.infra.viewpoints.preferences</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>
-		<buildCommand>
-			<name>org.eclipse.oomph.version.VersionBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>check.maven.pom</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>ignore.lower.bound.dependency.ranges</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>release.path</key>
-					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.oomph.version.VersionNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100755
index 4759947300a..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-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

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/.settings/org.eclipse.pde.api.tools.prefs b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 23fb95e120f..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,98 +0,0 @@
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-API_USE_SCAN_FIELD_SEVERITY=Error
-API_USE_SCAN_METHOD_SEVERITY=Error
-API_USE_SCAN_TYPE_SEVERITY=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Warning
-ILLEGAL_IMPLEMENT=Warning
-ILLEGAL_INSTANTIATE=Warning
-ILLEGAL_OVERRIDE=Warning
-ILLEGAL_REFERENCE=Warning
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_ANNOTATION=Ignore
-INVALID_JAVADOC_TAG=Ignore
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
-LEAK_EXTEND=Warning
-LEAK_FIELD_DECL=Warning
-LEAK_IMPLEMENT=Warning
-LEAK_METHOD_PARAM=Warning
-LEAK_METHOD_RETURN_TYPE=Warning
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Warning
-automatically_removed_unused_problem_filters=Enabled
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Warning
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/META-INF/MANIFEST.MF b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/META-INF/MANIFEST.MF
deleted file mode 100755
index 54a3a3ce0d5..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.infra.core.pluginexplorer;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[1.2.0,2.0.0)"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-Activator: org.eclipse.papyrus.infra.viewpoints.preferences.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.preferences;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/about.html b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/about.html
deleted file mode 100755
index dd02e0be168..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>December 2, 2009</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/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/plugin.xml b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/plugin.xml
deleted file mode 100755
index 1ea8425cb0e..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/plugin.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

-         point="org.eclipse.ui.preferencePages">

-      <page

-            category="org.eclipse.papyrus.infra.core.sasheditor.preferences.generalcategory"

-            class="org.eclipse.papyrus.infra.viewpoints.preferences.ViewpointsPreferencePage"

-            id="org.eclipse.papyrus.infra.viewpoints.preferences.ViewpointsPreferencePage"

-            name="Viewpoints Configuration">

-      </page>

-   </extension>

-   <extension

-         point="org.eclipse.core.runtime.preferences">

-      <initializer

-            class="org.eclipse.papyrus.infra.viewpoints.preferences.PreferenceInitializer">

-      </initializer>

-   </extension>

-

-</plugin>

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/src/org/eclipse/papyrus/infra/viewpoints/preferences/Activator.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/src/org/eclipse/papyrus/infra/viewpoints/preferences/Activator.java
deleted file mode 100755
index d3e7f73411b..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/src/org/eclipse/papyrus/infra/viewpoints/preferences/Activator.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.viewpoints.preferences;

-

-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.infra.viewpoints.preferences"; //$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)

-	 */

-	@Override

-	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)

-	 */

-	@Override

-	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/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/src/org/eclipse/papyrus/infra/viewpoints/preferences/ResourceFieldEditor.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/src/org/eclipse/papyrus/infra/viewpoints/preferences/ResourceFieldEditor.java
deleted file mode 100755
index 927028141b0..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/src/org/eclipse/papyrus/infra/viewpoints/preferences/ResourceFieldEditor.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.viewpoints.preferences;

-

-import java.io.File;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.jface.preference.StringButtonFieldEditor;

-import org.eclipse.jface.resource.JFaceResources;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.infra.core.pluginexplorer.Plugin;

-import org.eclipse.papyrus.infra.core.pluginexplorer.PluginEntry;

-import org.eclipse.papyrus.infra.core.pluginexplorer.PluginsContentDialog;

-import org.eclipse.papyrus.infra.core.pluginexplorer.PluginsContentSelectionValidator;

-import org.eclipse.papyrus.infra.viewpoints.policy.PreferenceConstants;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.FileDialog;

-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;

-import org.eclipse.ui.dialogs.ISelectionStatusValidator;

-import org.eclipse.ui.model.BaseWorkbenchContentProvider;

-import org.eclipse.ui.model.WorkbenchLabelProvider;

-

-/**

- * Represents the preference field for the custom configuration selection

- *

- * @author Laurent Wouters

- */

-public class ResourceFieldEditor extends StringButtonFieldEditor {

-

-	/**

-	 * Absolute path selection mode

-	 */

-	public static final int MODE_FILE = 0;

-	/**

-	 * Workspace resource selection mode

-	 */

-	public static final int MODE_WORKSPACE = 1;

-	/**

-	 * Plugin's resource selection mode

-	 */

-	public static final int MODE_PLUGIN = 2;

-

-	protected String[] extensions;

-	protected int mode;

-

-	/**

-	 * Initializes this field

-	 *

-	 * @param name

-	 *            The field's name

-	 * @param labelText

-	 *            The displayed label

-	 * @param parent

-	 *            The parent component

-	 */

-	public ResourceFieldEditor(String name, String labelText, Composite parent) {

-		init(name, labelText);

-		this.extensions = new String[] { "*.configuration" };

-		this.mode = 0;

-		setErrorMessage(JFaceResources.getString("FileFieldEditor.errorMessage"));//$NON-NLS-1$

-		setChangeButtonText(JFaceResources.getString("openBrowse"));//$NON-NLS-1$

-		createControl(parent);

-	}

-

-	/**

-	 * Changes the field mode

-	 *

-	 * @param mode

-	 *            The new mode

-	 */

-	public void setMode(int mode) {

-		this.mode = mode;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * Method declared on StringButtonFieldEditor.

-	 * Opens the file chooser dialog and returns the selected file.

-	 */

-	@Override

-	protected String changePressed() {

-		switch (mode) {

-		case MODE_FILE:

-			return selectFile();

-		case MODE_WORKSPACE:

-			return selectInWorkspace();

-		case MODE_PLUGIN:

-			return selectInPlugin();

-		default:

-			return selectFile();

-		}

-	}

-

-	private String selectFile() {

-		FileDialog dialog = new FileDialog(getShell(), SWT.OPEN | SWT.SHEET);

-		dialog.setFilterExtensions(extensions);

-		String value = getTextControl().getText();

-		if (value != null && !value.isEmpty()) {

-			dialog.setFileName(value);

-		}

-		value = dialog.open();

-		if (value != null) {

-			value = value.trim();

-			if (value.length() > 0) {

-				File f = new File(value);

-				return f.getAbsolutePath();

-			}

-		}

-		return null;

-	}

-

-	private String selectInWorkspace() {

-		ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(getShell(), new WorkbenchLabelProvider(), new BaseWorkbenchContentProvider());

-		dialog.setTitle("Configuration Selection");

-		dialog.setMessage("Select the custom configuration resource:");

-		dialog.setInput(ResourcesPlugin.getWorkspace().getRoot());

-		dialog.setValidator(new ISelectionStatusValidator() {

-			public IStatus validate(Object[] selection) {

-				if (selection == null || selection.length == 0) {

-					return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "No selected item!");

-				}

-				if (selection.length > 1) {

-					return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Only one item should be selected!");

-				}

-				if (!(selection[0] instanceof IFile)) {

-					return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The selected item is not a configuration file!");

-				}

-				IFile file = (IFile) selection[0];

-				if (!file.getName().endsWith(".configuration")) {

-					return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The selected item is not a configuration file!");

-				}

-				return new Status(IStatus.OK, Activator.PLUGIN_ID, "");

-			}

-		});

-		int value = dialog.open();

-		if (value != Window.OK) {

-			return null;

-		}

-		IFile file = (IFile) dialog.getFirstResult();

-		return PreferenceConstants.P_CONF_PATH_SCHEME_WORKSPACE_VALUE + file.getProject().getName() + "/" + file.getProjectRelativePath().toString();

-	}

-

-	private String selectInPlugin() {

-		PluginsContentDialog dialog = new PluginsContentDialog(getShell(), new PluginsContentSelectionValidator() {

-			public boolean isValid(Plugin plugin) {

-				return false;

-			}

-

-			public boolean isValid(PluginEntry entry) {

-				return entry.getName().endsWith(".configuration");

-			}

-		}, "Viewpoints configuration selection", "Select a configuration resource (*.configuration):");

-		int result = dialog.open();

-		if (result != Window.OK) {

-			return null;

-		}

-		PluginEntry entry = (PluginEntry) dialog.getSelection();

-		if (entry == null) {

-			return null;

-		}

-		return entry.getLogicalPath();

-	}

-}

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/src/org/eclipse/papyrus/infra/viewpoints/preferences/UpdatableComboBoxFieldEditor.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/src/org/eclipse/papyrus/infra/viewpoints/preferences/UpdatableComboBoxFieldEditor.java
deleted file mode 100755
index 05ccbd7fc3f..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/src/org/eclipse/papyrus/infra/viewpoints/preferences/UpdatableComboBoxFieldEditor.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.viewpoints.preferences;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.jface.preference.FieldEditor;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.SelectionAdapter;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.widgets.Combo;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-

-/**

- * Represents a preference combo field, which content can be updated

- *

- * @author Laurent Wouters

- */

-public class UpdatableComboBoxFieldEditor extends FieldEditor {

-

-	private Control label;

-	private Combo widget;

-	private EObject prefValue;

-	private List<EObject> data;

-	private EAttribute attribute;

-

-	/**

-	 * Initializes the field

-	 *

-	 * @param preference

-	 *            The target preference

-	 * @param label

-	 *            The displayed label

-	 * @param parent

-	 *            The parent component

-	 */

-	public UpdatableComboBoxFieldEditor(String preference, String label, Composite parent) {

-		init(preference, label);

-		this.data = new ArrayList<EObject>();

-		this.label = getLabelControl(parent);

-		this.widget = new Combo(parent, SWT.READ_ONLY);

-		this.widget.setFont(parent.getFont());

-		this.widget.addSelectionListener(new SelectionAdapter() {

-			@Override

-			public void widgetSelected(SelectionEvent evt) {

-				EObject oldValue = prefValue;

-				prefValue = null;

-				String name = widget.getText();

-				if (name != null) {

-					for (EObject obj : data) {

-						if (name.equals(getLabelFor(obj))) {

-							prefValue = obj;

-							break;

-						}

-					}

-				}

-				setPresentsDefaultValue(false);

-				fireValueChanged(VALUE, oldValue, prefValue);

-			}

-		});

-		createControl(parent);

-	}

-

-	/**

-	 * Gets the selected value

-	 *

-	 * @return The selection

-	 */

-	public EObject getSelection() {

-		return prefValue;

-	}

-

-	/**

-	 * Sets the selected value

-	 *

-	 * @param obj

-	 *            The selection as an EObject

-	 */

-	public void setSelection(EObject obj) {

-		prefValue = obj;

-		widget.setText(getLabelFor(prefValue));

-	}

-

-	/**

-	 * Sets the selected value

-	 *

-	 * @param value

-	 *            The selection as its display value

-	 */

-	public void setSelection(String value) {

-		load(value);

-	}

-

-

-	/**

-	 * Changes the content of the combo

-	 *

-	 * @param data

-	 *            The new data

-	 * @param attribute

-	 *            The attribute used to get readable text from the data

-	 */

-	public void setContent(List<? extends EObject> data, EAttribute attribute) {

-		this.data = new ArrayList<EObject>(data);

-		this.attribute = attribute;

-		widget.removeAll();

-		for (EObject obj : this.data) {

-			widget.add(getLabelFor(obj));

-		}

-		prefValue = this.data.get(0);

-		widget.setText(getLabelFor(prefValue));

-	}

-

-	/**

-	 * Removes all content

-	 */

-	public void clearContent() {

-		data = new ArrayList<EObject>();

-		prefValue = null;

-		widget.removeAll();

-	}

-

-	/**

-	 * Gets the string representation of the given object

-	 *

-	 * @param object

-	 *            An object

-	 * @return Its string representation

-	 */

-	private String getValueFor(EObject object) {

-		Object value = object.eGet(attribute);

-		return (value == null ? null : value.toString());

-	}

-

-	/**

-	 * Gets the display string of the given object

-	 *

-	 * @param object

-	 *            An object

-	 * @return The display string

-	 */

-	private String getLabelFor(EObject object) {

-		Object value = object.eGet(attribute);

-		return (value == null ? null : value.toString());

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.jface.preference.FieldEditor#adjustForNumColumns(int)

-	 */

-	@Override

-	protected void adjustForNumColumns(int numColumns) {

-		return;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.jface.preference.FieldEditor#doFillIntoGrid(org.eclipse.swt.widgets.Composite, int)

-	 */

-	@Override

-	protected void doFillIntoGrid(Composite parent, int numColumns) {

-		int comboC = 1;

-		if (numColumns > 1) {

-			comboC = numColumns - 1;

-		}

-		GridData gd = new GridData();

-		gd.horizontalSpan = 1;

-		label.setLayoutData(gd);

-

-		gd = new GridData();

-		gd.horizontalSpan = comboC;

-		gd.horizontalAlignment = GridData.FILL;

-		widget.setLayoutData(gd);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.jface.preference.FieldEditor#doLoad()

-	 */

-	@Override

-	protected void doLoad() {

-		load(getPreferenceStore().getString(getPreferenceName()));

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.jface.preference.FieldEditor#doLoadDefault()

-	 */

-	@Override

-	protected void doLoadDefault() {

-		load(getPreferenceStore().getDefaultString(getPreferenceName()));

-	}

-

-	/**

-	 * Loads the display data from the given value for selection

-	 *

-	 * @param value

-	 */

-	private void load(String value) {

-		prefValue = null;

-		if (value != null) {

-			for (EObject obj : data) {

-				if (value.equals(getValueFor(obj))) {

-					prefValue = obj;

-					widget.setText(getLabelFor(obj));

-					return;

-				}

-			}

-		}

-		if (data.size() > 0) {

-			prefValue = data.get(0);

-			widget.setText(getLabelFor(prefValue));

-		} else {

-			widget.setText(null);

-		}

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.jface.preference.FieldEditor#doStore()

-	 */

-	@Override

-	protected void doStore() {

-		if (prefValue == null) {

-			getPreferenceStore().setToDefault(getPreferenceName());

-			return;

-		}

-		getPreferenceStore().setValue(getPreferenceName(), getValueFor(prefValue));

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.jface.preference.FieldEditor#getNumberOfControls()

-	 */

-	@Override

-	public int getNumberOfControls() {

-		return 2;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.jface.preference.FieldEditor#setEnabled(boolean,

-	 * org.eclipse.swt.widgets.Composite)

-	 */

-	@Override

-	public void setEnabled(boolean enabled, Composite parent) {

-		super.setEnabled(enabled, parent);

-		widget.setEnabled(enabled);

-	}

-}

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/src/org/eclipse/papyrus/infra/viewpoints/preferences/ViewpointsPreferencePage.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/src/org/eclipse/papyrus/infra/viewpoints/preferences/ViewpointsPreferencePage.java
deleted file mode 100755
index aedeb53e3c9..00000000000
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/src/org/eclipse/papyrus/infra/viewpoints/preferences/ViewpointsPreferencePage.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.viewpoints.preferences;
-
-import java.util.List;
-
-import org.eclipse.jface.preference.BooleanFieldEditor;
-import org.eclipse.jface.preference.ComboFieldEditor;
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.RadioGroupFieldEditor;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusConfiguration;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusViewpoint;
-import org.eclipse.papyrus.infra.viewpoints.iso42010.Iso42010Package;
-import org.eclipse.papyrus.infra.viewpoints.iso42010.Stakeholder;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.infra.viewpoints.policy.PreferenceConstants;
-import org.eclipse.papyrus.infra.viewpoints.policy.WeightedConfiguration;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-/**
- * Represents the preference page for the viewpoints configuration
- *
- * @author Laurent Wouters
- */
-public class ViewpointsPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
-
-	private PapyrusConfiguration currentConfig;
-	private boolean customConfig;
-	private String scheme;
-
-	private RadioGroupFieldEditor fieldType;
-	private ComboFieldEditor fieldScheme;
-	private ResourceFieldEditor fieldPath;
-	private BooleanFieldEditor fieldForceMultiplicity;
-	private UpdatableComboBoxFieldEditor fieldStakeholder;
-	private UpdatableComboBoxFieldEditor fieldViewpoint;
-	private Label labelConfig;
-	private Group groupCustom;
-	private Group groupVP;
-
-	public ViewpointsPreferencePage() {
-		super(GRID);
-		setPreferenceStore(PolicyChecker.getPreferences());
-		setDescription("Preference page for the configuration of Papyrus viewpoints");
-	}
-
-	/**
-	 * Creates the field editors. Field editors are abstractions of
-	 * the common GUI blocks needed to manipulate various types
-	 * of preferences. Each field editor knows how to save and
-	 * restore itself.
-	 */
-	@Override
-	public void createFieldEditors() {
-		IPreferenceStore store = getPreferenceStore();
-		currentConfig = PolicyChecker.getCurrent().getConfiguration();
-		String valueType = store.getString(PreferenceConstants.P_CONF_TYPE);
-		scheme = store.getString(PreferenceConstants.P_CONF_PATH_SCHEME);
-		if (scheme == null || scheme.isEmpty()) {
-			scheme = PreferenceConstants.P_CONF_PATH_SCHEME_FILE_VALUE;
-		}
-
-		fieldType = new RadioGroupFieldEditor(PreferenceConstants.P_CONF_TYPE, "Configuration selection:", 1, new String[][] {
-				{ PreferenceConstants.P_CONF_TYPE_DEFAULT_LABEL, PreferenceConstants.P_CONF_TYPE_DEFAULT_VALUE },
-				{ PreferenceConstants.P_CONF_TYPE_EXTENSION_LABEL, PreferenceConstants.P_CONF_TYPE_EXTENSION_VALUE },
-				{ PreferenceConstants.P_CONF_TYPE_USER_DEFINED_LABEL, PreferenceConstants.P_CONF_TYPE_USER_DEFINED_VALUE }
-		}, getFieldEditorParent(), true);
-
-		GridData gd = new GridData();
-		gd.horizontalSpan = 3;
-		gd.horizontalAlignment = GridData.FILL;
-		Composite rest = new Composite(getFieldEditorParent(), SWT.SHADOW_NONE);
-		rest.setLayout(new FillLayout(SWT.VERTICAL));
-		rest.setLayoutData(gd);
-
-		groupCustom = new Group(rest, SWT.SHADOW_ETCHED_IN);
-		groupCustom.setText(PreferenceConstants.P_CONF_TYPE_USER_DEFINED_LABEL + ":");
-
-		fieldScheme = new ComboFieldEditor(PreferenceConstants.P_CONF_PATH_SCHEME, "Access scheme:", new String[][] {
-				{ PreferenceConstants.P_CONF_PATH_SCHEME_FILE_LABEL, PreferenceConstants.P_CONF_PATH_SCHEME_FILE_VALUE },
-				{ PreferenceConstants.P_CONF_PATH_SCHEME_WORKSPACE_LABEL, PreferenceConstants.P_CONF_PATH_SCHEME_WORKSPACE_VALUE },
-				{ PreferenceConstants.P_CONF_PATH_SCHEME_PLUGIN_LABEL, PreferenceConstants.P_CONF_PATH_SCHEME_PLUGIN_VALUE }
-		}, groupCustom);
-		fieldScheme.setEnabled(PreferenceConstants.P_CONF_TYPE_USER_DEFINED_VALUE.equals(valueType), groupCustom);
-
-		fieldPath = new ResourceFieldEditor(PreferenceConstants.P_CONF_PATH, "&Path:", groupCustom);
-		fieldPath.setMode(0);
-		fieldPath.setEnabled(PreferenceConstants.P_CONF_TYPE_USER_DEFINED_VALUE.equals(valueType), groupCustom);
-		if (PreferenceConstants.P_CONF_PATH_SCHEME_FILE_VALUE.equals(scheme)) {
-			fieldPath.setMode(ResourceFieldEditor.MODE_FILE);
-		} else if (PreferenceConstants.P_CONF_PATH_SCHEME_WORKSPACE_VALUE.equals(scheme)) {
-			fieldPath.setMode(ResourceFieldEditor.MODE_WORKSPACE);
-		} else if (PreferenceConstants.P_CONF_PATH_SCHEME_PLUGIN_VALUE.equals(scheme)) {
-			fieldPath.setMode(ResourceFieldEditor.MODE_PLUGIN);
-		}
-
-		groupVP = new Group(rest, SWT.SHADOW_ETCHED_IN);
-		groupVP.setText("Viewpoint selection:");
-
-		gd = new GridData();
-		gd.horizontalSpan = 1;
-		Label titleConf = new Label(groupVP, SWT.LEFT);
-		titleConf.setText("Configuration:");
-		titleConf.setLayoutData(gd);
-
-		gd = new GridData();
-		gd.horizontalSpan = 1;
-		gd.horizontalAlignment = GridData.FILL;
-		labelConfig = new Label(groupVP, SWT.LEFT);
-		if (PreferenceConstants.P_CONF_TYPE_DEFAULT_VALUE.equals(valueType)) {
-			labelConfig.setText("Builtin");
-		} else if (PreferenceConstants.P_CONF_TYPE_EXTENSION_VALUE.equals(valueType)) {
-			WeightedConfiguration config = WeightedConfiguration.getTopConfiguration();
-			labelConfig.setText((config == null) ? "No suitable configuration" : config.getURI());
-		} else if (PreferenceConstants.P_CONF_TYPE_USER_DEFINED_VALUE.equals(valueType)) {
-			labelConfig.setText(store.getString(PreferenceConstants.P_CONF_PATH));
-		}
-		labelConfig.setLayoutData(gd);
-
-		gd = new GridData();
-		gd.horizontalSpan = 1;
-		Label labelMulti = new Label(groupVP, SWT.LEFT);
-		labelMulti.setText("Multiplicity:");
-		labelMulti.setLayoutData(gd);
-		fieldForceMultiplicity = new BooleanFieldEditor(PreferenceConstants.P_FORCE_MULTIPLICITY, PreferenceConstants.P_FORCE_MULTIPLICITY_LABEL, groupVP);
-
-
-		fieldStakeholder = new UpdatableComboBoxFieldEditor(PreferenceConstants.P_STAKEHOLDER, "&Stakeholder:", groupVP);
-		fieldStakeholder.setContent(currentConfig.getStakeholders(), Iso42010Package.Literals.AD_ELEMENT__NAME);
-
-		fieldViewpoint = new UpdatableComboBoxFieldEditor(PreferenceConstants.P_VIEWPOINT, "&Viewpoint:", groupVP);
-		fieldViewpoint.setContent(PolicyChecker.getCurrent().getStakeholder().getViewpoints(), Iso42010Package.Literals.AD_ELEMENT__NAME);
-
-		addField(fieldType);
-		addField(fieldScheme);
-		addField(fieldPath);
-		addField(fieldStakeholder);
-		addField(fieldViewpoint);
-
-	}
-
-	@Override
-	protected void checkState() {
-		super.checkState();
-		if (currentConfig == null || fieldViewpoint.getSelection() == null || fieldStakeholder.getSelection() == null) {
-			this.setMessage("The currently selected configuration does not provide adequate viewpoints", ERROR);
-			setValid(false);
-		} else {
-			this.setMessage(null, NONE);
-			setValid(true);
-		}
-	}
-
-	@Override
-	protected void performDefaults() {
-		super.performDefaults();
-		customConfig = false;
-		WeightedConfiguration config = WeightedConfiguration.getTopConfiguration();
-		currentConfig = (config != null ? config.getConfiguration() : PolicyChecker.getDefaultConfiguration());
-		fieldPath.setStringValue("");
-		labelConfig.setText((config == null) ? "Builtin default" : config.getURI());
-		fieldPath.setEnabled(false, groupCustom);
-		fieldScheme.setEnabled(false, groupCustom);
-		if (currentConfig != null) {
-			List<Stakeholder> list = currentConfig.getStakeholders();
-			fieldStakeholder.setContent(list, Iso42010Package.Literals.AD_ELEMENT__NAME);
-			fieldViewpoint.setContent(list.get(0).getViewpoints(), Iso42010Package.Literals.AD_ELEMENT__NAME);
-		} else {
-			fieldStakeholder.clearContent();
-			fieldViewpoint.clearContent();
-		}
-	}
-
-	@Override
-	public boolean performOk() {
-		boolean result = super.performOk();
-		if (!result) {
-			return false;
-		}
-		if (currentConfig == null || fieldViewpoint.getSelection() == null || fieldStakeholder.getSelection() == null) {
-			return false;
-		}
-		PolicyChecker newPolicy = new PolicyChecker(currentConfig, (PapyrusViewpoint) fieldViewpoint.getSelection(), fieldForceMultiplicity.getBooleanValue());
-		PolicyChecker.setCurrent(newPolicy);
-		return true;
-	}
-
-	@Override
-	public void propertyChange(PropertyChangeEvent event) {
-		super.propertyChange(event);
-		if (event.getSource() == fieldType) {
-			onChangeType(event);
-		} else if (event.getSource() == fieldScheme) {
-			onChangeScheme(event);
-		} else if (event.getSource() == fieldPath) {
-			onChangePath(event);
-		} else if (event.getSource() == fieldStakeholder) {
-			onChangeStakeholder(event);
-		}
-		checkState();
-	}
-
-	private void onChangeType(PropertyChangeEvent event) {
-		currentConfig = null;
-		if (PreferenceConstants.P_CONF_TYPE_DEFAULT_VALUE.equals(event.getNewValue())) {
-			customConfig = false;
-			currentConfig = PolicyChecker.getDefaultConfiguration();
-			fieldPath.setStringValue("");
-			labelConfig.setText("Builtin default");
-		} else if (PreferenceConstants.P_CONF_TYPE_EXTENSION_VALUE.equals(event.getNewValue())) {
-			customConfig = false;
-			WeightedConfiguration config = WeightedConfiguration.getTopConfiguration();
-			currentConfig = (config != null ? config.getConfiguration() : PolicyChecker.getDefaultConfiguration());
-			fieldPath.setStringValue("");
-			labelConfig.setText((config == null) ? "Builtin default" : config.getURI());
-		} else if (PreferenceConstants.P_CONF_TYPE_USER_DEFINED_VALUE.equals(event.getNewValue())) {
-			customConfig = true;
-			labelConfig.setText("...");
-		}
-		fieldPath.setEnabled(customConfig, groupCustom);
-		fieldScheme.setEnabled(customConfig, groupCustom);
-		if (currentConfig != null) {
-			List<Stakeholder> list = currentConfig.getStakeholders();
-			fieldStakeholder.setContent(list, Iso42010Package.Literals.AD_ELEMENT__NAME);
-			fieldViewpoint.setContent(list.get(0).getViewpoints(), Iso42010Package.Literals.AD_ELEMENT__NAME);
-		} else {
-			fieldStakeholder.clearContent();
-			fieldViewpoint.clearContent();
-		}
-	}
-
-	private void onChangeScheme(PropertyChangeEvent event) {
-		scheme = event.getNewValue().toString();
-		fieldPath.setStringValue("");
-		if (PreferenceConstants.P_CONF_PATH_SCHEME_FILE_VALUE.equals(scheme)) {
-			fieldPath.setMode(ResourceFieldEditor.MODE_FILE);
-		} else if (PreferenceConstants.P_CONF_PATH_SCHEME_WORKSPACE_VALUE.equals(scheme)) {
-			fieldPath.setMode(ResourceFieldEditor.MODE_WORKSPACE);
-		} else if (PreferenceConstants.P_CONF_PATH_SCHEME_PLUGIN_VALUE.equals(scheme)) {
-			fieldPath.setMode(ResourceFieldEditor.MODE_PLUGIN);
-		}
-	}
-
-	private void onChangePath(PropertyChangeEvent event) {
-		if (!customConfig) {
-			return;
-		}
-		String path = event.getNewValue().toString();
-		currentConfig = null;
-		if (path != null && !path.isEmpty()) {
-			if (PreferenceConstants.P_CONF_PATH_SCHEME_FILE_VALUE.equals(scheme)) {
-				currentConfig = PolicyChecker.loadConfigurationFrom(path);
-			} else if (PreferenceConstants.P_CONF_PATH_SCHEME_WORKSPACE_VALUE.equals(scheme)) {
-				currentConfig = PolicyChecker.loadConfigurationFrom(path);
-			} else if (PreferenceConstants.P_CONF_PATH_SCHEME_PLUGIN_VALUE.equals(scheme)) {
-				currentConfig = PolicyChecker.loadConfigurationFrom(path);
-			}
-			labelConfig.setText(path);
-		}
-		if (currentConfig != null) {
-			List<Stakeholder> list = currentConfig.getStakeholders();
-			fieldStakeholder.setContent(list, Iso42010Package.Literals.AD_ELEMENT__NAME);
-			fieldViewpoint.setContent(list.get(0).getViewpoints(), Iso42010Package.Literals.AD_ELEMENT__NAME);
-		} else {
-			fieldStakeholder.clearContent();
-			fieldViewpoint.clearContent();
-		}
-	}
-
-	private void onChangeStakeholder(PropertyChangeEvent event) {
-		Object value = event.getNewValue();
-		if (value != null) {
-			Stakeholder stakeholder = (Stakeholder) value;
-			fieldViewpoint.setContent(stakeholder.getViewpoints(), Iso42010Package.Literals.AD_ELEMENT__NAME);
-		}
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
-	 */
-	public void init(IWorkbench workbench) {
-	}
-}
\ No newline at end of file
diff --git a/plugins/infra/viewpoints/pom.xml b/plugins/infra/viewpoints/pom.xml
index 899afc26ee1..4f88ce0125b 100644
--- a/plugins/infra/viewpoints/pom.xml
+++ b/plugins/infra/viewpoints/pom.xml
@@ -9,15 +9,9 @@
 	    <version>0.0.1-SNAPSHOT</version>
     </parent>
 	<name>Papyrus Infra Viewpoints</name>
-	<description>Plug-ins providing an model of the ISO42010 standard and its application to Papyrus for role-based viewpoints customizing the UI experience.</description>
+	<description>Plug-ins providing an interpretation of the ISO42010 standard and its application to Papyrus for role-based viewpoints customizing the UI experience.</description>
 
 	<modules>
-		<module>org.eclipse.papyrus.infra.viewpoints.configuration</module>
-		<module>org.eclipse.papyrus.infra.viewpoints.configuration.edit</module>
-		<module>org.eclipse.papyrus.infra.viewpoints.configuration.editor</module>
-		<module>org.eclipse.papyrus.infra.viewpoints.iso42010</module>
-		<module>org.eclipse.papyrus.infra.viewpoints.iso42010.edit</module>
 		<module>org.eclipse.papyrus.infra.viewpoints.policy</module>
-		<module>org.eclipse.papyrus.infra.viewpoints.preferences</module>
 	</modules>
 </project>
diff --git a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/.classpath b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/.classpath
new file mode 100644
index 00000000000..eca7bdba8f0
--- /dev/null
+++ b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/.classpath
@@ -0,0 +1,7 @@
+<?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/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/.project b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/.project
new file mode 100644
index 00000000000..58a640e2fd6
--- /dev/null
+++ b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.sysml.architecture</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/sysml/architecture/org.eclipse.papyrus.sysml.architecture/.settings/org.eclipse.jdt.core.prefs b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..0c68a61dca8
--- /dev/null
+++ b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/META-INF/MANIFEST.MF b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..c4eef3d9e52
--- /dev/null
+++ b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/META-INF/MANIFEST.MF
@@ -0,0 +1,36 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.sysml.architecture;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.papyrus.uml.service.types;bundle-version="3.0.0",
+ org.eclipse.papyrus.infra.nattable.common;bundle-version="3.0.0",
+ org.eclipse.papyrus.uml.architecture;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.nattable;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.nattable.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.services.controlmode;bundle-version="[1.5.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.types.rulebased;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.activity;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.communication;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.interactionoverview;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.sequence;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.statemachine;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.diagram.timing;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.service.types.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.sysml.diagram.blockdefinition;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.sysml.diagram.internalblock;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.sysml.diagram.parametric;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.sysml.diagram.requirement;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.sysml.nattable.allocation.config;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.sysml.nattable.requirement.config;bundle-version="[1.2.0,2.0.0)"
+Export-Package: org.eclipse.papyrus.sysml.architecture
+Bundle-Vendor: %providerName
diff --git a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/about.html b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/about.html
new file mode 100644
index 00000000000..bbf2bd6aac7
--- /dev/null
+++ b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/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>January 30, 2017</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/sysml/architecture/org.eclipse.papyrus.sysml.architecture/build.properties b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/build.properties
new file mode 100644
index 00000000000..0dc34f7833b
--- /dev/null
+++ b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/build.properties
@@ -0,0 +1,6 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               plugin.properties
diff --git a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/icons/sysml.gif b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/icons/sysml.gif
new file mode 100644
index 00000000000..08760707586
--- /dev/null
+++ b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/icons/sysml.gif
diff --git a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/model/sysml.architecture b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/model/sysml.architecture
new file mode 100644
index 00000000000..c7045f9397b
--- /dev/null
+++ b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/model/sysml.architecture
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<architecture:ArchitectureDomain xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" xmlns:gmfdiagrepresentation="http://www.eclipse.org/papyrus/infra/gmfdiag/representation" xmlns:nattablerepresentation="http://www.eclipse.org/papyrus/infra/nattable/representation" xmi:id="_yMTQcMSdEeaKZJ_pGfaSiA" name="Systems Engineering" desciption="The domain of developing software systems">
+  <stakeholders xmi:id="_yMTQccSdEeaKZJ_pGfaSiA" name="Systems Engineer" desciption="An engineer interested in system development">
+    <concerns href="#_yMTQcsSdEeaKZJ_pGfaSiA"/>
+    <concerns href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_HQhf4sSYEeaKZJ_pGfaSiA"/>
+    <concerns href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_HQhf48SYEeaKZJ_pGfaSiA"/>
+    <concerns href="#_yMTQc8SdEeaKZJ_pGfaSiA"/>
+    <concerns href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_HQhf5MSYEeaKZJ_pGfaSiA"/>
+  </stakeholders>
+  <concerns xmi:id="_yMTQcsSdEeaKZJ_pGfaSiA" name="Requirements" desciption="The concern of developing the system's requirements"/>
+  <concerns xmi:id="_yMTQc8SdEeaKZJ_pGfaSiA" name="Parametrics" desciption="The concern of developing the system's parametrics"/>
+  <contexts xsi:type="architecture:ArchitectureDescriptionLanguage" xmi:id="_yMTQdMSdEeaKZJ_pGfaSiA" name="SysML" desciption="The Systems Modeling Language" id="org.eclipse.papyrus.sysml.architecture.SysML" icon="platform:/plugin/org.eclipse.papyrus.sysml.architecture/icons/sysml.gif" creationCommandClass="org.eclipse.papyrus.sysml.diagram.common.commands.CreateSysMLModelCommand">
+    <viewpoints xmi:id="_M5u1AMShEeaKZJ_pGfaSiA" name="Systems Analysis" desciption="A viewpoint allowing systems analysis with SysML" id="org.eclipse.papyrus.sysml.analysis">
+      <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="#_iBC4gHDvEeWh-MssWmCB_A"/>
+      <representationKinds xsi:type="nattablerepresentation:PapyrusSyncTable" href="#_lTE0gHDwEeWh-MssWmCB_A"/>
+      <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_yeY0sHDvEeWh-MssWmCB_A"/>
+      <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="#_m2D8IHDuEeWh-MssWmCB_A"/>
+    </viewpoints>
+    <viewpoints xmi:id="_PAtvoMShEeaKZJ_pGfaSiA" name="Systems Design" desciption="A viewpoint allowing systems design with SysML" id="org.eclipse.papyrus.sysml.design">
+      <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="#_m2D8IHDuEeWh-MssWmCB_A"/>
+      <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="#_eHbioHDvEeWh-MssWmCB_A"/>
+      <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="#_eHbipHDvEeWh-MssWmCB_A"/>
+      <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="#_eHbirXDvEeWh-MssWmCB_A"/>
+      <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_UzcgsHDtEeWh-MssWmCB_A"/>
+      <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_FuMjYHDuEeWh-MssWmCB_A"/>
+      <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="#_M-Q3sHDuEeWh-MssWmCB_A"/>
+      <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_zzf4cXDtEeWh-MssWmCB_A"/>
+      <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_TR15IHDvEeWh-MssWmCB_A"/>
+      <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_PwD0cHDvEeWh-MssWmCB_A"/>
+      <representationKinds xsi:type="nattablerepresentation:PapyrusSyncTable" href="#_r5y7wHDuEeWh-MssWmCB_A"/>
+      <representationKinds xsi:type="nattablerepresentation:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_Uz8agHDuEeWh-MssWmCB_A"/>
+      <representationKinds xsi:type="nattablerepresentation:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_wXztQHDwEeWh-MssWmCB_A"/>
+      <representationKinds xsi:type="nattablerepresentation:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+      <representationKinds xsi:type="nattablerepresentation:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+      <representationKinds xsi:type="nattablerepresentation:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_WC1q0P4UEeSRsNBVzfUrzA"/>
+    </viewpoints>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.emf/model/infra-emf.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.common/model/gmfdiag-common.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.common/model/notation.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontents.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontext.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.nattable.common/model/nattable-common.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.services.controlmode/model/controlmode.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.services.edit/model/marker.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.types.rulebased/model/rulebased.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.elementtypesconfigurations#_x8G0YGaNEeSyJIsxLao1Pw"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.communication/model/communicationdiagram-uml.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.elementtypesconfigurations#_tL86sLazEeSbnofizoRSMQ"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.interactionoverview/model/interactionOverviewDiagram.elementtypesconfigurations#_x8G0YGaNEeSyJIsxLao1Pw"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.sequence/model/sequencediagram-uml.elementtypesconfigurations#_BJMa0PyeEeWbo9Y7g2MLdw"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram.elementtypesconfigurations#_wYwtMMeDEeSwP_9Vn5UnWg"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.stereotype.edition/model/stereotype-edit.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.timing/model/timingdiagram-uml.elementtypesconfigurations#_BJMa0PyeEeWbo9Y7g2MLdw"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/StandardProfile.elementtypesconfigurations#_jfoLkGT_EeSEqNuV3JpFCA"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types.ui/model/uml-advice.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml-activities.elementtypesconfigurations#_rRIxgLOjEeWH6Y3Wi2YKxg"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml-allocations.elementtypesconfigurations#_u9Zn4LOjEeWH6Y3Wi2YKxg"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml-blocks.elementtypesconfigurations#_3i038FYIEeS0WsAAtVmToA"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml-constraints.elementtypesconfigurations#_0h9coLOjEeWH6Y3Wi2YKxg"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml-modelelements.elementtypesconfigurations#_2o9lYLOjEeWH6Y3Wi2YKxg"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml-portsandflows.elementtypesconfigurations#_6wATQLOjEeWH6Y3Wi2YKxg"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml-requirements.elementtypesconfigurations#_LYuC4LOtEeWH6Y3Wi2YKxg"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_649xgFYBEeS0WsAAtVmToA"/>
+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_m2D8IHDuEeWh-MssWmCB_A" name="Block Definition Diagram" icon="platform:/plugin/org.eclipse.papyrus.sysml.diagram.blockdefinition/icons/obj16/Diagram_BlockDefinition.gif" implementationID="BlockDefinition" creationCommandClass="org.eclipse.papyrus.sysml.diagram.blockdefinition.BlockDefinitionDiagramCreateCommand">
+      <concerns href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_HQhf48SYEeaKZJ_pGfaSiA"/>
+      <modelRules xmi:id="_m2D8IXDuEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </modelRules>
+      <modelRules xmi:id="_m2D8InDuEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+        <stereotypes href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks/Block"/>
+      </modelRules>
+      <owningRules xmi:id="_m2D8I3DuEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </owningRules>
+      <owningRules xmi:id="_m2D8JHDuEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+        <stereotypes href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks/Block"/>
+      </owningRules>
+      <childRules xmi:id="_m2D8JXDuEeWh-MssWmCB_A"/>
+    </representationKinds>
+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_M-Q3sHDuEeWh-MssWmCB_A" name="Internal Block Diagram" icon="platform:/plugin/org.eclipse.papyrus.sysml.diagram.internalblock/icons/obj16/Diagram_InternalBlock.gif" implementationID="InternalBlock" creationCommandClass="org.eclipse.papyrus.sysml.diagram.internalblock.InternalBlockDiagramCreateCommand">
+      <concerns href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_HQhf48SYEeaKZJ_pGfaSiA"/>
+      <modelRules xmi:id="_M-Q3sXDuEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+        <stereotypes href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks/Block"/>
+      </modelRules>
+      <owningRules xmi:id="_M-Q3snDuEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+        <stereotypes href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks/Block"/>
+      </owningRules>
+      <owningRules xmi:id="_M-Q3s3DuEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+        <newModelPath xmi:id="_M-Q3tHDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.sysml.Block">
+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+        </newModelPath>
+      </owningRules>
+      <childRules xmi:id="_M-Q3tXDuEeWh-MssWmCB_A"/>
+    </representationKinds>
+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_eHbioHDvEeWh-MssWmCB_A" name="Parametric Diagram" concerns="_yMTQc8SdEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.sysml.diagram.parametric/icons/obj16/Diagram_Parametric.png" implementationID="Parametric" creationCommandClass="org.eclipse.papyrus.sysml.diagram.parametric.ParametricDiagramCreateCommand">
+      <modelRules xmi:id="_eHbioXDvEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </modelRules>
+      <owningRules xmi:id="_eHbionDvEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </owningRules>
+      <childRules xmi:id="_eHbio3DvEeWh-MssWmCB_A"/>
+    </representationKinds>
+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_eHbipHDvEeWh-MssWmCB_A" name="Parametric Diagram" concerns="_yMTQc8SdEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.sysml.diagram.parametric/icons/obj16/Diagram_Parametric.png" implementationID="Parametric" creationCommandClass="org.eclipse.papyrus.sysml.diagram.parametric.ParametricDiagramCreateCommand">
+      <modelRules xmi:id="_eHbipXDvEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+        <stereotypes href="http://www.eclipse.org/papyrus/0.7.0/SysML#//constraints/ConstraintBlock"/>
+      </modelRules>
+      <owningRules xmi:id="_eHbipnDvEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+        <stereotypes href="http://www.eclipse.org/papyrus/0.7.0/SysML#//constraints/ConstraintBlock"/>
+      </owningRules>
+      <owningRules xmi:id="_eHbip3DvEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </owningRules>
+      <childRules xmi:id="_eHbiqHDvEeWh-MssWmCB_A"/>
+      <paletteRules xmi:id="_eHbiqXDvEeWh-MssWmCB_A" permit="false" element="parametric.tool.blockpropertycomposite"/>
+      <paletteRules xmi:id="_eHbiqnDvEeWh-MssWmCB_A" permit="false" element="parametric.tool.reference"/>
+      <paletteRules xmi:id="_eHbiq3DvEeWh-MssWmCB_A" permit="false" element="parametric.tool.value"/>
+      <paletteRules xmi:id="_eHbirHDvEeWh-MssWmCB_A" element=""/>
+    </representationKinds>
+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_eHbirXDvEeWh-MssWmCB_A" name="Parametric Diagram" concerns="_yMTQc8SdEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.sysml.diagram.parametric/icons/obj16/Diagram_Parametric.png" implementationID="Parametric" creationCommandClass="org.eclipse.papyrus.sysml.diagram.parametric.ParametricDiagramCreateCommand">
+      <modelRules xmi:id="_eHbirnDvEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+        <stereotypes href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks/Block"/>
+      </modelRules>
+      <owningRules xmi:id="_eHbir3DvEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </owningRules>
+      <owningRules xmi:id="_eHbisHDvEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+        <stereotypes href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks/Block"/>
+      </owningRules>
+      <childRules xmi:id="_eHbisXDvEeWh-MssWmCB_A"/>
+    </representationKinds>
+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_iBC4gHDvEeWh-MssWmCB_A" name="Requirement Diagram" concerns="_yMTQcsSdEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.sysml.diagram.requirement/icons/obj16/Diagram_Requirement.gif" implementationID="RequirementDiagram" creationCommandClass="org.eclipse.papyrus.sysml.diagram.requirement.RequirementDiagramCreateCommand">
+      <modelRules xmi:id="_iBC4gXDvEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </modelRules>
+      <owningRules xmi:id="_iBC4gnDvEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </owningRules>
+      <childRules xmi:id="_iBC4g3DvEeWh-MssWmCB_A"/>
+    </representationKinds>
+    <representationKinds xsi:type="nattablerepresentation:PapyrusSyncTable" xmi:id="_r5y7wHDuEeWh-MssWmCB_A" name="Allocation Table" icon="platform:/plugin/org.eclipse.papyrus.sysml.nattable.allocation.config/icons/table_SysML_Allocation.png" implementationID="PapyrusSysMLAllocationTable">
+      <concerns href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_HQhf48SYEeaKZJ_pGfaSiA"/>
+      <modelRules xmi:id="_r5y7wXDuEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </modelRules>
+      <owningRules xmi:id="_r5y7wnDuEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </owningRules>
+    </representationKinds>
+    <representationKinds xsi:type="nattablerepresentation:PapyrusSyncTable" xmi:id="_lTE0gHDwEeWh-MssWmCB_A" name="Requirement Table" concerns="_yMTQcsSdEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/icons/table_SysML_Requirement.png" implementationID="PapyrusSysMLRequirementTable">
+      <modelRules xmi:id="_lTE0gXDwEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </modelRules>
+      <modelRules xmi:id="_lTE0gnDwEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+        <stereotypes href="http://www.eclipse.org/papyrus/0.7.0/SysML#//requirements/Requirement"/>
+      </modelRules>
+      <owningRules xmi:id="_lTE0g3DwEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </owningRules>
+    </representationKinds>
+    <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
+    <profiles href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks"/>
+    <profiles href="http://www.eclipse.org/papyrus/0.7.0/SysML#//portandflows"/>
+    <profiles href="http://www.eclipse.org/papyrus/0.7.0/SysML#//constraints"/>
+    <profiles href="http://www.eclipse.org/papyrus/0.7.0/SysML#//requirements"/>
+    <profiles href="http://www.eclipse.org/papyrus/0.7.0/SysML#//allocations"/>
+  </contexts>
+</architecture:ArchitectureDomain>
diff --git a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/plugin.properties b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/plugin.properties
new file mode 100644
index 00000000000..f941ea802d1
--- /dev/null
+++ b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/plugin.properties
@@ -0,0 +1,14 @@
+# Copyright (c) 2017 CEA LIST.
+# 
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#  
+#  Contributors:
+#  Maged Elaasar - Initial API and implementation
+#  
+# 
+
+pluginName = SysML Architecture
+providerName=Eclipse Modeling Project
diff --git a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/plugin.xml b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/plugin.xml
new file mode 100644
index 00000000000..17a04ac7b64
--- /dev/null
+++ b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/plugin.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+
+	<extension
+	      point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">
+		<clientContext
+	         id="org.eclipse.papyrus.sysml.architecture.SysML">
+	      <matcher
+	            class="org.eclipse.papyrus.sysml.architecture.internal.NoContextEnablementMatcher">
+	      </matcher>
+	   	</clientContext>
+		<binding context="org.eclipse.papyrus.sysml.architecture.SysML">
+			<!-- ElementType that deals with View deletion when their related model element is deleted -->
+			<elementType ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
+			<elementType ref="org.eclipse.gmf.runtime.diagram.core.advice.removeBookmarks"/>
+	        <!-- Check for attempts to edit read-only objects that cannot reasonably be made writeable. -->		
+	        <advice ref="org.eclipse.papyrus.infra.emf.readOnlyAdvice" />
+	        <!-- Delete markers attached to objects being deleted. -->
+		</binding>
+	</extension>
+
+	 <extension point="org.eclipse.papyrus.infra.architecture.models">
+	    <model path="model/sysml.architecture"/>
+	 </extension>
+ 
+	<extension
+	      point="org.eclipse.papyrus.infra.gmfdiag.common.diagramReconciler">
+	   <diagramReconciler
+	         diagramType="BlockDefinition"
+	         reconcilerClass="org.eclipse.papyrus.sysml.architecture.migration.SysMLDiagramReconciler_1_3_0"
+	         source="1.2.0"
+	         target="1.3.0">
+	   </diagramReconciler>
+	   <diagramReconciler
+	         diagramType="InternalBlock"
+	         reconcilerClass="org.eclipse.papyrus.sysml.architecture.migration.SysMLDiagramReconciler_1_3_0"
+	         source="1.2.0"
+	         target="1.3.0">
+	   </diagramReconciler>
+	   <diagramReconciler
+	         diagramType="Parametric"
+	         reconcilerClass="org.eclipse.papyrus.sysml.architecture.migration.SysMLDiagramReconciler_1_3_0"
+	         source="1.2.0"
+	         target="1.3.0">
+	   </diagramReconciler>
+	   <diagramReconciler
+	         diagramType="RequirementDiagram"
+	         reconcilerClass="org.eclipse.papyrus.sysml.architecture.migration.SysMLDiagramReconciler_1_3_0"
+	         source="1.2.0"
+	         target="1.3.0">
+	   </diagramReconciler>
+	</extension>
+
+	<extension
+	      point="org.eclipse.papyrus.infra.nattable.common.tableReconciler">
+	   <tableReconciler
+	         reconcilerClass="org.eclipse.papyrus.sysml.architecture.migration.SysMLTableReconciler_1_3_0"
+	         source="1.0.0"
+	         target="1.3.0">
+	   </tableReconciler>
+	</extension>
+
+</plugin>
+
diff --git a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/pom.xml b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/pom.xml
new file mode 100644
index 00000000000..7db5130d6e5
--- /dev/null
+++ b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.sysml-architecture</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.sysml.architecture</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/listener/IPolicyCheckerListener.java b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/src/org/eclipse/papyrus/sysml/architecture/SysMLArchitectureContextIds.java
index 676d0117247..c87a6e77fa8 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/listener/IPolicyCheckerListener.java
+++ b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/src/org/eclipse/papyrus/sysml/architecture/SysMLArchitectureContextIds.java
@@ -1,25 +1,26 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.viewpoints.policy.listener;

-

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-

-/**

- * @since 1.2

- */

-public interface IPolicyCheckerListener {

-

-	void policyCheckerChanged(PolicyChecker policyChecker);

-

-}

+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	 Maged Elaasar - Initial API and Implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.architecture;
+
+/**
+ * The ids of SysML-related architecture contexts
+ * 
+ * @since 1.0
+ */
+public class SysMLArchitectureContextIds {
+
+	/**
+	 * The id of the SysML architecture context
+	 */
+	public static final String SysML = "org.eclipse.papyrus.sysml.architecture.SysML"; //$NON-NLS-1$
+}
diff --git a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/src/org/eclipse/papyrus/sysml/architecture/internal/NoContextEnablementMatcher.java b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/src/org/eclipse/papyrus/sysml/architecture/internal/NoContextEnablementMatcher.java
new file mode 100644
index 00000000000..344e823a3fb
--- /dev/null
+++ b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/src/org/eclipse/papyrus/sysml/architecture/internal/NoContextEnablementMatcher.java
@@ -0,0 +1,29 @@
+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ * 		Maged Elaasar - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.architecture.internal;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
+
+/**
+ * A no context matcher used to register element type bindings in the extension points  
+ */
+public class NoContextEnablementMatcher implements IElementMatcher {
+
+	@Override
+	public boolean matches(EObject eObject) {
+		return false;
+	}
+}
diff --git a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/src/org/eclipse/papyrus/sysml/architecture/migration/SysMLDiagramReconciler_1_3_0.java b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/src/org/eclipse/papyrus/sysml/architecture/migration/SysMLDiagramReconciler_1_3_0.java
new file mode 100644
index 00000000000..468433ca921
--- /dev/null
+++ b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/src/org/eclipse/papyrus/sysml/architecture/migration/SysMLDiagramReconciler_1_3_0.java
@@ -0,0 +1,90 @@
+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	 Maged Elaasar - Initial API and Implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.architecture.migration;
+
+import java.util.Collection;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.infra.core.architecture.RepresentationKind;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureDescriptionLanguage;
+import org.eclipse.papyrus.infra.architecture.ArchitectureDomainManager;
+import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler_1_3_0;
+import org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram;
+import org.eclipse.papyrus.infra.viewpoints.policy.ProfileUtils;
+import org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle;
+import org.eclipse.papyrus.sysml.architecture.SysMLArchitectureContextIds;
+
+/**
+ * SysML Diagram Reconciler from 1.2.0 to 1.3.0 that switches the old PapyrusViewStyle by
+ * the new PapyrusDiagramStyle
+ */
+public class SysMLDiagramReconciler_1_3_0 extends DiagramReconciler_1_3_0 {
+
+	private static final String BLOCK_DEFINITION_DIAGRAM = "BlockDefinition";
+	private static final String INTERNAL_BLOCK_DIAGRAM = "InternalBlock";
+	private static final String PARAMETRIC_DIAGRAM = "Parametric";
+	private static final String REQUIREMENT_DIAGRAM = "RequirementDiagram";
+	
+	/**
+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler_1_3_0#getPapyrusDiagram(org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle)
+	 *
+	 * @param oldStyle
+	 * @return
+	 */
+	@Override
+	protected PapyrusDiagram getDiagramKind(Diagram diagram, PapyrusViewStyle oldStyle) {
+		if (oldStyle != null) {
+			org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram oldDiagramKind =
+				(org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram) oldStyle.getConfiguration();
+			if (oldDiagramKind != null)
+				return getDiagramKind(oldDiagramKind.getName(), diagram);
+		}
+		if (BLOCK_DEFINITION_DIAGRAM.equals(diagram.getType())) {
+			return getDiagramKind("Block Definition Diagram", diagram);
+		} else if (INTERNAL_BLOCK_DIAGRAM.equals(diagram.getType())) {
+			return getDiagramKind("Internal Block Diagram", diagram);
+		} else if (PARAMETRIC_DIAGRAM.equals(diagram.getType())) {
+			return getDiagramKind("Parametric Diagram", diagram);
+		} else if (REQUIREMENT_DIAGRAM.equals(diagram.getType())) {
+			return getDiagramKind("Requirement Diagram", diagram);
+		}
+		return null;
+	}
+
+	/**
+	 * Gets the diagram kind that matches given name and that supports the given diagram
+	 */
+	protected PapyrusDiagram getDiagramKind(String name, Diagram diagram) {
+		ArchitectureDomainManager manager = ArchitectureDomainManager.getInstance();
+		MergedArchitectureDescriptionLanguage context = (MergedArchitectureDescriptionLanguage) manager.getArchitectureContextById(SysMLArchitectureContextIds.SysML);
+		for(RepresentationKind pKind : context.getRepresentationKinds()) {
+			if (pKind.getName().equals(name)) {
+				PapyrusDiagram dKind = (PapyrusDiagram) pKind;
+				if (dKind.getModelRules().get(0).getElement().isInstance(diagram.getElement())) {
+					boolean allStereotypesApplied = true;
+					Collection<EClass> appliedStereotypes = 
+						ProfileUtils.getProfileHelper().getAppliedStereotypes(diagram.getElement());
+					for (EClass stereotype : dKind.getModelRules().get(0).getStereotypes()) {
+						if (!appliedStereotypes.contains(stereotype)) {
+							allStereotypesApplied = false;
+						}
+					}
+					if (allStereotypesApplied)
+						return dKind;
+				}
+			}
+		}
+		return null;
+	}
+}
diff --git a/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/src/org/eclipse/papyrus/sysml/architecture/migration/SysMLTableReconciler_1_3_0.java b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/src/org/eclipse/papyrus/sysml/architecture/migration/SysMLTableReconciler_1_3_0.java
new file mode 100644
index 00000000000..ced51d3eaf8
--- /dev/null
+++ b/plugins/sysml/architecture/org.eclipse.papyrus.sysml.architecture/src/org/eclipse/papyrus/sysml/architecture/migration/SysMLTableReconciler_1_3_0.java
@@ -0,0 +1,113 @@
+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	 Maged Elaasar - Initial API and Implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.architecture.migration;
+
+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.AbstractCommand;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.papyrus.infra.core.architecture.RepresentationKind;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureDescriptionLanguage;
+import org.eclipse.papyrus.infra.nattable.representation.PapyrusSyncTable;
+import org.eclipse.papyrus.infra.architecture.ArchitectureDomainManager;
+import org.eclipse.papyrus.infra.nattable.common.reconciler.TableReconciler;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.sysml.architecture.SysMLArchitectureContextIds;
+
+/**
+ * UML Table Reconciler from 1.0.0 to 1.1.0 that replaces the old prototype value for tables
+ * with ones based on table kinds
+ */
+public class SysMLTableReconciler_1_3_0 extends TableReconciler {
+
+	private static final String ALLOCATION_TABLE = "Allocation Table";
+	private static final String REQUIREMENT_TABLE = "Requirement Table";
+
+	@Override
+	public ICommand getReconcileCommand(Table table) {
+		if (table.getPrototype() instanceof org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView) {
+			org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView oldTableKind =
+				(org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView) table.getPrototype();
+			
+			RepresentationKind newTableKind = null;
+			if (oldTableKind != null) {
+				if (ALLOCATION_TABLE.equals(oldTableKind.getName())) {
+					newTableKind = getSyncTableKind(oldTableKind.getName(), table);
+				} else if (REQUIREMENT_TABLE.equals(oldTableKind.getName())) {
+					newTableKind = getSyncTableKind(oldTableKind.getName(), table);
+				}
+			};
+			
+			if (newTableKind != null)
+				return new ReplaceTablePrototypeCommand(table, newTableKind);
+		}
+		return null;
+	}
+
+	protected PapyrusSyncTable getSyncTableKind(String name, Table table) {
+		ArchitectureDomainManager manager = ArchitectureDomainManager.getInstance();
+		MergedArchitectureDescriptionLanguage context = (MergedArchitectureDescriptionLanguage) manager.getArchitectureContextById(SysMLArchitectureContextIds.SysML);
+		for(RepresentationKind pKind : context.getRepresentationKinds()) {
+			if (pKind.getName().equals(name)) {
+				PapyrusSyncTable tKind = (PapyrusSyncTable) pKind;
+				if (tKind.getModelRules().get(0).getElement().isInstance(table.getContext())) {
+					return tKind;
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * A command to replace the old table prototype with the new representation kinds 
+	 */
+	protected class ReplaceTablePrototypeCommand extends AbstractCommand {
+
+		private Table table;
+		private RepresentationKind newKind;
+
+		public ReplaceTablePrototypeCommand(Table table, RepresentationKind newKind) {
+			super("Replace the papyrus view style from 1.0.0 to 1.1.0");
+			this.table = table;
+			this.newKind = newKind;
+		}
+
+		@Override
+		protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+			table.setPrototype(newKind);
+			return CommandResult.newOKCommandResult();
+		}
+
+		@Override
+		public boolean canUndo() {
+			return false;
+		}
+
+		@Override
+		public boolean canRedo() {
+			return false;
+		}
+
+		@Override
+		protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+			throw new ExecutionException("Should not be called, canRedo false"); //$NON-NLS-1$
+		}
+
+		@Override
+		protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+			throw new ExecutionException("Should not be called, canUndo false"); //$NON-NLS-1$
+		}
+	}
+}
diff --git a/plugins/sysml/architecture/pom.xml b/plugins/sysml/architecture/pom.xml
new file mode 100644
index 00000000000..f7018617303
--- /dev/null
+++ b/plugins/sysml/architecture/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.eclipse.papyrus.sysml-architecture</artifactId>
+	<packaging>pom</packaging>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.sysml</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+    </parent>
+	<name>Papyrus SysML Architecture</name>
+	<description>Papyrus SysML Architecture Contexts.</description>
+
+	<modules>
+		<module>org.eclipse.papyrus.sysml.architecture</module>
+	</modules>
+</project>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/model/BlockDefinitionDiagram.configuration b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/model/BlockDefinitionDiagram.configuration
deleted file mode 100644
index 56d659a55c0..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/model/BlockDefinitionDiagram.configuration
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<configuration:PapyrusConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmi:id="_ko07IErbEeSdQKzSRatBjg">

-  <viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="_xogdoErbEeSdQKzSRatBjg" name="Default Papyrus Viewpoint">

-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_m2D8IHDuEeWh-MssWmCB_A" implementationID="BlockDefinition">

-      <profiles href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks"/>

-      <profiles href="http://www.eclipse.org/papyrus/0.7.0/SysML#//portandflows"/>

-      <modelRules xmi:id="_m2D8IXDuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </modelRules>

-      <modelRules xmi:id="_m2D8InDuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        <stereotypes href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks/Block"/>

-      </modelRules>

-      <owningRules xmi:id="_m2D8I3DuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </owningRules>

-      <owningRules xmi:id="_m2D8JHDuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        <stereotypes href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks/Block"/>

-      </owningRules>

-      <categories href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb49xhEeOqHvRyiN87hA"/>

-      <childRules xmi:id="_m2D8JXDuEeWh-MssWmCB_A"/>

-    </modelKinds>

-  </viewpoints>

-  <defaultStakeholder href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmkdxhEeOqHvRyiN87hA"/>

-  <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>

-</configuration:PapyrusConfiguration>

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.xml
index 5f22318763a..364e655b35f 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.xml
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <plugin>
-   <extension
-         point="org.eclipse.papyrus.infra.viewpoints.policy.custom">
-      <contribution
-            file="model/BlockDefinitionDiagram.configuration"
-            original="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration">
-      </contribution>
-   </extension>
-
 <!-- Diagram declaration -->
 <extension point="org.eclipse.papyrus.infra.ui.papyrusDiagram">
 	<creationCommand
@@ -1321,25 +1313,25 @@
          diagramType="BlockDefinition"
          reconcilerClass="org.eclipse.papyrus.sysml.diagram.blockdefinition.migration.BDDReconciler"
          source="0.9.1"
-         target="1.1.0">
+         target="1.3.0">
    </diagramReconciler>      
    <diagramReconciler
          diagramType="BlockDefinition"
-         reconcilerClass="org.eclipse.papyrus.uml.diagram.clazz.custom.migration.ClassReconciler"
+         reconcilerClass="org.eclipse.papyrus.uml.diagram.clazz.custom.migration.ClassReconciler_1_1_0"
          source="1.0.0" 
-         target="1.1.0">
+         target="1.3.0">
    </diagramReconciler>
    <diagramReconciler
          diagramType="BlockDefinition"
-         reconcilerClass="org.eclipse.papyrus.uml.diagram.clazz.custom.migration.ClassReconcilerForCompartment"
+         reconcilerClass="org.eclipse.papyrus.uml.diagram.clazz.custom.migration.ClassReconcilerForCompartment_1_2_0"
          source="1.1.0"
-         target="1.2.0">
+         target="1.3.0">
    </diagramReconciler>
    <diagramReconciler
          diagramType="BlockDefinition"
          reconcilerClass="org.eclipse.papyrus.uml.diagram.clazz.custom.migration.ClassReconciler_1_2_0"
          source="1.1.0"
-         target="1.2.0">
+         target="1.3.0">
    </diagramReconciler>
 </extension>
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/plugin.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/plugin.xml
index 76b79bf659f..af2a3173ee9 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/plugin.xml
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/plugin.xml
@@ -2,11 +2,6 @@
 <?eclipse version="3.4"?>
 <plugin>
 
-<extension point="org.eclipse.papyrus.infra.ui.papyrusDiagram">
-	<diagramCategory class="org.eclipse.papyrus.sysml.diagram.common.commands.CreateSysMLModelCommand" description="SysML diagrams" icon="icons/category_sysml.gif" id="sysml" label="SysML">
-	</diagramCategory>      
-</extension>
-   
 <extension point="org.eclipse.core.expressions.propertyTesters">
 	<propertyTester class="org.eclipse.papyrus.sysml.diagram.common.utils.SysMLSelectionTester" id="org.eclipse.papyrus.SysMLSelectionTester" namespace="org.eclipse.papyrus.SysMLSelectionTester" properties="isSysMLModel, isSysMLRequirementsModel, isSysMLBlocksModel" type="org.eclipse.jface.viewers.ISelection">
 	</propertyTester>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/ConstraintLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/ConstraintLabelParser.java
index 1dbfdd09dd4..72ad2e82762 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/ConstraintLabelParser.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/ConstraintLabelParser.java
@@ -27,12 +27,14 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
 import org.eclipse.papyrus.infra.core.resource.ModelSet;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.internationalization.common.utils.InternationalizationPreferencesUtils;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
 import org.eclipse.papyrus.uml.diagram.common.Activator;
@@ -172,7 +174,8 @@ public class ConstraintLabelParser extends NamedElementLabelParser {
 
 		try {
 			if (updateRequest != null) {
-				command = ElementEditServiceUtils.getEditServiceProvider().getEditService(constraint).getEditCommand(updateRequest);
+				IClientContext context = TypeContext.getContext(constraint);
+				command = ElementEditServiceUtils.getEditServiceProvider(context).getEditService(constraint).getEditCommand(updateRequest);
 			}
 
 		} catch (ServiceException e) {
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/NamedElementLabelParser.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/NamedElementLabelParser.java
index dd5db038963..da7801a0797 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/NamedElementLabelParser.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/parser/NamedElementLabelParser.java
@@ -28,6 +28,7 @@ import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;
 import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
 import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
@@ -36,6 +37,7 @@ import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.gmfdiag.common.helper.MaskLabelHelper;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
 import org.eclipse.papyrus.infra.internationalization.common.utils.InternationalizationPreferencesUtils;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
 import org.eclipse.papyrus.uml.diagram.common.Activator;
@@ -91,7 +93,8 @@ public class NamedElementLabelParser implements IMaskManagedSemanticParser {
 				final ModelSet modelSet = (ModelSet)objectToEdit.eResource().getResourceSet();
 				command = new EMFtoGMFCommandWrapper(UMLLabelInternationalization.getInstance().getSetLabelCommand(modelSet.getTransactionalEditingDomain(), (NamedElement)objectToEdit, newString, null));
 			}else{
-				command = ElementEditServiceUtils.getEditServiceProvider().getEditService(objectToEdit).getEditCommand(new SetRequest(objectToEdit, UMLPackage.eINSTANCE.getNamedElement_Name(), newString));
+				IClientContext context = TypeContext.getContext(objectToEdit);
+				command = ElementEditServiceUtils.getEditServiceProvider(context).getEditService(objectToEdit).getEditCommand(new SetRequest(objectToEdit, UMLPackage.eINSTANCE.getNamedElement_Name(), newString));
 			}
 		} catch (ServiceException e) {
 			Activator.log.error(e);
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/commands/CreateSysMLModelCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/commands/CreateSysMLModelCommand.java
index c82b1e12599..600ca083aad 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/commands/CreateSysMLModelCommand.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/commands/CreateSysMLModelCommand.java
@@ -27,8 +27,6 @@ import org.eclipse.uml2.uml.UMLFactory;
  */
 public class CreateSysMLModelCommand extends ModelCreationCommandBase {
 
-	public static final String COMMAND_ID = "sysml";
-
 	/**
 	 * @see org.eclipse.papyrus.infra.core.extension.commands.ModelCreationCommandBase#createRootElement()
 	 *
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/model/InternalBlockDiagram.configuration b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/model/InternalBlockDiagram.configuration
deleted file mode 100644
index d35228924b1..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/model/InternalBlockDiagram.configuration
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<configuration:PapyrusConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmi:id="_ko07IErbEeSdQKzSRatBjg">

-  <viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="_xogdoErbEeSdQKzSRatBjg" name="Default Papyrus Viewpoint">

-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_M-Q3sHDuEeWh-MssWmCB_A" implementationID="InternalBlock">

-      <profiles href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks"/>

-      <modelRules xmi:id="_M-Q3sXDuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        <stereotypes href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks/Block"/>

-      </modelRules>

-      <owningRules xmi:id="_M-Q3snDuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        <stereotypes href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks/Block"/>

-      </owningRules>

-      <owningRules xmi:id="_M-Q3s3DuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-        <newModelPath xmi:id="_M-Q3tHDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.sysml.Block">

-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>

-        </newModelPath>

-      </owningRules>

-      <categories href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb49xhEeOqHvRyiN87hA"/>

-      <childRules xmi:id="_M-Q3tXDuEeWh-MssWmCB_A"/>

-    </modelKinds>

-  </viewpoints>

-  <defaultStakeholder href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmkdxhEeOqHvRyiN87hA"/>

-  <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>

-</configuration:PapyrusConfiguration>

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.xml
index e4a8051a692..025d0da3831 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.xml
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <plugin>
-   <extension
-         point="org.eclipse.papyrus.infra.viewpoints.policy.custom">
-      <contribution
-            file="model/InternalBlockDiagram.configuration"
-            original="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration">
-      </contribution>
-   </extension>
-   
 <!-- Diagram declaration -->
 <extension point="org.eclipse.papyrus.infra.ui.papyrusDiagram">
 	<creationCommand creationCommandClass="org.eclipse.papyrus.sysml.diagram.internalblock.InternalBlockDiagramCreateCommand" creationCondition="org.eclipse.papyrus.sysml.diagram.internalblock.InternalBlockDiagramCondition" icon="icons/obj16/Diagram_InternalBlock.gif" id="org.eclipse.papyrus.sysml.diagram.internalblock.CreateCommand" language="sysml" label="Internal Block Diagram"></creationCommand>
@@ -532,25 +524,25 @@
          diagramType="InternalBlock"
          reconcilerClass="org.eclipse.papyrus.sysml.diagram.internalblock.migration.InternalBlockDiagramReconcilerUndefinedTo100"
          source="undefined"
-         target="1.1.0">
+         target="1.3.0">
    </diagramReconciler>
    <diagramReconciler
          diagramType="InternalBlock"
-         reconcilerClass="org.eclipse.papyrus.uml.diagram.composite.custom.migration.CompositeReconciler"
-         source="undefined"
-         target="1.1.0">
+         reconcilerClass="org.eclipse.papyrus.uml.diagram.composite.custom.migration.CompositeReconciler_1_1_0"
+         source="1.0.0"
+         target="1.3.0">
    </diagramReconciler>
    <diagramReconciler
          diagramType="InternalBlock"
-         reconcilerClass="org.eclipse.papyrus.uml.diagram.composite.custom.migration.CompositeReconcilerForCompartment"
-         source="undefined"
-         target="1.2.0">
+         reconcilerClass="org.eclipse.papyrus.uml.diagram.composite.custom.migration.CompositeReconcilerForCompartment_1_2_0"
+         source="1.1.0"
+         target="1.3.0">
    </diagramReconciler>
    <diagramReconciler
          diagramType="InternalBlock"
          reconcilerClass="org.eclipse.papyrus.uml.diagram.composite.custom.migration.CompositeReconciler_1_2_0"
-         source="undefined"
-         target="1.2.0">
+         source="1.1.0"
+         target="1.3.0">
    </diagramReconciler>
 </extension>
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramCreateCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramCreateCommand.java
index 33ce95b56a7..356666f5dd9 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramCreateCommand.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramCreateCommand.java
@@ -23,7 +23,7 @@ import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.infra.gmfdiag.common.AbstractPapyrusGmfCreateDiagramCommandHandler;
-import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramPrototype;
 import org.eclipse.papyrus.sysml.blocks.Block;
 import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
 import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;
@@ -68,7 +68,7 @@ public class InternalBlockDiagramCreateCommand extends AbstractPapyrusGmfCreateD
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected Diagram doCreateDiagram(Resource diagramResource, EObject owner, EObject element, ViewPrototype prototype, String name) {
+	protected Diagram doCreateDiagram(Resource diagramResource, EObject owner, EObject element, DiagramPrototype prototype, String name) {
 		// Start of user code Custom diagram creation
 		Diagram diagram = null;
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/TypeDropHelper.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/TypeDropHelper.java
index efd2200eafd..9bdbb15a493 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/TypeDropHelper.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/TypeDropHelper.java
@@ -1,302 +1,314 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2015 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *		Christian W. Damus - bug 470296

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.diagram.internalblock.utils;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.CompoundCommand;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.common.core.command.IdentityCommand;

-import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;

-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.ViewDescriptorUtil;

-import org.eclipse.papyrus.infra.services.edit.commands.ConfigureFeatureCommandFactory;

-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.helper.ElementHelper;

-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;

-import org.eclipse.uml2.uml.Association;

-import org.eclipse.uml2.uml.DataType;

-import org.eclipse.uml2.uml.Signal;

-import org.eclipse.uml2.uml.Type;

-import org.eclipse.uml2.uml.TypedElement;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * This class provides convenience methods to create Type specific drop action (Set new Type, Port creation, ...).

- */

-public class TypeDropHelper extends ElementHelper {

-

-	public TypeDropHelper(TransactionalEditingDomain editDomain) {

-		this.editDomain = editDomain;

-	}

-

-	public Command getDropAsTypedElementType(DropObjectsRequest request, GraphicalEditPart host) {

-		CompoundCommand cc = new CompoundCommand("Set a new Type");

-		ICommand setCommand = null;

-

-		// The dropped object must be a Type and the target a TypedElement

-		Type newType = (request.getObjects().get(0) instanceof Type) ? (Type) request.getObjects().get(0) : null;

-		TypedElement typedElementDropTarget = (getHostEObject(host) instanceof TypedElement) ? (TypedElement) getHostEObject(host) : null;

-

-		if ((newType == null) || (typedElementDropTarget == null)) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		if (newType == typedElementDropTarget.getType()) {

-			setCommand = IdentityCommand.INSTANCE;

-		}

-

-		// Prepare a command to set the new type

-		SetRequest req = new SetRequest(typedElementDropTarget, UMLPackage.eINSTANCE.getTypedElement_Type(), newType);

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(UMLElementTypes.TYPED_ELEMENT);

-		if (provider != null) {

-			setCommand = provider.getEditCommand(req);

-		}

-

-		cc.add(new ICommandProxy(setCommand));

-

-		return cc;

-	}

-

-	public Command getDropAsTypedPort(DropObjectsRequest request, GraphicalEditPart host) {

-		CompoundCommand cc = new CompoundCommand("Create a new Port");

-

-		Object droppedEObject = request.getObjects().get(0);

-		if (!isValidPortType(droppedEObject)) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		// Prepare a command for the FlowPort creation and the drop in diagram

-

-		// 1. Prepare creation command

-		ICommand createElementCommand = null;

-		CreateElementRequest createElementRequest = new CreateElementRequest(getEditingDomain(), getHostEObject(host), UMLElementTypes.PORT);

-		createElementRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), request.getObjects().get(0)));

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(getHostEObject(host));

-		if (provider != null) {

-			createElementCommand = provider.getEditCommand(createElementRequest);

-		}

-		IAdaptable createElementRequestAdapter = new CreateElementRequestAdapter(createElementRequest);

-

-		// 2. Prepare the drop command

-		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, /* explicit semantic hint is mandatory */null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());

-		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);

-		createViewRequest.setLocation(request.getLocation().getCopy());

-		Command viewCreateCommand = host.getCommand(createViewRequest);

-

-		// 3. Create the compound command

-		cc.add(new ICommandProxy(createElementCommand));

-		cc.add(viewCreateCommand);

-

-		return cc;

-	}

-

-	public Command getDropAsTypedPortOnPart(DropObjectsRequest request, GraphicalEditPart host) {

-		CompoundCommand cc = new CompoundCommand("Create a new Port");

-

-		Object droppedEObject = request.getObjects().get(0);

-		if (!isValidPortType(droppedEObject)) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		// Verify target nature

-		EObject target = getHostEObject(host);

-		if ((!(target instanceof TypedElement)) || (((TypedElement) target).getType() == null)) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		// The target type has to be a Block (will hold the created Port)

-		Type targetType = ((TypedElement) target).getType();

-		if (!((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(targetType)) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		// Prepare a command for the FlowPort creation and the drop in diagram

-

-		// 1. Prepare creation command

-		ICommand createElementCommand = null;

-		CreateElementRequest createElementRequest = new CreateElementRequest(getEditingDomain(), targetType, UMLElementTypes.PORT);

-		createElementRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), request.getObjects().get(0)));

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(targetType);

-		if (provider != null) {

-			createElementCommand = provider.getEditCommand(createElementRequest);

-		}

-		IAdaptable createElementRequestAdapter = new CreateElementRequestAdapter(createElementRequest);

-

-		// 2. Prepare the drop command

-		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, /* explicit semantic hint is mandatory */null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());

-		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);

-		createViewRequest.setLocation(request.getLocation().getCopy());

-		Command viewCreateCommand = host.getCommand(createViewRequest);

-

-		// 3. Create the compound command

-		cc.add(new ICommandProxy(createElementCommand));

-		cc.add(viewCreateCommand);

-

-		return cc;

-	}

-

-	public Command getDropAsTypedFlowPort(DropObjectsRequest request, GraphicalEditPart host, IElementType elementType) {

-		CompoundCommand cc = new CompoundCommand("Create a new FlowPort (" + elementType.getDisplayName() + ")");

-

-		Object droppedEObject = request.getObjects().get(0);

-		if (!isValidFlowPortType(droppedEObject, elementType)) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		// Prepare a command for the FlowPort creation and the drop in diagram

-

-		// 1. Prepare creation command

-		ICommand createElementCommand = null;

-		CreateElementRequest createElementRequest = new CreateElementRequest(getEditingDomain(), getHostEObject(host), elementType);

-		createElementRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), request.getObjects().get(0)));

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(getHostEObject(host));

-		if (provider != null) {

-			createElementCommand = provider.getEditCommand(createElementRequest);

-		}

-		IAdaptable createElementRequestAdapter = new CreateElementRequestAdapter(createElementRequest);

-

-		// 2. Prepare the drop command

-		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, /* explicit semantic hint is mandatory */null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());

-		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);

-		createViewRequest.setLocation(request.getLocation().getCopy());

-		Command viewCreateCommand = host.getCommand(createViewRequest);

-

-		// 3. Create the compound command

-		cc.add(new ICommandProxy(createElementCommand));

-		cc.add(viewCreateCommand);

-

-		return cc;

-	}

-

-	public Command getDropAsTypedFlowPortOnPart(DropObjectsRequest request, GraphicalEditPart host, IElementType elementType) {

-		CompoundCommand cc = new CompoundCommand("Create a new FlowPort (" + elementType.getDisplayName() + ")");

-

-		Object droppedEObject = request.getObjects().get(0);

-		if (!isValidFlowPortType(droppedEObject, elementType)) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		// Verify target nature

-		EObject target = getHostEObject(host);

-		if ((!(target instanceof TypedElement)) || (((TypedElement) target).getType() == null)) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		// The target type has to be a Block (will hold the created Port)

-		Type targetType = ((TypedElement) target).getType();

-		if (!((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(targetType)) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		// Prepare a command for the FlowPort creation and the drop in diagram

-

-		// 1. Prepare creation command

-		ICommand createElementCommand = null;

-		CreateElementRequest createElementRequest = new CreateElementRequest(getEditingDomain(), targetType, elementType);

-		createElementRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), request.getObjects().get(0)));

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(targetType);

-		if (provider != null) {

-			createElementCommand = provider.getEditCommand(createElementRequest);

-		}

-		IAdaptable createElementRequestAdapter = new CreateElementRequestAdapter(createElementRequest);

-

-		// 2. Prepare the drop command

-		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, /* explicit semantic hint is mandatory */null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());

-		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);

-		createViewRequest.setLocation(request.getLocation().getCopy());

-		Command viewCreateCommand = host.getCommand(createViewRequest);

-

-		// 3. Create the compound command

-		cc.add(new ICommandProxy(createElementCommand));

-		cc.add(viewCreateCommand);

-

-		return cc;

-	}

-

-	private boolean isValidFlowPortType(Object object, IElementType elementType) {

-		boolean isValid = false;

-

-		if ((object != null) && (object instanceof Type)) {

-			Type type = (Type) object;

-

-			// Test valid type

-			if (type instanceof DataType) {

-				isValid = true;

-			}

-

-			if (type instanceof Signal) {

-				isValid = true;

-			}

-

-			if (((ISpecializationType) SysMLElementTypes.FLOW_SPECIFICATION).getMatcher().matches(type)) {

-				// Non-atomic flow port, the direction is meaningless in this case

-				if (elementType == SysMLElementTypes.FLOW_PORT) {

-					isValid = true;

-				}

-			}

-

-			if (((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(type)) {

-				isValid = true;

-			}

-

-			if (((ISpecializationType) SysMLElementTypes.VALUE_TYPE).getMatcher().matches(type)) {

-				isValid = true;

-			}

-

-		}

-

-		return isValid;

-	}

-

-	private boolean isValidPortType(Object object) {

-		boolean isValid = false;

-

-		// Bug 470296: Associations are not useful types for ports or any kind of property. Note that this

-		// deliberately excludes association-classes, also, because their primary semantics is that of an association

-		if ((object != null) && (object instanceof Type) && !(object instanceof Association)) {

-			isValid = true;

-		}

-

-		return isValid;

-	}

-

-	/**

-	 * return the host Edit Part's semantic element, if the semantic element

-	 * is <code>null</code> or unresolvable it will return <code>null</code>

-	 *

-	 * @return EObject

-	 */

-	protected EObject getHostEObject(GraphicalEditPart host) {

-		return ViewUtil.resolveSemanticElement((View) host.getModel());

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *		Christian W. Damus - bug 470296
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.diagram.internalblock.utils;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.CompoundCommand;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.common.core.command.IdentityCommand;
+import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
+import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.ViewDescriptorUtil;
+import org.eclipse.papyrus.infra.services.edit.commands.ConfigureFeatureCommandFactory;
+import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.sysml.diagram.internalblock.Activator;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.common.helper.ElementHelper;
+import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
+import org.eclipse.uml2.uml.Association;
+import org.eclipse.uml2.uml.DataType;
+import org.eclipse.uml2.uml.Signal;
+import org.eclipse.uml2.uml.Type;
+import org.eclipse.uml2.uml.TypedElement;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * This class provides convenience methods to create Type specific drop action (Set new Type, Port creation, ...).
+ */
+public class TypeDropHelper extends ElementHelper {
+
+	public TypeDropHelper(TransactionalEditingDomain editDomain) {
+		this.editDomain = editDomain;
+	}
+
+	public Command getDropAsTypedElementType(DropObjectsRequest request, GraphicalEditPart host) {
+		CompoundCommand cc = new CompoundCommand("Set a new Type");
+		ICommand setCommand = null;
+
+		// The dropped object must be a Type and the target a TypedElement
+		Type newType = (request.getObjects().get(0) instanceof Type) ? (Type) request.getObjects().get(0) : null;
+		TypedElement typedElementDropTarget = (getHostEObject(host) instanceof TypedElement) ? (TypedElement) getHostEObject(host) : null;
+
+		if ((newType == null) || (typedElementDropTarget == null)) {
+			return UnexecutableCommand.INSTANCE;
+		}
+
+		IClientContext context;
+		try {
+			context = TypeContext.getContext(typedElementDropTarget);
+		} catch (ServiceException e) {
+			Activator.log.error(e);
+			return UnexecutableCommand.INSTANCE;
+		}
+
+		if (newType == typedElementDropTarget.getType()) {
+			setCommand = IdentityCommand.INSTANCE;
+		}
+
+		// Prepare a command to set the new type
+		SetRequest req = new SetRequest(typedElementDropTarget, UMLPackage.eINSTANCE.getTypedElement_Type(), newType);
+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(UMLElementTypes.TYPED_ELEMENT, context);
+		if (provider != null) {
+			setCommand = provider.getEditCommand(req);
+		}
+
+		cc.add(new ICommandProxy(setCommand));
+
+		return cc;
+	}
+
+	public Command getDropAsTypedPort(DropObjectsRequest request, GraphicalEditPart host) {
+		CompoundCommand cc = new CompoundCommand("Create a new Port");
+
+		Object droppedEObject = request.getObjects().get(0);
+		if (!isValidPortType(droppedEObject)) {
+			return UnexecutableCommand.INSTANCE;
+		}
+
+		// Prepare a command for the FlowPort creation and the drop in diagram
+
+		// 1. Prepare creation command
+		ICommand createElementCommand = null;
+		CreateElementRequest createElementRequest = new CreateElementRequest(getEditingDomain(), getHostEObject(host), UMLElementTypes.PORT);
+		createElementRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), request.getObjects().get(0)));
+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(getHostEObject(host));
+		if (provider != null) {
+			createElementCommand = provider.getEditCommand(createElementRequest);
+		}
+		IAdaptable createElementRequestAdapter = new CreateElementRequestAdapter(createElementRequest);
+
+		// 2. Prepare the drop command
+		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, /* explicit semantic hint is mandatory */null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());
+		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);
+		createViewRequest.setLocation(request.getLocation().getCopy());
+		Command viewCreateCommand = host.getCommand(createViewRequest);
+
+		// 3. Create the compound command
+		cc.add(new ICommandProxy(createElementCommand));
+		cc.add(viewCreateCommand);
+
+		return cc;
+	}
+
+	public Command getDropAsTypedPortOnPart(DropObjectsRequest request, GraphicalEditPart host) {
+		CompoundCommand cc = new CompoundCommand("Create a new Port");
+
+		Object droppedEObject = request.getObjects().get(0);
+		if (!isValidPortType(droppedEObject)) {
+			return UnexecutableCommand.INSTANCE;
+		}
+
+		// Verify target nature
+		EObject target = getHostEObject(host);
+		if ((!(target instanceof TypedElement)) || (((TypedElement) target).getType() == null)) {
+			return UnexecutableCommand.INSTANCE;
+		}
+
+		// The target type has to be a Block (will hold the created Port)
+		Type targetType = ((TypedElement) target).getType();
+		if (!((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(targetType)) {
+			return UnexecutableCommand.INSTANCE;
+		}
+
+		// Prepare a command for the FlowPort creation and the drop in diagram
+
+		// 1. Prepare creation command
+		ICommand createElementCommand = null;
+		CreateElementRequest createElementRequest = new CreateElementRequest(getEditingDomain(), targetType, UMLElementTypes.PORT);
+		createElementRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), request.getObjects().get(0)));
+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(targetType);
+		if (provider != null) {
+			createElementCommand = provider.getEditCommand(createElementRequest);
+		}
+		IAdaptable createElementRequestAdapter = new CreateElementRequestAdapter(createElementRequest);
+
+		// 2. Prepare the drop command
+		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, /* explicit semantic hint is mandatory */null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());
+		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);
+		createViewRequest.setLocation(request.getLocation().getCopy());
+		Command viewCreateCommand = host.getCommand(createViewRequest);
+
+		// 3. Create the compound command
+		cc.add(new ICommandProxy(createElementCommand));
+		cc.add(viewCreateCommand);
+
+		return cc;
+	}
+
+	public Command getDropAsTypedFlowPort(DropObjectsRequest request, GraphicalEditPart host, IElementType elementType) {
+		CompoundCommand cc = new CompoundCommand("Create a new FlowPort (" + elementType.getDisplayName() + ")");
+
+		Object droppedEObject = request.getObjects().get(0);
+		if (!isValidFlowPortType(droppedEObject, elementType)) {
+			return UnexecutableCommand.INSTANCE;
+		}
+
+		// Prepare a command for the FlowPort creation and the drop in diagram
+
+		// 1. Prepare creation command
+		ICommand createElementCommand = null;
+		CreateElementRequest createElementRequest = new CreateElementRequest(getEditingDomain(), getHostEObject(host), elementType);
+		createElementRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), request.getObjects().get(0)));
+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(getHostEObject(host));
+		if (provider != null) {
+			createElementCommand = provider.getEditCommand(createElementRequest);
+		}
+		IAdaptable createElementRequestAdapter = new CreateElementRequestAdapter(createElementRequest);
+
+		// 2. Prepare the drop command
+		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, /* explicit semantic hint is mandatory */null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());
+		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);
+		createViewRequest.setLocation(request.getLocation().getCopy());
+		Command viewCreateCommand = host.getCommand(createViewRequest);
+
+		// 3. Create the compound command
+		cc.add(new ICommandProxy(createElementCommand));
+		cc.add(viewCreateCommand);
+
+		return cc;
+	}
+
+	public Command getDropAsTypedFlowPortOnPart(DropObjectsRequest request, GraphicalEditPart host, IElementType elementType) {
+		CompoundCommand cc = new CompoundCommand("Create a new FlowPort (" + elementType.getDisplayName() + ")");
+
+		Object droppedEObject = request.getObjects().get(0);
+		if (!isValidFlowPortType(droppedEObject, elementType)) {
+			return UnexecutableCommand.INSTANCE;
+		}
+
+		// Verify target nature
+		EObject target = getHostEObject(host);
+		if ((!(target instanceof TypedElement)) || (((TypedElement) target).getType() == null)) {
+			return UnexecutableCommand.INSTANCE;
+		}
+
+		// The target type has to be a Block (will hold the created Port)
+		Type targetType = ((TypedElement) target).getType();
+		if (!((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(targetType)) {
+			return UnexecutableCommand.INSTANCE;
+		}
+
+		// Prepare a command for the FlowPort creation and the drop in diagram
+
+		// 1. Prepare creation command
+		ICommand createElementCommand = null;
+		CreateElementRequest createElementRequest = new CreateElementRequest(getEditingDomain(), targetType, elementType);
+		createElementRequest.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), request.getObjects().get(0)));
+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(targetType);
+		if (provider != null) {
+			createElementCommand = provider.getEditCommand(createElementRequest);
+		}
+		IAdaptable createElementRequestAdapter = new CreateElementRequestAdapter(createElementRequest);
+
+		// 2. Prepare the drop command
+		ViewDescriptor descriptor = new ViewDescriptor(createElementRequestAdapter, Node.class, /* explicit semantic hint is mandatory */null, ViewDescriptorUtil.PERSISTED, host.getDiagramPreferencesHint());
+		CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);
+		createViewRequest.setLocation(request.getLocation().getCopy());
+		Command viewCreateCommand = host.getCommand(createViewRequest);
+
+		// 3. Create the compound command
+		cc.add(new ICommandProxy(createElementCommand));
+		cc.add(viewCreateCommand);
+
+		return cc;
+	}
+
+	private boolean isValidFlowPortType(Object object, IElementType elementType) {
+		boolean isValid = false;
+
+		if ((object != null) && (object instanceof Type)) {
+			Type type = (Type) object;
+
+			// Test valid type
+			if (type instanceof DataType) {
+				isValid = true;
+			}
+
+			if (type instanceof Signal) {
+				isValid = true;
+			}
+
+			if (((ISpecializationType) SysMLElementTypes.FLOW_SPECIFICATION).getMatcher().matches(type)) {
+				// Non-atomic flow port, the direction is meaningless in this case
+				if (elementType == SysMLElementTypes.FLOW_PORT) {
+					isValid = true;
+				}
+			}
+
+			if (((ISpecializationType) SysMLElementTypes.BLOCK).getMatcher().matches(type)) {
+				isValid = true;
+			}
+
+			if (((ISpecializationType) SysMLElementTypes.VALUE_TYPE).getMatcher().matches(type)) {
+				isValid = true;
+			}
+
+		}
+
+		return isValid;
+	}
+
+	private boolean isValidPortType(Object object) {
+		boolean isValid = false;
+
+		// Bug 470296: Associations are not useful types for ports or any kind of property. Note that this
+		// deliberately excludes association-classes, also, because their primary semantics is that of an association
+		if ((object != null) && (object instanceof Type) && !(object instanceof Association)) {
+			isValid = true;
+		}
+
+		return isValid;
+	}
+
+	/**
+	 * return the host Edit Part's semantic element, if the semantic element
+	 * is <code>null</code> or unresolvable it will return <code>null</code>
+	 *
+	 * @return EObject
+	 */
+	protected EObject getHostEObject(GraphicalEditPart host) {
+		return ViewUtil.resolveSemanticElement((View) host.getModel());
+	}
+}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/model/ParametricDiagram.configuration b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/model/ParametricDiagram.configuration
deleted file mode 100644
index 6dead345c47..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/model/ParametricDiagram.configuration
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<configuration:PapyrusConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmi:id="_ko07IErbEeSdQKzSRatBjg">

-  <viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="_xogdoErbEeSdQKzSRatBjg" name="Default Papyrus Viewpoint">

-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_eHbioHDvEeWh-MssWmCB_A" implementationID="Parametric">

-      <profiles href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks"/>

-      <profiles href="http://www.eclipse.org/papyrus/0.7.0/SysML#//portandflows"/>

-      <modelRules xmi:id="_eHbioXDvEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </modelRules>

-      <owningRules xmi:id="_eHbionDvEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </owningRules>

-      <categories href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb49xhEeOqHvRyiN87hA"/>

-      <childRules xmi:id="_eHbio3DvEeWh-MssWmCB_A"/>

-    </modelKinds>

-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_eHbipHDvEeWh-MssWmCB_A" implementationID="Parametric">

-      <profiles href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks"/>

-      <profiles href="http://www.eclipse.org/papyrus/0.7.0/SysML#//portandflows"/>

-      <profiles href="http://www.eclipse.org/papyrus/0.7.0/SysML#//constraints"/>

-      <modelRules xmi:id="_eHbipXDvEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        <stereotypes href="http://www.eclipse.org/papyrus/0.7.0/SysML#//constraints/ConstraintBlock"/>

-      </modelRules>

-      <owningRules xmi:id="_eHbipnDvEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        <stereotypes href="http://www.eclipse.org/papyrus/0.7.0/SysML#//constraints/ConstraintBlock"/>

-      </owningRules>

-      <owningRules xmi:id="_eHbip3DvEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </owningRules>

-      <categories href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb49xhEeOqHvRyiN87hA"/>

-      <childRules xmi:id="_eHbiqHDvEeWh-MssWmCB_A"/>

-      <paletteRules xmi:id="_eHbiqXDvEeWh-MssWmCB_A" permit="false" element="parametric.tool.blockpropertycomposite"/>

-      <paletteRules xmi:id="_eHbiqnDvEeWh-MssWmCB_A" permit="false" element="parametric.tool.reference"/>

-      <paletteRules xmi:id="_eHbiq3DvEeWh-MssWmCB_A" permit="false" element="parametric.tool.value"/>

-      <paletteRules xmi:id="_eHbirHDvEeWh-MssWmCB_A" element=""/>

-    </modelKinds>

-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_eHbirXDvEeWh-MssWmCB_A" implementationID="Parametric">

-      <profiles href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks"/>

-      <profiles href="http://www.eclipse.org/papyrus/0.7.0/SysML#//portandflows"/>

-      <modelRules xmi:id="_eHbirnDvEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        <stereotypes href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks/Block"/>

-      </modelRules>

-      <owningRules xmi:id="_eHbir3DvEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </owningRules>

-      <owningRules xmi:id="_eHbisHDvEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        <stereotypes href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks/Block"/>

-      </owningRules>

-      <categories href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb49xhEeOqHvRyiN87hA"/>

-      <childRules xmi:id="_eHbisXDvEeWh-MssWmCB_A"/>

-    </modelKinds>

-  </viewpoints>

-  <defaultStakeholder href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmkdxhEeOqHvRyiN87hA"/>

-  <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>

-</configuration:PapyrusConfiguration>

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/plugin.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/plugin.xml
index d0239d5c67b..60063823af8 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/plugin.xml
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/plugin.xml
@@ -2,14 +2,6 @@
 <?eclipse version="3.4"?>
 <plugin>
 
-   <extension
-         point="org.eclipse.papyrus.infra.viewpoints.policy.custom">
-      <contribution
-            file="model/ParametricDiagram.configuration"
-            original="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration">
-      </contribution>
-   </extension>
-
 <extension point="org.eclipse.ui.contexts" id="ui-context">
   <?gmfgen generated="true"?>
   <context
@@ -690,27 +682,27 @@
       point="org.eclipse.papyrus.infra.gmfdiag.common.diagramReconciler">
    <diagramReconciler
          diagramType="Parametric"
-         reconcilerClass="org.eclipse.papyrus.uml.diagram.composite.custom.migration.CompositeReconciler"
-         source="undefined"
-         target="1.1.0">
+         reconcilerClass="org.eclipse.papyrus.uml.diagram.composite.custom.migration.CompositeReconciler_1_1_0"
+         source="1.0.0"
+         target="1.3.0">
    </diagramReconciler>
    <diagramReconciler
          diagramType="Parametric"
-         reconcilerClass="org.eclipse.papyrus.uml.diagram.composite.custom.migration.CompositeReconcilerForCompartment"
-         source="undefined"
-         target="1.2.0">
+         reconcilerClass="org.eclipse.papyrus.uml.diagram.composite.custom.migration.CompositeReconcilerForCompartment_1_2_0"
+         source="1.1.0"
+         target="1.3.0">
    </diagramReconciler>
    <diagramReconciler
          diagramType="Parametric"
-         reconcilerClass="org.eclipse.papyrus.sysml.diagram.parametric.migration.ParametricReconciler_1_2_0"
-         source="undefined"
-         target="1.1.0">
+         reconcilerClass="org.eclipse.papyrus.uml.diagram.composite.custom.migration.CompositeReconciler_1_2_0"
+         source="1.1.0"
+         target="1.3.0">
    </diagramReconciler>
    <diagramReconciler
          diagramType="Parametric"
-         reconcilerClass="org.eclipse.papyrus.uml.diagram.composite.custom.migration.CompositeReconciler_1_2_0"
-         source="undefined"
-         target="1.2.0">
+         reconcilerClass="org.eclipse.papyrus.sysml.diagram.parametric.migration.ParametricReconciler_1_2_0"
+         source="1.1.0"
+         target="1.3.0">
    </diagramReconciler>
 </extension>
 </plugin>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/ParametricDiagramCreateCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/ParametricDiagramCreateCommand.java
index d8589ac48a7..2c1a0445a80 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/ParametricDiagramCreateCommand.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/ParametricDiagramCreateCommand.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
+ *		R�gis CHEVREL: chevrel.regis <at> gmail.com
  *		CEA LIST - Initial API and implementation
  *		Laurent Wouters (CEA LIST) laurent.wouters@cea.fr - Viewpoints application
  *
@@ -29,10 +29,10 @@ import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.infra.gmfdiag.common.AbstractPapyrusGmfCreateDiagramCommandHandler;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramPrototype;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
 import org.eclipse.papyrus.infra.services.edit.utils.GMFCommandUtils;
-import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
 import org.eclipse.papyrus.sysml.blocks.Block;
 import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
 import org.eclipse.papyrus.sysml.diagram.parametric.provider.ElementTypes;
@@ -78,7 +78,7 @@ public class ParametricDiagramCreateCommand extends AbstractPapyrusGmfCreateDiag
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected Diagram doCreateDiagram(Resource diagramResource, EObject owner, EObject element, ViewPrototype prototype, String name) {
+	protected Diagram doCreateDiagram(Resource diagramResource, EObject owner, EObject element, DiagramPrototype prototype, String name) {
 		// Start of user code Custom diagram creation
 		Diagram diagram = null;
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/model/Requirement.configuration b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/model/Requirement.configuration
deleted file mode 100644
index bfde51d51c5..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/model/Requirement.configuration
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<configuration:PapyrusConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmi:id="_ko07IErbEeSdQKzSRatBjg">

-  <viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="_xogdoErbEeSdQKzSRatBjg" name="Default Papyrus Viewpoint">

-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_iBC4gHDvEeWh-MssWmCB_A" implementationID="RequirementDiagram">

-      <profiles href="http://www.eclipse.org/papyrus/0.7.0/SysML#//requirements"/>

-      <modelRules xmi:id="_iBC4gXDvEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </modelRules>

-      <owningRules xmi:id="_iBC4gnDvEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </owningRules>

-      <categories href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb49xhEeOqHvRyiN87hA"/>

-      <childRules xmi:id="_iBC4g3DvEeWh-MssWmCB_A"/>

-    </modelKinds>

-  </viewpoints>

-  <defaultStakeholder href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmkdxhEeOqHvRyiN87hA"/>

-  <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>

-</configuration:PapyrusConfiguration>

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.xml
index 46e7572ae39..4b720d17968 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.xml
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.xml
@@ -2,15 +2,6 @@
 <?eclipse version="3.4"?>
 <plugin>
 
-   <extension
-         point="org.eclipse.papyrus.infra.viewpoints.policy.custom">
-      <contribution
-            file="model/Requirement.configuration"
-            original="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration">
-      </contribution>
-   </extension>
-
-
 <!-- Diagram declaration -->
 <extension point="org.eclipse.papyrus.infra.ui.papyrusDiagram">
 	<creationCommand
@@ -850,21 +841,21 @@
       point="org.eclipse.papyrus.infra.gmfdiag.common.diagramReconciler">
    <diagramReconciler
          diagramType="RequirementDiagram"
-         reconcilerClass="org.eclipse.papyrus.uml.diagram.clazz.custom.migration.ClassReconciler"
+         reconcilerClass="org.eclipse.papyrus.uml.diagram.clazz.custom.migration.ClassReconciler_1_1_0"
          source="1.0.0"
-         target="1.1.0">
+         target="1.3.0">
    </diagramReconciler>
    <diagramReconciler
          diagramType="RequirementDiagram"
-         reconcilerClass="org.eclipse.papyrus.uml.diagram.clazz.custom.migration.ClassReconcilerForCompartment"
+         reconcilerClass="org.eclipse.papyrus.uml.diagram.clazz.custom.migration.ClassReconcilerForCompartment_1_2_0"
          source="1.1.0"
-         target="1.2.0">
+         target="1.3.0">
    </diagramReconciler>
    <diagramReconciler
          diagramType="RequirementDiagram"
          reconcilerClass="org.eclipse.papyrus.uml.diagram.clazz.custom.migration.ClassReconciler_1_2_0"
          source="1.1.0"
-         target="1.2.0">
+         target="1.3.0">
    </diagramReconciler>
 </extension>
 <!-- // End of user code 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/META-INF/MANIFEST.MF
index a103708efeb..2a0618ddfd8 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/META-INF/MANIFEST.MF
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/META-INF/MANIFEST.MF
@@ -1,7 +1,8 @@
 Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.sysml.diagram.ui
 Require-Bundle: org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
- org.eclipse.papyrus.sysml.diagram.common;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.papyrus.sysml.diagram.common;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.sysml.architecture;bundle-version="[1.0.0,2.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 2.0.0.qualifier
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/src/org/eclipse/papyrus/sysml/diagram/ui/NewSysMLModelWizard.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/src/org/eclipse/papyrus/sysml/diagram/ui/NewSysMLModelWizard.java
index a8236d027bc..396da4b0e54 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/src/org/eclipse/papyrus/sysml/diagram/ui/NewSysMLModelWizard.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/src/org/eclipse/papyrus/sysml/diagram/ui/NewSysMLModelWizard.java
@@ -1,80 +1,80 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tatiana Fesenko (CEA LIST) - Initial API and implementation

- *  Christian W. Damus (CEA) - Support creating models in repositories (CDO)

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.diagram.ui;

-

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.sysml.diagram.common.commands.CreateSysMLModelCommand;

-import org.eclipse.papyrus.uml.diagram.wizards.wizards.CreateModelWizard;

-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramCategoryPage;

-import org.eclipse.ui.IWorkbench;

-

-

-/**

- * The Class NewSysMLModelWizard.

- */

-public class NewSysMLModelWizard extends CreateModelWizard {

-

-	/**

-	 * Instantiates a new new sys ml model wizard.

-	 */

-	public NewSysMLModelWizard() {

-		super();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void init(IWorkbench workbench, IStructuredSelection selection) {

-		super.init(workbench, selection);

-		setWindowTitle("New SysML Model");

-	}

-

-	@Override

-	public String getModelKindName() {

-		return "Papyrus SysML";

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected String[] getDiagramCategoryIds() {
-		return new String[]{ CreateSysMLModelCommand.COMMAND_ID };
-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected SelectDiagramCategoryPage createSelectDiagramCategoryPage() {

-		// here SysML is the only available category

-		return null;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected void saveDiagramCategorySettings() {

-		// here SysML is the only available category

-	}

-

-	@Override

-	public boolean isPapyrusRootWizard() {

-		return false;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tatiana Fesenko (CEA LIST) - Initial API and implementation
+ *  Christian W. Damus (CEA) - Support creating models in repositories (CDO)
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.diagram.ui;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.sysml.architecture.SysMLArchitectureContextIds;
+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectArchitectureContextPage;
+import org.eclipse.papyrus.uml.diagram.wizards.wizards.CreateModelWizard;
+import org.eclipse.ui.IWorkbench;
+
+
+/**
+ * The Class NewSysMLModelWizard.
+ */
+public class NewSysMLModelWizard extends CreateModelWizard {
+
+	/**
+	 * Instantiates a new new sys ml model wizard.
+	 */
+	public NewSysMLModelWizard() {
+		super();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		super.init(workbench, selection);
+		setWindowTitle("New SysML Model");
+	}
+
+	@Override
+	public String getModelKindName() {
+		return "Papyrus SysML";
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected String[] getSelectedContexts() {
+		return new String[] { SysMLArchitectureContextIds.SysML };
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected SelectArchitectureContextPage createSelectArchitectureContextPage() {
+		// here SysML is the only available category
+		return null;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void saveDiagramCategorySettings() {
+		// here SysML is the only available category
+	}
+
+	@Override
+	public boolean isPapyrusRootWizard() {
+		return false;
+	}
+
+}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/src/org/eclipse/papyrus/sysml/diagram/ui/NewSysMLProjectWizard.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/src/org/eclipse/papyrus/sysml/diagram/ui/NewSysMLProjectWizard.java
index 532563db33b..1d868b8406f 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/src/org/eclipse/papyrus/sysml/diagram/ui/NewSysMLProjectWizard.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/src/org/eclipse/papyrus/sysml/diagram/ui/NewSysMLProjectWizard.java
@@ -1,80 +1,80 @@
-/*****************************************************************************

- * 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:

- *  Tatiana Fesenko (CEA LIST) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.diagram.ui;

-

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.sysml.diagram.common.commands.CreateSysMLModelCommand;

-import org.eclipse.papyrus.uml.diagram.wizards.wizards.NewPapyrusProjectWizard;

-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramCategoryPage;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;

-

-

-/**

- * The Class NewSysMLProjectWizard.

- */

-public class NewSysMLProjectWizard extends NewPapyrusProjectWizard {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void init(IWorkbench workbench, IStructuredSelection selection) {

-		super.init(workbench, selection);

-		setWindowTitle("New SysML Project");

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected WizardNewProjectCreationPage createNewProjectCreationPage() {

-		WizardNewProjectCreationPage newProjectPage = super.createNewProjectCreationPage();

-		newProjectPage.setTitle("Papyrus SysML Project");

-		newProjectPage.setDescription("Create a New Papyrus SysML Project");

-		return newProjectPage;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected SelectDiagramCategoryPage createSelectDiagramCategoryPage() {

-		// here SysML is the only available category

-		return null;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected void saveDiagramCategorySettings() {

-		// do nothing

-		// here SysML is the only available category

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected String[] getDiagramCategoryIds() {
-		return new String[]{ CreateSysMLModelCommand.COMMAND_ID };

-	}

-

-	@Override

-	public boolean isPapyrusRootWizard() {

+/*****************************************************************************
+ * 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:
+ *  Tatiana Fesenko (CEA LIST) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.diagram.ui;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.sysml.architecture.SysMLArchitectureContextIds;
+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectArchitectureContextPage;
+import org.eclipse.papyrus.uml.diagram.wizards.wizards.NewPapyrusProjectWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
+
+
+/**
+ * The Class NewSysMLProjectWizard.
+ */
+public class NewSysMLProjectWizard extends NewPapyrusProjectWizard {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		super.init(workbench, selection);
+		setWindowTitle("New SysML Project");
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected WizardNewProjectCreationPage createNewProjectCreationPage() {
+		WizardNewProjectCreationPage newProjectPage = super.createNewProjectCreationPage();
+		newProjectPage.setTitle("Papyrus SysML Project");
+		newProjectPage.setDescription("Create a New Papyrus SysML Project");
+		return newProjectPage;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected SelectArchitectureContextPage createSelectArchitectureContextPage() {
+		// here SysML is the only available category
+		return null;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void saveDiagramCategorySettings() {
+		// do nothing
+		// here SysML is the only available category
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected String[] getSelectedContexts() {
+		return new String[] { SysMLArchitectureContextIds.SysML };
+	}
+
+	@Override
+	public boolean isPapyrusRootWizard() {
 		return false;
-	}

-

-}

+	}
+
+}
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/plugin.xml b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/plugin.xml
index 906d9e09a0e..5c1e1a8350d 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/plugin.xml
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/plugin.xml
@@ -2,14 +2,6 @@
 <?eclipse version="3.4"?>
 <plugin>
    <extension
-         point="org.eclipse.papyrus.infra.viewpoints.policy.custom">
-      <contribution
-            file="resources/allocationTable.configuration"
-            original="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration">
-      </contribution>
-   </extension>
-
-   <extension
          point="org.eclipse.papyrus.infra.nattable.tester">
       <tester
             class="org.eclipse.papyrus.sysml.nattable.allocation.config.tester.TableAllocationCreationTester"
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/resources/allocationTable.configuration b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/resources/allocationTable.configuration
deleted file mode 100644
index e59208f77e7..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/resources/allocationTable.configuration
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<configuration:PapyrusConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmi:id="_ko07IErbEeSdQKzSRatBjg">

-  <viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="_xogdoErbEeSdQKzSRatBjg" name="Default Papyrus Viewpoint">

-    <modelKinds xsi:type="configuration:PapyrusSyncTable" xmi:id="_r5y7wHDuEeWh-MssWmCB_A" name="Allocation Table" icon="platform:/plugin/org.eclipse.papyrus.sysml.nattable.allocation.config/icons/table_SysML_Allocation.png" implementationID="PapyrusSysMLAllocationTable">

-      <profiles href="http://www.eclipse.org/papyrus/0.7.0/SysML#//allocations"/>

-      <modelRules xmi:id="_r5y7wXDuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </modelRules>

-      <owningRules xmi:id="_r5y7wnDuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </owningRules>

-      <categories href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb49xhEeOqHvRyiN87hA"/>

-    </modelKinds>

-  </viewpoints>

-  <defaultStakeholder href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmkdxhEeOqHvRyiN87hA"/>

-  <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>

-</configuration:PapyrusConfiguration>

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirementTable.configuration b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirementTable.configuration
deleted file mode 100644
index 80453be9a38..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirementTable.configuration
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<configuration:PapyrusConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmi:id="_ko07IErbEeSdQKzSRatBjg">

-  <viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="_xogdoErbEeSdQKzSRatBjg" name="Default Papyrus Viewpoint">

-    <modelKinds xsi:type="configuration:PapyrusSyncTable" xmi:id="_lTE0gHDwEeWh-MssWmCB_A" name="Requirement Table" icon="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/icons/table_SysML_Requirement.png" implementationID="PapyrusSysMLRequirementTable">

-      <profiles href="http://www.eclipse.org/papyrus/0.7.0/SysML#//requirements"/>

-      <modelRules xmi:id="_lTE0gXDwEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </modelRules>

-      <modelRules xmi:id="_lTE0gnDwEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        <stereotypes href="http://www.eclipse.org/papyrus/0.7.0/SysML#//requirements/Requirement"/>

-      </modelRules>

-      <owningRules xmi:id="_lTE0g3DwEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </owningRules>

-      <categories href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb49xhEeOqHvRyiN87hA"/>

-    </modelKinds>

-  </viewpoints>

-  <defaultStakeholder href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmkdxhEeOqHvRyiN87hA"/>

-  <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>

-</configuration:PapyrusConfiguration>

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/plugin.xml b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/plugin.xml
index 92859289664..da01c0a1d25 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/plugin.xml
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/plugin.xml
@@ -2,13 +2,6 @@
 <?eclipse version="3.4"?>
 <plugin>
    <extension
-         point="org.eclipse.papyrus.infra.viewpoints.policy.custom">
-      <contribution
-            file="configs/requirementTable.configuration"
-            original="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration">
-      </contribution>
-   </extension>
-   <extension
          point="org.eclipse.papyrus.infra.nattable.configuration">
       <configuration
             file="configs/requirement.nattableconfiguration"
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 13dde203aca..6bc12593e69 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/plugin.xml
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/plugin.xml
@@ -368,61 +368,5 @@
 
 		</image>
 </extension>
-<extension
-      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
-   <elementTypeSet
-         clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
-         path="model/sysml-activities.elementtypesconfigurations">
-   </elementTypeSet>
-</extension>
-<extension
-      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
-   <elementTypeSet
-         clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
-         path="model/sysml-allocations.elementtypesconfigurations">
-   </elementTypeSet>
-</extension>
-<extension
-      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
-   <elementTypeSet
-         clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
-         path="model/sysml-blocks.elementtypesconfigurations">
-   </elementTypeSet>
-</extension>
-<extension
-      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
-   <elementTypeSet
-         clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
-         path="model/sysml-constraints.elementtypesconfigurations">
-   </elementTypeSet>
-</extension>
-<extension
-      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
-   <elementTypeSet
-         clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
-         path="model/sysml-modelelements.elementtypesconfigurations">
-   </elementTypeSet>
-</extension>
-<extension
-      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
-   <elementTypeSet
-         clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
-         path="model/sysml-portsandflows.elementtypesconfigurations">
-   </elementTypeSet>
-</extension>
-<extension
-      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
-   <elementTypeSet
-         clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
-         path="model/sysml-requirements.elementtypesconfigurations">
-   </elementTypeSet>
-</extension>
-<extension
-      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
-   <elementTypeSet
-         clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
-         path="model/sysml.elementtypesconfigurations">
-   </elementTypeSet>
-</extension>
 </plugin>
 
diff --git a/plugins/sysml/pom.xml b/plugins/sysml/pom.xml
index ce7f8931f8a..f851e26a27f 100644
--- a/plugins/sysml/pom.xml
+++ b/plugins/sysml/pom.xml
@@ -14,6 +14,7 @@
 	<description>Top container of the Papyrus SysML 1.1 modeler</description>
 
 	<modules>
+		<module>architecture</module>
 		<module>diagram</module>
 		<module>modelexplorer</module>
 		<module>nattable</module>
diff --git a/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/.classpath b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/.classpath
new file mode 100644
index 00000000000..eca7bdba8f0
--- /dev/null
+++ b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/.classpath
@@ -0,0 +1,7 @@
+<?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/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/.project b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/.project
new file mode 100644
index 00000000000..4d88371ed29
--- /dev/null
+++ b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.architecture</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/uml/architecture/org.eclipse.papyrus.uml.architecture/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..0c68a61dca8
--- /dev/null
+++ b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/META-INF/MANIFEST.MF b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..12c4de3c043
--- /dev/null
+++ b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/META-INF/MANIFEST.MF
@@ -0,0 +1,37 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.uml.architecture;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.nattable.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.nattable;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.nattable.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.nattable.views.config;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.services.controlmode;bundle-version="[1.5.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.types.rulebased;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.activity;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.communication;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.component;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.deployment;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.interactionoverview;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.profile;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.sequence;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.statemachine;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.diagram.timing;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.usecase;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.nattable.generic.config;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.service.types.ui;bundle-version="[2.0.0,3.0.0)"
+Export-Package: org.eclipse.papyrus.uml.architecture
+Bundle-Vendor: %providerName
diff --git a/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/about.html b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/about.html
new file mode 100644
index 00000000000..bbf2bd6aac7
--- /dev/null
+++ b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/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>January 30, 2017</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/uml/architecture/org.eclipse.papyrus.uml.architecture/build.properties b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/build.properties
new file mode 100644
index 00000000000..0dc34f7833b
--- /dev/null
+++ b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/build.properties
@@ -0,0 +1,6 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               plugin.properties
diff --git a/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/icons/profile.gif b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/icons/profile.gif
new file mode 100644
index 00000000000..deadaaa3634
--- /dev/null
+++ b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/icons/profile.gif
diff --git a/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/icons/uml.gif b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/icons/uml.gif
new file mode 100644
index 00000000000..0626e1f8fa4
--- /dev/null
+++ b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/icons/uml.gif
diff --git a/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/model/uml.architecture b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/model/uml.architecture
new file mode 100644
index 00000000000..37fe77aebb1
--- /dev/null
+++ b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/model/uml.architecture
@@ -0,0 +1,429 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<architecture:ArchitectureDomain xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:gmfdiagrepresentation="http://www.eclipse.org/papyrus/infra/gmfdiag/representation" xmlns:nattablerepresentation="http://www.eclipse.org/papyrus/infra/nattable/representation" xmi:id="_HQhf4MSYEeaKZJ_pGfaSiA" name="Software Engineering" desciption="The domain of developing software systems">
+  <stakeholders xmi:id="_HQhf4cSYEeaKZJ_pGfaSiA" name="Software Engineer" desciption="An engineer interested in software development" concerns="_HQhf4sSYEeaKZJ_pGfaSiA _HQhf48SYEeaKZJ_pGfaSiA _HQhf5MSYEeaKZJ_pGfaSiA"/>
+  <stakeholders xmi:id="_IigrMMSjEeaCPPhpB0_9OQ" name="Domain Architect" concerns="_NxfRgMSjEeaCPPhpB0_9OQ"/>
+  <concerns xmi:id="_NxfRgMSjEeaCPPhpB0_9OQ" name="Profiles" desciption="The concern of defining the domain profiles"/>
+  <concerns xmi:id="_HQhf4sSYEeaKZJ_pGfaSiA" name="Use Cases" desciption="The concern of defining the system's use cases"/>
+  <concerns xmi:id="_HQhf48SYEeaKZJ_pGfaSiA" name="Structure" desciption="The concern of developing the system's structure"/>
+  <concerns xmi:id="_HQhf5MSYEeaKZJ_pGfaSiA" name="Behavior" desciption="The concern of developing the system's behavior"/>
+  <contexts xsi:type="architecture:ArchitectureDescriptionLanguage" xmi:id="_HQhf5cSYEeaKZJ_pGfaSiA" name="UML" desciption="The Unified Modeling Language" id="org.eclipse.papyrus.infra.services.edit.TypeContext" icon="platform:/plugin/org.eclipse.papyrus.uml.architecture/icons/uml.gif" creationCommandClass="org.eclipse.papyrus.uml.diagram.common.commands.CreateUMLModelCommand">
+    <viewpoints xmi:id="_HQhf5sSYEeaKZJ_pGfaSiA" name="Software Analysis" desciption="A viewpoint allowing software analysis with UML" representationKinds="_yeY0sHDvEeWh-MssWmCB_A _zzf4gHDtEeWh-MssWmCB_A _zzf4cXDtEeWh-MssWmCB_A _Uz8agHDuEeWh-MssWmCB_A _WC1q0P4UEeSRsNBVzfUrzA _wXztQHDwEeWh-MssWmCB_A _P3J1cEr7EeSVGbM3cmVSqQ _P3J1cEr7EeSVGbM3cmVSqQ _P3J1cEr7EeRVGbM3cmVSqQ" id="org.eclipse.papyrus.uml.analysis"/>
+    <viewpoints xmi:id="_OOrIUMSZEeaKZJ_pGfaSiA" name="Software Design" desciption="A viewpoint allowing software design with UML" representationKinds="_UzcgsHDtEeWh-MssWmCB_A _zzf4gHDtEeWh-MssWmCB_A _jRtroHDuEeWh-MssWmCB_A _fa4kAHDuEeWh-MssWmCB_A _fa4kBHDuEeWh-MssWmCB_A _bKiwMHDuEeWh-MssWmCB_A _bKiwNHDuEeWh-MssWmCB_A _ARGokHDuEeWh-MssWmCB_A _zzf4YHDtEeWh-MssWmCB_A _FuMjYHDuEeWh-MssWmCB_A _zzf4cXDtEeWh-MssWmCB_A _TR15IHDvEeWh-MssWmCB_A _PwD0cHDvEeWh-MssWmCB_A _LzyMIHDvEeWh-MssWmCB_A _P3J1cEr7EeSVGbM3cmVSqQ _Uz8agHDuEeWh-MssWmCB_A _P3J1cEr7EeRVGbM3cmVSqQ _wXztQHDwEeWh-MssWmCB_A _WC1q0P4UEeSRsNBVzfUrzA _P3J1cEr7EeSVGbM3cmVSqQ _P3J1cEr7EeSVGbM3cmVSqQ" id="org.eclipse.papyrus.uml.design"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.emf/model/infra-emf.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.common/model/notation.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.common/model/gmfdiag-common.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontents.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontext.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.nattable.common/model/nattable-common.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.services.controlmode/model/controlmode.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.services.edit/model/marker.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.types.rulebased/model/rulebased.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.elementtypesconfigurations#_x8G0YGaNEeSyJIsxLao1Pw"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.communication/model/communicationdiagram-uml.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.elementtypesconfigurations#_tL86sLazEeSbnofizoRSMQ"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.interactionoverview/model/interactionOverviewDiagram.elementtypesconfigurations#_x8G0YGaNEeSyJIsxLao1Pw"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.sequence/model/sequencediagram-uml.elementtypesconfigurations#_BJMa0PyeEeWbo9Y7g2MLdw"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram.elementtypesconfigurations#_wYwtMMeDEeSwP_9Vn5UnWg"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.stereotype.edition/model/stereotype-edit.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.timing/model/timingdiagram-uml.elementtypesconfigurations#_BJMa0PyeEeWbo9Y7g2MLdw"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/StandardProfile.elementtypesconfigurations#_jfoLkGT_EeSEqNuV3JpFCA"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types.ui/model/uml-advice.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_UzcgsHDtEeWh-MssWmCB_A" name="Activity Diagram" concerns="_HQhf5MSYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.activity/icons/obj16/Diagram_Activity.gif" implementationID="PapyrusUMLActivityDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.activity.CreateActivityDiagramCommand">
+      <modelRules xmi:id="_UzcgsXDtEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity"/>
+      </modelRules>
+      <owningRules xmi:id="_UzcgsnDtEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity"/>
+      </owningRules>
+      <owningRules xmi:id="_Uzcgs3DtEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
+        <newModelPath xmi:id="_UzcgtHDtEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Activity">
+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
+        </newModelPath>
+      </owningRules>
+      <owningRules xmi:id="_UzcgtXDtEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
+        <newModelPath xmi:id="_UzcgtnDtEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Activity">
+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
+        </newModelPath>
+      </owningRules>
+      <owningRules xmi:id="_Uzcgt3DtEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+        <newModelPath xmi:id="_UzcguHDtEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Activity">
+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+        </newModelPath>
+      </owningRules>
+      <childRules xmi:id="_UzcguXDtEeWh-MssWmCB_A"/>
+    </representationKinds>
+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_zzf4gHDtEeWh-MssWmCB_A" name="Class Diagram" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/icons/obj16/Diagram_Class.gif" implementationID="PapyrusUMLClassDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand">
+      <modelRules xmi:id="_zzf4gXDtEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </modelRules>
+      <owningRules xmi:id="_zzf4gnDtEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </owningRules>
+      <childRules xmi:id="_zzf4g3DtEeWh-MssWmCB_A"/>
+    </representationKinds>
+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_zzf4YHDtEeWh-MssWmCB_A" name="Inner Class Diagram" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/icons/obj16/Diagram_Class.gif" implementationID="PapyrusUMLClassDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand">
+      <modelRules xmi:id="_zzf4YXDtEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+      </modelRules>
+      <owningRules xmi:id="_zzf4YnDtEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+      </owningRules>
+      <owningRules xmi:id="_zzf4Y3DtEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </owningRules>
+      <childRules xmi:id="_zzf4ZHDtEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
+        <origin href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+        <insertionPath xmi:id="_zzf4ZXDtEeWh-MssWmCB_A">
+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+        </insertionPath>
+      </childRules>
+      <childRules xmi:id="_zzf4ZnDtEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Comment"/>
+        <origin href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+        <insertionPath xmi:id="_zzf4Z3DtEeWh-MssWmCB_A">
+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedComment"/>
+        </insertionPath>
+      </childRules>
+      <paletteRules xmi:id="_zzf4aHDtEeWh-MssWmCB_A" element="clazz.tool.class"/>
+      <paletteRules xmi:id="_zzf4aXDtEeWh-MssWmCB_A" element="clazz.tool.comment"/>
+      <paletteRules xmi:id="_zzf4anDtEeWh-MssWmCB_A" element="clazz.tool.interface"/>
+      <paletteRules xmi:id="_zzf4a3DtEeWh-MssWmCB_A" element="clazz.tool.abstraction"/>
+      <paletteRules xmi:id="_zzf4bHDtEeWh-MssWmCB_A" element="clazz.tool.association"/>
+      <paletteRules xmi:id="_zzf4bXDtEeWh-MssWmCB_A" element="clazz.tool.generalization"/>
+      <paletteRules xmi:id="_zzf4bnDtEeWh-MssWmCB_A" element="clazz.tool.generalizationset"/>
+      <paletteRules xmi:id="_zzf4b3DtEeWh-MssWmCB_A" permit="false" element="clazz.tool.*"/>
+      <paletteRules xmi:id="_zzf4cHDtEeWh-MssWmCB_A" element=""/>
+    </representationKinds>
+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_zzf4cXDtEeWh-MssWmCB_A" name="Package Diagram" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/icons/Diagram_Package.gif" implementationID="PapyrusUMLClassDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand">
+      <modelRules xmi:id="_zzf4cnDtEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </modelRules>
+      <owningRules xmi:id="_zzf4c3DtEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </owningRules>
+      <childRules xmi:id="_zzf4dHDtEeWh-MssWmCB_A"/>
+      <paletteRules xmi:id="_zzf4dXDtEeWh-MssWmCB_A" element="clazz.tool.comment"/>
+      <paletteRules xmi:id="_zzf4dnDtEeWh-MssWmCB_A" element="clazz.tool.constraint"/>
+      <paletteRules xmi:id="_zzf4d3DtEeWh-MssWmCB_A" element="clazz.tool.model"/>
+      <paletteRules xmi:id="_zzf4eHDtEeWh-MssWmCB_A" element="clazz.tool.package"/>
+      <paletteRules xmi:id="_zzf4eXDtEeWh-MssWmCB_A" element="clazz.tool.abstraction"/>
+      <paletteRules xmi:id="_zzf4enDtEeWh-MssWmCB_A" element="clazz.tool.dependency"/>
+      <paletteRules xmi:id="_zzf4e3DtEeWh-MssWmCB_A" element="clazz.tool.packageimport"/>
+      <paletteRules xmi:id="_zzf4fHDtEeWh-MssWmCB_A" element="clazz.tool.link"/>
+      <paletteRules xmi:id="_zzf4fXDtEeWh-MssWmCB_A" element="clazz.tool.containmentlink"/>
+      <paletteRules xmi:id="_zzf4fnDtEeWh-MssWmCB_A" permit="false" element="clazz.tool.*"/>
+      <paletteRules xmi:id="_zzf4f3DtEeWh-MssWmCB_A" element=""/>
+    </representationKinds>
+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_jRtroHDuEeWh-MssWmCB_A" name="Communication Diagram" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.communication/icons/obj16/Diagram_Communication.gif" implementationID="PapyrusUMLCommunicationDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.communication.CreateCommunicationDiagramCommand">
+      <modelRules xmi:id="_jRtroXDuEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Interaction"/>
+      </modelRules>
+      <owningRules xmi:id="_jRtronDuEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Interaction"/>
+      </owningRules>
+      <owningRules xmi:id="_jRtro3DuEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
+        <newModelPath xmi:id="_jRtrpHDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">
+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
+        </newModelPath>
+      </owningRules>
+      <owningRules xmi:id="_jRtrpXDuEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
+        <newModelPath xmi:id="_jRtrpnDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">
+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
+        </newModelPath>
+      </owningRules>
+      <owningRules xmi:id="_jRtrp3DuEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+        <newModelPath xmi:id="_jRtrqHDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">
+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+        </newModelPath>
+      </owningRules>
+      <childRules xmi:id="_jRtrqXDuEeWh-MssWmCB_A"/>
+    </representationKinds>
+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_fa4kAHDuEeWh-MssWmCB_A" name="Component Diagram" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.component/icons/obj16/ComponentDiagram.gif" implementationID="PapyrusUMLComponentDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand">
+      <modelRules xmi:id="_fa4kAXDuEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </modelRules>
+      <owningRules xmi:id="_fa4kAnDuEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </owningRules>
+      <childRules xmi:id="_fa4kA3DuEeWh-MssWmCB_A"/>
+    </representationKinds>
+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_fa4kBHDuEeWh-MssWmCB_A" name="Component Diagram" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.component/icons/obj16/ComponentDiagram.gif" implementationID="PapyrusUMLComponentDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand">
+      <modelRules xmi:id="_fa4kBXDuEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>
+      </modelRules>
+      <owningRules xmi:id="_fa4kBnDuEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>
+      </owningRules>
+      <owningRules xmi:id="_fa4kB3DuEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </owningRules>
+      <childRules xmi:id="_fa4kCHDuEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
+        <origin href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>
+        <insertionPath xmi:id="_fa4kCXDuEeWh-MssWmCB_A">
+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+        </insertionPath>
+      </childRules>
+      <childRules xmi:id="_fa4kCnDuEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Comment"/>
+        <origin href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>
+        <insertionPath xmi:id="_fa4kC3DuEeWh-MssWmCB_A">
+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedComment"/>
+        </insertionPath>
+      </childRules>
+      <childRules xmi:id="_fa4kDHDuEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Constraint"/>
+        <origin href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>
+        <insertionPath xmi:id="_fa4kDXDuEeWh-MssWmCB_A">
+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedRule"/>
+        </insertionPath>
+      </childRules>
+      <childRules xmi:id="_fa4kDnDuEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>
+        <origin href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>
+        <insertionPath xmi:id="_fa4kD3DuEeWh-MssWmCB_A">
+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//EncapsulatedClassifier/ownedPort"/>
+        </insertionPath>
+      </childRules>
+      <paletteRules xmi:id="_fa4kEHDuEeWh-MssWmCB_A" permit="false" element="component.tool.model"/>
+      <paletteRules xmi:id="_fa4kEXDuEeWh-MssWmCB_A" permit="false" element="component.tool.package"/>
+    </representationKinds>
+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_bKiwMHDuEeWh-MssWmCB_A" name="Composite Structure Diagram" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.composite/icons/obj16/Diagram_CompositeStructure.gif" implementationID="CompositeStructure" creationCommandClass="org.eclipse.papyrus.uml.diagram.composite.CreateCompositeDiagramCommand">
+      <modelRules xmi:id="_bKiwMXDuEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </modelRules>
+      <owningRules xmi:id="_bKiwMnDuEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </owningRules>
+      <childRules xmi:id="_bKiwM3DuEeWh-MssWmCB_A"/>
+    </representationKinds>
+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_bKiwNHDuEeWh-MssWmCB_A" name="Composite Structure Diagram" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.composite/icons/obj16/Diagram_CompositeStructure.gif" implementationID="CompositeStructure" creationCommandClass="org.eclipse.papyrus.uml.diagram.composite.CreateCompositeDiagramCommand">
+      <modelRules xmi:id="_bKiwNXDuEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier"/>
+      </modelRules>
+      <owningRules xmi:id="_bKiwNnDuEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier"/>
+      </owningRules>
+      <owningRules xmi:id="_bKiwN3DuEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </owningRules>
+      <childRules xmi:id="_bKiwOHDuEeWh-MssWmCB_A"/>
+    </representationKinds>
+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_ARGokHDuEeWh-MssWmCB_A" name="Deployment Diagram" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.deployment/icons/obj16/DeploymentDiagram.gif" implementationID="PapyrusUMLDeploymentDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.deployment.CreateDeploymentDiagramCommand">
+      <modelRules xmi:id="_ARGokXDuEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </modelRules>
+      <owningRules xmi:id="_ARGoknDuEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </owningRules>
+      <childRules xmi:id="_ARGok3DuEeWh-MssWmCB_A"/>
+    </representationKinds>
+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_FuMjYHDuEeWh-MssWmCB_A" name="Interaction Overview Diagram" concerns="_HQhf5MSYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.interactionoverview/icons/obj16/interactionOverviewDiagram.gif" implementationID="PapyrusUMLInteractionOverviewDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.interactionoverview.InteractionOverviewDiagramCreateCommand">
+      <modelRules xmi:id="_FuMjYXDuEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity"/>
+      </modelRules>
+      <owningRules xmi:id="_FuMjYnDuEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity"/>
+      </owningRules>
+      <owningRules xmi:id="_FuMjY3DuEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
+        <newModelPath xmi:id="_FuMjZHDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Activity">
+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
+        </newModelPath>
+      </owningRules>
+      <owningRules xmi:id="_FuMjZXDuEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
+        <newModelPath xmi:id="_FuMjZnDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Activity">
+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
+        </newModelPath>
+      </owningRules>
+      <owningRules xmi:id="_FuMjZ3DuEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+        <newModelPath xmi:id="_FuMjaHDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Activity">
+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+        </newModelPath>
+      </owningRules>
+      <childRules xmi:id="_FuMjaXDuEeWh-MssWmCB_A"/>
+    </representationKinds>
+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_UekVgHDwEeWh-MssWmCB_A" name="Profile Diagram" concerns="_NxfRgMSjEeaCPPhpB0_9OQ" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.profile/icons/obj16/Diagram_Profile.gif" implementationID="PapyrusUMLProfileDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.profile.CreateProfileDiagramCommand">
+      <modelRules xmi:id="_UekVgXDwEeWh-MssWmCB_A">
+        <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_UekVgnDwEeWh-MssWmCB_A" name="IsContainedByProfile">
+          <constraintType href="platform:/plugin/org.eclipse.papyrus.infra.constraints/Model/ConstraintEnvironment.xmi#//@constraintTypes.4"/>
+          <properties xsi:type="constraints:ValueProperty" xmi:id="_UekVg3DwEeWh-MssWmCB_A" name="className" value="org.eclipse.papyrus.infra.viewpoints.policy.query.IsContainedByProfileQuery"/>
+        </constraints>
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </modelRules>
+      <owningRules xmi:id="_UekVhHDwEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </owningRules>
+      <owningRules xmi:id="_UekVhXDwEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Profile"/>
+      </owningRules>
+      <childRules xmi:id="_UekVhnDwEeWh-MssWmCB_A"/>
+    </representationKinds>
+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_TR15IHDvEeWh-MssWmCB_A" name="Sequence Diagram" concerns="_HQhf5MSYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.sequence/icons/obj16/Diagram_Sequence.gif" implementationID="PapyrusUMLSequenceDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.sequence.CreateSequenceDiagramCommand">
+      <modelRules xmi:id="_TR15IXDvEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Interaction"/>
+      </modelRules>
+      <owningRules xmi:id="_TR15InDvEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Interaction"/>
+      </owningRules>
+      <owningRules xmi:id="_TR15I3DvEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
+        <newModelPath xmi:id="_TR15JHDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">
+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
+        </newModelPath>
+      </owningRules>
+      <owningRules xmi:id="_TR15JXDvEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
+        <newModelPath xmi:id="_TR15JnDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">
+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
+        </newModelPath>
+      </owningRules>
+      <owningRules xmi:id="_TR15J3DvEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+        <newModelPath xmi:id="_TR15KHDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">
+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+        </newModelPath>
+      </owningRules>
+      <owningRules xmi:id="_TR15KXDvEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//UseCase"/>
+        <newModelPath xmi:id="_TR15KnDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">
+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
+        </newModelPath>
+      </owningRules>
+      <childRules xmi:id="_TR15K3DvEeWh-MssWmCB_A"/>
+    </representationKinds>
+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_PwD0cHDvEeWh-MssWmCB_A" name="State Machine Diagram" concerns="_HQhf5MSYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.statemachine/icons/obj16/Diagram_StateMachine.gif" implementationID="PapyrusUMLStateMachineDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.statemachine.CreateStateMachineDiagramCommand">
+      <modelRules xmi:id="_PwD0cXDvEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//StateMachine"/>
+      </modelRules>
+      <modelRules xmi:id="_H-oCgB0UEea_bcpknMJ7-w">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//State"/>
+      </modelRules>
+      <owningRules xmi:id="_PwD0cnDvEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//StateMachine"/>
+      </owningRules>
+      <owningRules xmi:id="_PwD0c3DvEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
+        <newModelPath xmi:id="_PwD0dHDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.StateMachine">
+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
+        </newModelPath>
+      </owningRules>
+      <owningRules xmi:id="_PwD0dXDvEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
+        <newModelPath xmi:id="_PwD0dnDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.StateMachine">
+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
+        </newModelPath>
+      </owningRules>
+      <owningRules xmi:id="_PwD0d3DvEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+        <newModelPath xmi:id="_PwD0eHDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.StateMachine">
+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+        </newModelPath>
+      </owningRules>
+      <owningRules xmi:id="_PwD0eXDvEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>
+        <newModelPath xmi:id="_PwD0enDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.ProtocolStateMachine">
+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface/protocol"/>
+        </newModelPath>
+      </owningRules>
+      <owningRules xmi:id="_5kmMcB0UEea_bcpknMJ7-w">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//State"/>
+      </owningRules>
+      <childRules xmi:id="_PwD0e3DvEeWh-MssWmCB_A"/>
+    </representationKinds>
+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_LzyMIHDvEeWh-MssWmCB_A" name="Timing Diagram" concerns="_HQhf5MSYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.timing/icons/obj16/Diagram_Timing.gif" implementationID="PapyrusUMLTimingDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.timing.custom.CreateTimingDiagramCommand">
+      <modelRules xmi:id="_LzyMIXDvEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </modelRules>
+      <owningRules xmi:id="_LzyMInDvEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </owningRules>
+      <childRules xmi:id="_LzyMI3DvEeWh-MssWmCB_A"/>
+    </representationKinds>
+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_yeY0sHDvEeWh-MssWmCB_A" name="Use Case Diagram" concerns="_HQhf4sSYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.usecase/icons/obj16/Diagram_UseCase.gif" implementationID="UseCase" customStyle="platform:/plugin/org.eclipse.papyrus.uml.diagram.usecase/models/usecase.css" creationCommandClass="org.eclipse.papyrus.uml.diagram.usecase.CreateUseCaseDiagramCommand">
+      <modelRules xmi:id="_yeY0sXDvEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </modelRules>
+      <modelRules xmi:id="_yeY0snDvEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+      </modelRules>
+      <owningRules xmi:id="_yeY0s3DvEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </owningRules>
+      <owningRules xmi:id="_yeY0tHDvEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+      </owningRules>
+      <childRules xmi:id="_yeY0tXDvEeWh-MssWmCB_A"/>
+    </representationKinds>
+    <representationKinds xsi:type="nattablerepresentation:PapyrusSyncTable" xmi:id="_P3J1cEr7EeSVGbM3cmVSqQ" name="Generic Tree Table" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.nattable/icons/uml_generic_table.png" implementationID="PapyrusUMLGenericTreeTable">
+      <modelRules xmi:id="_vZwgkEr7EeSVGbM3cmVSqQ">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+      </modelRules>
+      <owningRules xmi:id="_vZwgkUr7EeSVGbM3cmVSqQ">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+      </owningRules>
+    </representationKinds>
+    <representationKinds xsi:type="nattablerepresentation:PapyrusSyncTable" xmi:id="_P3J1cEr7EeRVGbM3cmVSqQ" name="Class Tree Table" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table.png" implementationID="PapyrusClassTreeTable">
+      <modelRules xmi:id="_vZwgkEr7EeSVGbM3cmVSqQ">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </modelRules>
+      <owningRules xmi:id="_vZwgkUr7EeSVGbM3cmVSqQ">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </owningRules>
+    </representationKinds>
+    <representationKinds xsi:type="nattablerepresentation:PapyrusSyncTable" xmi:id="_Uz8agHDuEeWh-MssWmCB_A" name="Generic Table" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table.png" implementationID="PapyrusGenericTable">
+      <modelRules xmi:id="_Uz8agXDuEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
+      </modelRules>
+      <owningRules xmi:id="_Uz8agnDuEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
+      </owningRules>
+    </representationKinds>
+    <representationKinds xsi:type="nattablerepresentation:PapyrusSyncTable" xmi:id="_WC1q0P4UEeSRsNBVzfUrzA" name="Stereotype Display Tree Table" concerns="_NxfRgMSjEeaCPPhpB0_9OQ" icon="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table.png" implementationID="PapyrusStereotypeDisplayTreeTable">
+      <modelRules xmi:id="_7k79wP4VEeSRsNBVzfUrzA">
+        <element href="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//View"/>
+      </modelRules>
+      <owningRules xmi:id="_AJmbwP4WEeSRsNBVzfUrzA">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+      </owningRules>
+    </representationKinds>
+    <representationKinds xsi:type="nattablerepresentation:PapyrusSyncTable" xmi:id="_wXztQHDwEeWh-MssWmCB_A" name="View Table" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/icons/nattablepageeditor.png" implementationID="PapyrusViewsTable">
+      <modelRules xmi:id="_wXztQXDwEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
+      </modelRules>
+      <owningRules xmi:id="_wXztQnDwEeWh-MssWmCB_A">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
+      </owningRules>
+    </representationKinds>
+    <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
+  </contexts>
+  <contexts xsi:type="architecture:ArchitectureFramework" xmi:id="__ZqwAMSlEeaCPPhpB0_9OQ" name="Profile" desciption="The Profile Definition Framework" id="org.eclipse.papyrus.uml.architecture.Profile" icon="platform:/plugin/org.eclipse.papyrus.uml.architecture/icons/profile.gif" extensionPrefix="profile" creationCommandClass="org.eclipse.papyrus.uml.diagram.profile.CreateProfileModelCommand">
+    <viewpoints xmi:id="_hoXx0MSiEeaKZJ_pGfaSiA" name="Profile Definition" desciption="A viewpoint allowing profile definition with UML" representationKinds="_UekVgHDwEeWh-MssWmCB_A _zzf4gHDtEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.profile.definition"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.emf/model/infra-emf.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.common/model/notation.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.common/model/gmfdiag-common.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.services.controlmode/model/controlmode.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.services.edit/model/marker.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.types.rulebased/model/rulebased.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.stereotype.edition/model/stereotype-edit.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/StandardProfile.elementtypesconfigurations#_jfoLkGT_EeSEqNuV3JpFCA"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types.ui/model/uml-advice.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+  </contexts>
+</architecture:ArchitectureDomain>
diff --git a/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/plugin.properties b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/plugin.properties
new file mode 100644
index 00000000000..ac94a7f7681
--- /dev/null
+++ b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/plugin.properties
@@ -0,0 +1,14 @@
+# Copyright (c) 2017 CEA LIST.
+# 
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#  
+#  Contributors:
+#  Maged Elaasar - Initial API and implementation
+#  
+# 
+
+pluginName = UML Architecture
+providerName=Eclipse Modeling Project
diff --git a/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/plugin.xml b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/plugin.xml
new file mode 100644
index 00000000000..1be64e8b3e9
--- /dev/null
+++ b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/plugin.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+ 
+	<extension
+	      point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">
+		<clientContext
+	         id="org.eclipse.papyrus.uml.architecture.Profile">
+	      <matcher
+	            class="org.eclipse.papyrus.uml.architecture.internal.NoContextEnablementMatcher">
+	      </matcher>
+	   	</clientContext>
+		<binding context="org.eclipse.papyrus.uml.architecture.Profile">
+			<!-- ElementType that deals with View deletion when their related model element is deleted -->
+			<elementType ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
+			<elementType ref="org.eclipse.gmf.runtime.diagram.core.advice.removeBookmarks"/>
+	        <!-- Check for attempts to edit read-only objects that cannot reasonably be made writeable. -->		
+	        <advice ref="org.eclipse.papyrus.infra.emf.readOnlyAdvice" />
+	        <!-- Delete markers attached to objects being deleted. -->
+		</binding>
+	</extension>
+	
+	 <extension point="org.eclipse.papyrus.infra.architecture.models">
+	    <model path="model/uml.architecture"/>
+	 </extension>
+ 
+	<extension
+	      point="org.eclipse.papyrus.infra.gmfdiag.common.diagramReconciler">
+	   <diagramReconciler
+	         diagramType="PapyrusUMLActivityDiagram"
+	         reconcilerClass="org.eclipse.papyrus.uml.architecture.migration.UMLDiagramReconciler_1_3_0"
+	         source="1.2.0"
+	         target="1.3.0">
+	   </diagramReconciler>
+	   <diagramReconciler
+	         diagramType="PapyrusUMLClassDiagram"
+	         reconcilerClass="org.eclipse.papyrus.uml.architecture.migration.UMLDiagramReconciler_1_3_0"
+	         source="1.2.0"
+	         target="1.3.0">
+	   </diagramReconciler>
+	   <diagramReconciler
+	         diagramType="PapyrusUMLCommunicationDiagram"
+	         reconcilerClass="org.eclipse.papyrus.uml.architecture.migration.UMLDiagramReconciler_1_3_0"
+	         source="1.2.0"
+	         target="1.3.0">
+	   </diagramReconciler>
+	   <diagramReconciler
+	         diagramType="PapyrusUMLComponentDiagram"
+	         reconcilerClass="org.eclipse.papyrus.uml.architecture.migration.UMLDiagramReconciler_1_3_0"
+	         source="1.2.0"
+	         target="1.3.0">
+	   </diagramReconciler>
+	   <diagramReconciler
+	         diagramType="CompositeStructure"
+	         reconcilerClass="org.eclipse.papyrus.uml.architecture.migration.UMLDiagramReconciler_1_3_0"
+	         source="1.2.0"
+	         target="1.3.0">
+	   </diagramReconciler>
+	   <diagramReconciler
+	         diagramType="PapyrusUMLDeploymentDiagram"
+	         reconcilerClass="org.eclipse.papyrus.uml.architecture.migration.UMLDiagramReconciler_1_3_0"
+	         source="1.2.0"
+	         target="1.3.0">
+	   </diagramReconciler>
+	   <diagramReconciler
+	         diagramType="PapyrusUMLInteractionOverviewDiagram"
+	         reconcilerClass="org.eclipse.papyrus.uml.architecture.migration.UMLDiagramReconciler_1_3_0"
+	         source="1.2.0"
+	         target="1.3.0">
+	   </diagramReconciler>
+	   <diagramReconciler
+	         diagramType="PapyrusUMLProfileDiagram"
+	         reconcilerClass="org.eclipse.papyrus.uml.architecture.migration.UMLDiagramReconciler_1_3_0"
+	         source="1.2.0"
+	         target="1.3.0">
+	   </diagramReconciler>
+       <diagramReconciler
+             diagramType="PapyrusUMLSequenceDiagram"
+             reconcilerClass="org.eclipse.papyrus.uml.architecture.migration.UMLDiagramReconciler_1_3_0"
+             source="1.2.0"
+             target="1.3.0">
+   	   </diagramReconciler>
+	   <diagramReconciler
+	         diagramType="PapyrusUMLStateMachineDiagram"
+	         reconcilerClass="org.eclipse.papyrus.uml.architecture.migration.UMLDiagramReconciler_1_3_0"
+	         source="1.2.0"
+	         target="1.3.0">
+	   </diagramReconciler>
+	   <diagramReconciler
+	         diagramType="PapyrusUMLTimingDiagram"
+	         reconcilerClass="org.eclipse.papyrus.uml.architecture.migration.UMLDiagramReconciler_1_3_0"
+	         source="1.2.0"
+	         target="1.3.0">
+	   </diagramReconciler>
+	   <diagramReconciler
+	         diagramType="UseCase"
+	         reconcilerClass="org.eclipse.papyrus.uml.architecture.migration.UMLDiagramReconciler_1_3_0"
+	         source="1.2.0"
+	         target="1.3.0">
+	   </diagramReconciler>
+	</extension>
+
+	<extension
+	      point="org.eclipse.papyrus.infra.nattable.common.tableReconciler">
+	   <tableReconciler
+	         reconcilerClass="org.eclipse.papyrus.uml.architecture.migration.UMLTableReconciler_1_3_0"
+	         source="1.0.0"
+	         target="1.3.0">
+	   </tableReconciler>
+	</extension>
+
+</plugin>
+
diff --git a/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/pom.xml b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/pom.xml
new file mode 100644
index 00000000000..b0958eef33b
--- /dev/null
+++ b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/pom.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.papyrus</groupId>
+		<artifactId>org.eclipse.papyrus.uml-architecture</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.uml.architecture</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
\ No newline at end of file
diff --git a/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/src/org/eclipse/papyrus/uml/architecture/UMLArchitectureContextIds.java b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/src/org/eclipse/papyrus/uml/architecture/UMLArchitectureContextIds.java
new file mode 100644
index 00000000000..1483f541d9f
--- /dev/null
+++ b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/src/org/eclipse/papyrus/uml/architecture/UMLArchitectureContextIds.java
@@ -0,0 +1,31 @@
+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	 Maged Elaasar - Initial API and Implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.architecture;
+
+/**
+ * The ids of UML-related architecture contexts
+ * 
+ * @since 1.0
+ */
+public class UMLArchitectureContextIds {
+
+	/**
+	 * The id of the UML architecture context
+	 */
+	public static final String UML = "org.eclipse.papyrus.infra.services.edit.TypeContext"; //$NON-NLS-1$
+
+	/**
+	 * The id of the Profile architecture context
+	 */
+	public static final String Profile = "org.eclipse.papyrus.uml.architecture.Profile"; //$NON-NLS-1$
+}
diff --git a/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/src/org/eclipse/papyrus/uml/architecture/internal/NoContextEnablementMatcher.java b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/src/org/eclipse/papyrus/uml/architecture/internal/NoContextEnablementMatcher.java
new file mode 100644
index 00000000000..0125bb33134
--- /dev/null
+++ b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/src/org/eclipse/papyrus/uml/architecture/internal/NoContextEnablementMatcher.java
@@ -0,0 +1,29 @@
+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ * 		Maged Elaasar - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.architecture.internal;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
+
+/**
+ * A no context matcher used to register element type bindings in the extension points  
+ */
+public class NoContextEnablementMatcher implements IElementMatcher {
+
+	@Override
+	public boolean matches(EObject eObject) {
+		return false;
+	}
+}
diff --git a/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/src/org/eclipse/papyrus/uml/architecture/migration/UMLDiagramReconciler_1_3_0.java b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/src/org/eclipse/papyrus/uml/architecture/migration/UMLDiagramReconciler_1_3_0.java
new file mode 100644
index 00000000000..a893e60d2d4
--- /dev/null
+++ b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/src/org/eclipse/papyrus/uml/architecture/migration/UMLDiagramReconciler_1_3_0.java
@@ -0,0 +1,101 @@
+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	 Maged Elaasar - Initial API and Implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.architecture.migration;
+
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.infra.core.architecture.RepresentationKind;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureDescriptionLanguage;
+import org.eclipse.papyrus.infra.architecture.ArchitectureDomainManager;
+import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler_1_3_0;
+import org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram;
+import org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle;
+import org.eclipse.papyrus.uml.architecture.UMLArchitectureContextIds;
+
+/**
+ * UML Diagram Reconciler from 1.2.0 to 1.3.0 that switches the old PapyrusViewStyle by
+ * the new PapyrusDiagramStyle
+ */
+public class UMLDiagramReconciler_1_3_0 extends DiagramReconciler_1_3_0 {
+
+	private static final String ACTIVITY_DIAGRAM = "PapyrusUMLActivityDiagram";
+	private static final String CLASS_DIAGRAM = "PapyrusUMLClassDiagram";
+	private static final String COMMUNICATION_DIAGRAM = "PapyrusUMLCommunicationDiagram";
+	private static final String COMPONENT_DIAGRAM = "PapyrusUMLComponentDiagram";
+	private static final String COMPOSITE_STRUCTURE_DIAGRAM = "CompositeStructure";
+	private static final String DEPLOYMENT_DIAGRAM = "PapyrusUMLDeploymentDiagram";
+	private static final String INTERACTION_OVERVIEW_DIAGRAM = "PapyrusUMLInteractionOverviewDiagram";
+	private static final String PROFILE_DIAGRAM = "PapyrusUMLProfileDiagram";
+	private static final String SEQUENCE_DIAGRAM = "PapyrusUMLSequenceDiagram";
+	private static final String STATE_MACHINE_DIAGRAM = "PapyrusUMLStateMachineDiagram";
+	private static final String TIMING_DIAGRAM = "PapyrusUMLTimingDiagram";
+	private static final String USE_CASE_DIAGRAM = "UseCase";
+	
+	/**
+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler_1_3_0#getPapyrusDiagram(org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle)
+	 *
+	 * @param oldStyle
+	 * @return
+	 */
+	@Override
+	protected PapyrusDiagram getDiagramKind(Diagram diagram, PapyrusViewStyle oldStyle) {
+		if (oldStyle != null) {
+			org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram oldDiagramKind =
+				(org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram) oldStyle.getConfiguration();
+			if (oldDiagramKind != null)
+				return getDiagramKind(oldDiagramKind.getName(), diagram);
+		}
+		if (ACTIVITY_DIAGRAM.equals(diagram.getType())) {
+			return getDiagramKind("Activity Diagram", diagram);
+		} else if (CLASS_DIAGRAM.equals(diagram.getType())) {
+			return getDiagramKind("Class Diagram", diagram);
+		} else if (COMMUNICATION_DIAGRAM.equals(diagram.getType())) {
+			return getDiagramKind("Communication Diagram", diagram);
+		} else if (COMPONENT_DIAGRAM.equals(diagram.getType())) {
+			return getDiagramKind("Component Diagram", diagram);
+		} else if (COMPOSITE_STRUCTURE_DIAGRAM.equals(diagram.getType())) {
+			return getDiagramKind("Composite Structure Diagram", diagram);
+		} else if (DEPLOYMENT_DIAGRAM.equals(diagram.getType())) {
+			return getDiagramKind("Deployment Diagram", diagram);
+		} else if (INTERACTION_OVERVIEW_DIAGRAM.equals(diagram.getType())) {
+			return getDiagramKind("Interaction Overview Diagram", diagram);
+		} else if (PROFILE_DIAGRAM.equals(diagram.getType())) {
+			return getDiagramKind("Profile Diagram", diagram);
+		} else if (SEQUENCE_DIAGRAM.equals(diagram.getType())) {
+			return getDiagramKind("Sequence Diagram", diagram);
+		} else if (STATE_MACHINE_DIAGRAM.equals(diagram.getType())) {
+			return getDiagramKind("State Machine Diagram", diagram);
+		} else if (TIMING_DIAGRAM.equals(diagram.getType())) {
+			return getDiagramKind("Timing Diagram", diagram);
+		} else if (USE_CASE_DIAGRAM.equals(diagram.getType())) {
+			return getDiagramKind("Use Case Diagram", diagram);
+		}
+		return null;
+	}
+
+	/**
+	 * Gets the diagram kind that matches given name and that supports the given diagram
+	 */
+	protected PapyrusDiagram getDiagramKind(String name, Diagram diagram) {
+		ArchitectureDomainManager manager = ArchitectureDomainManager.getInstance();
+		MergedArchitectureDescriptionLanguage context = (MergedArchitectureDescriptionLanguage) manager.getArchitectureContextById(UMLArchitectureContextIds.UML);
+		for(RepresentationKind pKind : context.getRepresentationKinds()) {
+			if (pKind.getName().equals(name)) {
+				PapyrusDiagram dKind = (PapyrusDiagram) pKind;
+				if (dKind.getModelRules().get(0).getElement().isInstance(diagram.getElement())) {
+					return dKind;
+				}
+			}
+		}
+		return null;
+	}
+}
diff --git a/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/src/org/eclipse/papyrus/uml/architecture/migration/UMLTableReconciler_1_3_0.java b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/src/org/eclipse/papyrus/uml/architecture/migration/UMLTableReconciler_1_3_0.java
new file mode 100644
index 00000000000..591b999edbd
--- /dev/null
+++ b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/src/org/eclipse/papyrus/uml/architecture/migration/UMLTableReconciler_1_3_0.java
@@ -0,0 +1,127 @@
+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	 Maged Elaasar - Initial API and Implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.architecture.migration;
+
+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.AbstractCommand;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.papyrus.infra.core.architecture.RepresentationKind;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureDescriptionLanguage;
+import org.eclipse.papyrus.infra.nattable.representation.PapyrusSyncTable;
+import org.eclipse.papyrus.infra.architecture.ArchitectureDomainManager;
+import org.eclipse.papyrus.infra.nattable.common.reconciler.TableReconciler;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.uml.architecture.UMLArchitectureContextIds;
+
+/**
+ * UML Table Reconciler from 1.0.0 to 1.3.0 that replaces the old prototype value for tables
+ * with ones based on table kinds
+ */
+public class UMLTableReconciler_1_3_0 extends TableReconciler {
+
+	private static final String VIEW_TABLE = "View Table";
+	private static final String GENERIC_TREE_TABLE = "Generic Tree Table";
+	private static final String CLASS_TREE_TABLE = "ClassTreeTable";
+	private static final String GENERIC_TABLE = "Generic Table";
+	private static final String STEREO_DISPLAY_TREE_TABLE = "StereotypeDisplayTreeTable";
+
+	@Override
+	public ICommand getReconcileCommand(Table table) {
+		if (table.getPrototype() instanceof org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView) {
+			org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView oldTableKind =
+				(org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView) table.getPrototype();
+			
+			RepresentationKind newTableKind = null;
+			if (oldTableKind != null) {
+				if (VIEW_TABLE.equals(oldTableKind.getName())) {
+					newTableKind = getSyncTableKind(oldTableKind.getName(), table);
+				} else if (GENERIC_TREE_TABLE.equals(oldTableKind.getName())) {
+					newTableKind = getSyncTableKind(oldTableKind.getName(), table);
+				} else if (CLASS_TREE_TABLE.equals(oldTableKind.getName())) {
+					newTableKind = getSyncTableKind("Class Tree Table", table);
+				} else if (GENERIC_TABLE.equals(oldTableKind.getName())) {
+					newTableKind = getSyncTableKind(oldTableKind.getName(), table);
+				} else if (STEREO_DISPLAY_TREE_TABLE.equals(oldTableKind.getName())) {
+					newTableKind = getSyncTableKind("Stereotype Display Tree Table", table);
+				} else if (oldTableKind.getName() == null) {
+					newTableKind = getSyncTableKind(GENERIC_TABLE, table);
+				}
+			};
+			
+			if (newTableKind != null)
+				return new ReplaceTablePrototypeCommand(table, newTableKind);
+		}
+		return null;
+	}
+
+	/**
+	 * Get a sync table that matches the given name and that supports the given table
+	 */
+	protected PapyrusSyncTable getSyncTableKind(String name, Table table) {
+		ArchitectureDomainManager manager = ArchitectureDomainManager.getInstance();
+		MergedArchitectureDescriptionLanguage context = (MergedArchitectureDescriptionLanguage) manager.getArchitectureContextById(UMLArchitectureContextIds.UML);
+		for(RepresentationKind pKind : context.getRepresentationKinds()) {
+			if (pKind.getName().equals(name)) {
+				PapyrusSyncTable tKind = (PapyrusSyncTable) pKind;
+				if (tKind.getModelRules().get(0).getElement().isInstance(table.getContext())) {
+					return tKind;
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * A command to replace the old table prototype with the new representation kinds 
+	 */
+	protected class ReplaceTablePrototypeCommand extends AbstractCommand {
+
+		private Table table;
+		private RepresentationKind newKind;
+
+		public ReplaceTablePrototypeCommand(Table table, RepresentationKind newKind) {
+			super("Replace the papyrus view style from 1.0.0 to 1.3.0");
+			this.table = table;
+			this.newKind = newKind;
+		}
+
+		@Override
+		protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+			table.setPrototype(newKind);
+			return CommandResult.newOKCommandResult();
+		}
+
+		@Override
+		public boolean canUndo() {
+			return false;
+		}
+
+		@Override
+		public boolean canRedo() {
+			return false;
+		}
+
+		@Override
+		protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+			throw new ExecutionException("Should not be called, canRedo false"); //$NON-NLS-1$
+		}
+
+		@Override
+		protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+			throw new ExecutionException("Should not be called, canUndo false"); //$NON-NLS-1$
+		}
+	}
+}
diff --git a/plugins/uml/architecture/pom.xml b/plugins/uml/architecture/pom.xml
new file mode 100644
index 00000000000..24cea77f8cc
--- /dev/null
+++ b/plugins/uml/architecture/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.eclipse.papyrus.uml-architecture</artifactId>
+	<packaging>pom</packaging>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.uml</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+    </parent>
+	<name>Papyrus UML Architecture</name>
+	<description>Papyrus UML architecture contexts.</description>
+
+	<modules>
+		<module>org.eclipse.papyrus.uml.architecture</module>
+	</modules>
+</project>
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/BaseElementTypeSetBlock.java b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/BaseElementTypeSetBlock.java
index c2258bf4ae6..2205febf5cb 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/BaseElementTypeSetBlock.java
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/BaseElementTypeSetBlock.java
@@ -28,6 +28,8 @@ import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.StyledString;
 import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
 import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;
 import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
 import org.eclipse.papyrus.uml.profile.types.generator.ui.internal.Activator;
@@ -59,8 +61,6 @@ class BaseElementTypeSetBlock {
 
 	private static final String UML_ELEMENT_TYPE_SET = "org.eclipse.papyrus.uml.service.types.UMLElementTypeSet"; //$NON-NLS-1$
 
-	private static final String CONTEXT_ID = "org.eclipse.papyrus.infra.services.edit.TypeContext";
-
 	private final GeneratorWizardModel model;
 
 	private final BiMap<String, ElementTypeSetConfiguration> elementTypeSets;
@@ -69,7 +69,14 @@ class BaseElementTypeSetBlock {
 		super();
 
 		this.model = model;
-		this.elementTypeSets = HashBiMap.create(ElementTypeSetConfigurationRegistry.getInstance().getElementTypeSetConfigurations().get(CONTEXT_ID));
+		
+		String clientContextId = "";
+		try {
+			clientContextId = TypeContext.getDefaultContext().getId();
+		} catch (ServiceException e) {
+			Activator.log.error(e);
+		}
+		this.elementTypeSets = HashBiMap.create(ElementTypeSetConfigurationRegistry.getInstance().getElementTypeSetConfigurations().get(clientContextId));
 	}
 
 	public void createControl(Composite parent) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/build.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/build.properties
index 2e3d8ccd1c8..2043598e7aa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/build.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/build.properties
@@ -11,7 +11,6 @@ bin.includes = .,\
                about.html,\
                custom-messages.properties,\
                model/activityDiagram.elementtypesconfigurations,\
-               model/activityDiagram.configuration,\
                css/
 jars.compile.order=.
 src.includes = about.html
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/migration/ActivityReconcilerForCompartment.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/migration/ActivityReconcilerForCompartment_1_2_0.java
index dc44870c50f..b4e68d60a2e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/migration/ActivityReconcilerForCompartment.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/migration/ActivityReconcilerForCompartment_1_2_0.java
@@ -21,7 +21,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.ReconcilerForCompartm
 /**
  * Class Diagram Reconciler for compartment from 1.1.0 to 1.2.0
  */
-public class ActivityReconcilerForCompartment extends ReconcilerForCompartment {
+public class ActivityReconcilerForCompartment_1_2_0 extends ReconcilerForCompartment {
 
 	private static final String ActivityActivityParametersCompartmentEditPart_VISUAL_ID = "7001";
 	private static final String ActivityActivityPreConditionsCompartmentEditPart_VISUAL_ID = "7002";
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/migration/ActivityReconciler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/migration/ActivityReconciler_1_1_0.java
index af620dd4054..751629b38fe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/migration/ActivityReconciler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/migration/ActivityReconciler_1_1_0.java
@@ -1,166 +1,166 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2015 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.activity.migration;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.papyrus.infra.gmfdiag.common.commands.InsertFloatingLabelFromMapCommand;

-import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler;

-

-/**

- * Activity Diagram Reconciler from 1.0.0 to 1.1.0

- */

-public class ActivityReconciler extends DiagramReconciler {

-

-	private final static String AcceptEventActionEditPart_VISUAL_ID = "3063";

-	private final static String AcceptEventActionFloatingNameEditPart_VISUAL_ID = "6040";

-	private final static String ActivityFinalNodeEditPart_VISUAL_ID = "3005";

-	private final static String ActivityFinalNodeFloatingNameEditPart_VISUAL_ID = "5081";

-	private final static String ActivityPartitionEditPart_VISUAL_ID = "3067";

-	private final static String ActivityPartitionFloatingNameEditPart_VISUAL_ID = "6016";

-	private final static String AddStructuralFeatureValueActionEditPart_VISUAL_ID = "3091";

-	private final static String AddStructuralFeatureValueActionFloatingNameEditPart_VISUAL_ID = "6019";

-	private final static String AddVariableValueActionEditPart_VISUAL_ID = "3099";

-	private final static String AddVariableValueActionFloatingNameEditPart_VISUAL_ID = "6018";

-	private final static String BroadcastSignalActionEditPart_VISUAL_ID = "3102";

-	private final static String BroadcastSignalActionFloatingNameEditPart_VISUAL_ID = "6017";

-	private final static String CallBehaviorActionEditPart_VISUAL_ID = "3008";

-	private final static String CallBehaviorActionFloatingNameEditPart_VISUAL_ID = "6029";

-	private final static String CallOperationActionEditPart_VISUAL_ID = "3010";

-	private final static String CallOperationActionFloatingNameEditPart_VISUAL_ID = "6020";

-	private final static String CentralBufferNodeEditPart_VISUAL_ID = "3104";

-	private final static String CentralBufferNodeFloatingNameEditPart_VISUAL_ID = "6030";

-	private final static String ClearAssociationActionEditPart_VISUAL_ID = "3119";

-	private final static String ClearAssociationActionFloatingNameEditPart_VISUAL_ID = "5400";

-	private final static String ClearStructuralFeatureActionEditPart_VISUAL_ID = "3115";

-	private final static String ClearStructuralFeatureActionFloatingNameEditPart_VISUAL_ID = "5396";

-	private final static String CreateLinkActionEditPart_VISUAL_ID = "3117";

-	private final static String CreateLinkActionFloatingNameEditPart_VISUAL_ID = "5397";

-	private final static String CreateLinkObjectActionEditPart_VISUAL_ID = "3198";

-	private final static String CreateLinkObjectActionFloatingNameEditPart_VISUAL_ID = "5407";

-	private final static String CreateObjectActionEditPart_VISUAL_ID = "3086";

-	private final static String CreateObjectActionFloatingNameEditPart_VISUAL_ID = "6024";

-	private final static String DataStoreNodeEditPart_VISUAL_ID = "3078";

-	private final static String DataStoreNodeFloatingNameEditPart_VISUAL_ID = "6031";

-	private final static String DecisionNodeEditPart_VISUAL_ID = "3038";

-	private final static String DecisionNodeFloatingNameEditPart_VISUAL_ID = "6036";

-	private final static String DestroyLinkActionEditPart_VISUAL_ID = "3118";

-	private final static String DestroyLinkActionFloatingNameEditPart_VISUAL_ID = "5399";

-	private final static String DestroyObjectActionEditPart_VISUAL_ID = "3095";

-	private final static String DestroyObjectActionFloatingNameEditPart_VISUAL_ID = "6022";

-	private final static String FlowFinalNodeEditPart_VISUAL_ID = "3006";

-	private final static String FlowFinalNodeFloatingNameEditPart_VISUAL_ID = "6035";

-	private final static String ForkNodeEditPart_VISUAL_ID = "3040";

-	private final static String ForkNodeFloatingNameEditPart_VISUAL_ID = "6038";

-	private final static String InitialNodeEditPart_VISUAL_ID = "3004";

-	private final static String InitialNodeFloatingNameEditPart_VISUAL_ID = "6034";

-	private final static String JoinNodeEditPart_VISUAL_ID = "3041";

-	private final static String JoinNodeFloatingNameEditPart_VISUAL_ID = "6039";

-	private final static String MergeNodeEditPart_VISUAL_ID = "3039";

-	private final static String MergeNodeFloatingNameEditPart_VISUAL_ID = "6037";

-	private final static String OpaqueActionEditPart_VISUAL_ID = "3007";

-	private final static String OpaqueActionFloatingNameEditPart_VISUAL_ID = "6028";

-	private final static String ReadExtentActionEditPart_VISUAL_ID = "3120";

-	private final static String ReadExtentActionFloatingNameEditPart_VISUAL_ID = "5402";

-	private final static String ReadIsClassifiedObjectActionEditPart_VISUAL_ID = "3122";

-	private final static String ReadIsClassifiedObjectActionFloatingNameEditPart_VISUAL_ID = "5403";

-	private final static String ReadLinkActionEditPart_VISUAL_ID = "3116";

-	private final static String ReadLinkActionFloatingNameEditPart_VISUAL_ID = "5398";

-	private final static String ReadSelfActionEditPart_VISUAL_ID = "3081";

-	private final static String ReadSelfActionFloatingNameEditPart_VISUAL_ID = "6025";

-	private final static String ReadStructuralFeatureActionEditPart_VISUAL_ID = "3088";

-	private final static String ReadStructuralFeatureActionFloatingNameEditPart_VISUAL_ID = "6023";

-	private final static String ReadVariableActionEditPart_VISUAL_ID = "3097";

-	private final static String ReadVariableActionFloatingNameEditPart_VISUAL_ID = "6021";

-	private final static String ReclassifyObjectActionEditPart_VISUAL_ID = "3221";

-	private final static String ReclassifyObjectActionFloatingNameEditPart_VISUAL_ID = "5401";

-	private final static String ReduceActionEditPart_VISUAL_ID = "3123";

-	private final static String ReduceActionFloatingNameEditPart_VISUAL_ID = "5404";

-	private final static String SendObjectActionEditPart_VISUAL_ID = "3042";

-	private final static String SendObjectActionFloatingNameEditPart_VISUAL_ID = "6027";

-	private final static String SendSignalActionEditPart_VISUAL_ID = "3052";

-	private final static String SendSignalActionFloatingNameEditPart_VISUAL_ID = "6032";

-	private final static String StartClassifierBehaviorActionEditPart_VISUAL_ID = "3124";

-	private final static String StartClassifierBehaviorActionFloatingNameEditPart_VISUAL_ID = "5405";

-	private final static String StartObjectBehavoiurActionEditPart_VISUAL_ID = "3113";

-	private final static String StartObjectBehaviorActionFloatingNameEditPart_VISUAL_ID = "5394";

-	private final static String TestIdentityActionEditPart_VISUAL_ID = "3114";

-	private final static String TestIdentityActionFloatingNameEditPart_VISUAL_ID = "5395";

-	private final static String ValueSpecificationActionEditPart_VISUAL_ID = "3076";

-	private final static String ValueSpecificationActionFloatingNameEditPart_VISUAL_ID = "6026";

-

-	/**

-	 * Gets the reconcile command.

-	 *

-	 * @param diagram

-	 *            the diagram

-	 * @return the reconcile command

-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler#getReconcileCommand(org.eclipse.gmf.runtime.notation.Diagram)

-	 */

-	@Override

-	public ICommand getReconcileCommand(Diagram diagram) {

-		return new InsertFloatingLabelFromMapCommand(diagram, getFloatingLabelMap());

-	}

-

-	/**

-	 * Gets the floating label map to add.

-	 *

-	 * @return the floating label map

-	 */

-	private Map<String, String> getFloatingLabelMap() {

-		Map<String, String> map = new HashMap<String, String>();

-		map.put(AcceptEventActionEditPart_VISUAL_ID, AcceptEventActionFloatingNameEditPart_VISUAL_ID);

-		map.put(ActivityFinalNodeEditPart_VISUAL_ID, ActivityFinalNodeFloatingNameEditPart_VISUAL_ID);

-		map.put(ActivityPartitionEditPart_VISUAL_ID, ActivityPartitionFloatingNameEditPart_VISUAL_ID);

-		map.put(AddStructuralFeatureValueActionEditPart_VISUAL_ID, AddStructuralFeatureValueActionFloatingNameEditPart_VISUAL_ID);

-		map.put(AddVariableValueActionEditPart_VISUAL_ID, AddVariableValueActionFloatingNameEditPart_VISUAL_ID);

-		map.put(BroadcastSignalActionEditPart_VISUAL_ID, BroadcastSignalActionFloatingNameEditPart_VISUAL_ID);

-		map.put(CallBehaviorActionEditPart_VISUAL_ID, CallBehaviorActionFloatingNameEditPart_VISUAL_ID);

-		map.put(CallOperationActionEditPart_VISUAL_ID, CallOperationActionFloatingNameEditPart_VISUAL_ID);

-		map.put(CentralBufferNodeEditPart_VISUAL_ID, CentralBufferNodeFloatingNameEditPart_VISUAL_ID);

-		map.put(ClearAssociationActionEditPart_VISUAL_ID, ClearAssociationActionFloatingNameEditPart_VISUAL_ID);

-		map.put(ClearStructuralFeatureActionEditPart_VISUAL_ID, ClearStructuralFeatureActionFloatingNameEditPart_VISUAL_ID);

-		map.put(CreateLinkActionEditPart_VISUAL_ID, CreateLinkActionFloatingNameEditPart_VISUAL_ID);

-		map.put(CreateLinkObjectActionEditPart_VISUAL_ID, CreateLinkObjectActionFloatingNameEditPart_VISUAL_ID);

-		map.put(CreateObjectActionEditPart_VISUAL_ID, CreateObjectActionFloatingNameEditPart_VISUAL_ID);

-		map.put(DataStoreNodeEditPart_VISUAL_ID, DataStoreNodeFloatingNameEditPart_VISUAL_ID);

-		map.put(DecisionNodeEditPart_VISUAL_ID, DecisionNodeFloatingNameEditPart_VISUAL_ID);

-		map.put(DestroyLinkActionEditPart_VISUAL_ID, DestroyLinkActionFloatingNameEditPart_VISUAL_ID);

-		map.put(DestroyObjectActionEditPart_VISUAL_ID, DestroyObjectActionFloatingNameEditPart_VISUAL_ID);

-		map.put(FlowFinalNodeEditPart_VISUAL_ID, FlowFinalNodeFloatingNameEditPart_VISUAL_ID);

-		map.put(ForkNodeEditPart_VISUAL_ID, ForkNodeFloatingNameEditPart_VISUAL_ID);

-		map.put(InitialNodeEditPart_VISUAL_ID, InitialNodeFloatingNameEditPart_VISUAL_ID);

-		map.put(JoinNodeEditPart_VISUAL_ID, JoinNodeFloatingNameEditPart_VISUAL_ID);

-		map.put(MergeNodeEditPart_VISUAL_ID, MergeNodeFloatingNameEditPart_VISUAL_ID);

-		map.put(OpaqueActionEditPart_VISUAL_ID, OpaqueActionFloatingNameEditPart_VISUAL_ID);

-		map.put(ReadExtentActionEditPart_VISUAL_ID, ReadExtentActionFloatingNameEditPart_VISUAL_ID);

-		map.put(ReadIsClassifiedObjectActionEditPart_VISUAL_ID, ReadIsClassifiedObjectActionFloatingNameEditPart_VISUAL_ID);

-		map.put(ReadLinkActionEditPart_VISUAL_ID, ReadLinkActionFloatingNameEditPart_VISUAL_ID);

-		map.put(ReadSelfActionEditPart_VISUAL_ID, ReadSelfActionFloatingNameEditPart_VISUAL_ID);

-		map.put(ReadStructuralFeatureActionEditPart_VISUAL_ID, ReadStructuralFeatureActionFloatingNameEditPart_VISUAL_ID);

-		map.put(ReadVariableActionEditPart_VISUAL_ID, ReadVariableActionFloatingNameEditPart_VISUAL_ID);

-		map.put(ReclassifyObjectActionEditPart_VISUAL_ID, ReclassifyObjectActionFloatingNameEditPart_VISUAL_ID);

-		map.put(ReduceActionEditPart_VISUAL_ID, ReduceActionFloatingNameEditPart_VISUAL_ID);

-		map.put(SendObjectActionEditPart_VISUAL_ID, SendObjectActionFloatingNameEditPart_VISUAL_ID);

-		map.put(SendSignalActionEditPart_VISUAL_ID, SendSignalActionFloatingNameEditPart_VISUAL_ID);

-		map.put(StartClassifierBehaviorActionEditPart_VISUAL_ID, StartClassifierBehaviorActionFloatingNameEditPart_VISUAL_ID);

-		map.put(StartObjectBehavoiurActionEditPart_VISUAL_ID, StartObjectBehaviorActionFloatingNameEditPart_VISUAL_ID);

-		map.put(TestIdentityActionEditPart_VISUAL_ID, TestIdentityActionFloatingNameEditPart_VISUAL_ID);

-		map.put(ValueSpecificationActionEditPart_VISUAL_ID, ValueSpecificationActionFloatingNameEditPart_VISUAL_ID);

-

-		return map;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.activity.migration;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.infra.gmfdiag.common.commands.InsertFloatingLabelFromMapCommand;
+import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler;
+
+/**
+ * Activity Diagram Reconciler from 1.0.0 to 1.1.0
+ */
+public class ActivityReconciler_1_1_0 extends DiagramReconciler {
+
+	private final static String AcceptEventActionEditPart_VISUAL_ID = "3063";
+	private final static String AcceptEventActionFloatingNameEditPart_VISUAL_ID = "6040";
+	private final static String ActivityFinalNodeEditPart_VISUAL_ID = "3005";
+	private final static String ActivityFinalNodeFloatingNameEditPart_VISUAL_ID = "5081";
+	private final static String ActivityPartitionEditPart_VISUAL_ID = "3067";
+	private final static String ActivityPartitionFloatingNameEditPart_VISUAL_ID = "6016";
+	private final static String AddStructuralFeatureValueActionEditPart_VISUAL_ID = "3091";
+	private final static String AddStructuralFeatureValueActionFloatingNameEditPart_VISUAL_ID = "6019";
+	private final static String AddVariableValueActionEditPart_VISUAL_ID = "3099";
+	private final static String AddVariableValueActionFloatingNameEditPart_VISUAL_ID = "6018";
+	private final static String BroadcastSignalActionEditPart_VISUAL_ID = "3102";
+	private final static String BroadcastSignalActionFloatingNameEditPart_VISUAL_ID = "6017";
+	private final static String CallBehaviorActionEditPart_VISUAL_ID = "3008";
+	private final static String CallBehaviorActionFloatingNameEditPart_VISUAL_ID = "6029";
+	private final static String CallOperationActionEditPart_VISUAL_ID = "3010";
+	private final static String CallOperationActionFloatingNameEditPart_VISUAL_ID = "6020";
+	private final static String CentralBufferNodeEditPart_VISUAL_ID = "3104";
+	private final static String CentralBufferNodeFloatingNameEditPart_VISUAL_ID = "6030";
+	private final static String ClearAssociationActionEditPart_VISUAL_ID = "3119";
+	private final static String ClearAssociationActionFloatingNameEditPart_VISUAL_ID = "5400";
+	private final static String ClearStructuralFeatureActionEditPart_VISUAL_ID = "3115";
+	private final static String ClearStructuralFeatureActionFloatingNameEditPart_VISUAL_ID = "5396";
+	private final static String CreateLinkActionEditPart_VISUAL_ID = "3117";
+	private final static String CreateLinkActionFloatingNameEditPart_VISUAL_ID = "5397";
+	private final static String CreateLinkObjectActionEditPart_VISUAL_ID = "3198";
+	private final static String CreateLinkObjectActionFloatingNameEditPart_VISUAL_ID = "5407";
+	private final static String CreateObjectActionEditPart_VISUAL_ID = "3086";
+	private final static String CreateObjectActionFloatingNameEditPart_VISUAL_ID = "6024";
+	private final static String DataStoreNodeEditPart_VISUAL_ID = "3078";
+	private final static String DataStoreNodeFloatingNameEditPart_VISUAL_ID = "6031";
+	private final static String DecisionNodeEditPart_VISUAL_ID = "3038";
+	private final static String DecisionNodeFloatingNameEditPart_VISUAL_ID = "6036";
+	private final static String DestroyLinkActionEditPart_VISUAL_ID = "3118";
+	private final static String DestroyLinkActionFloatingNameEditPart_VISUAL_ID = "5399";
+	private final static String DestroyObjectActionEditPart_VISUAL_ID = "3095";
+	private final static String DestroyObjectActionFloatingNameEditPart_VISUAL_ID = "6022";
+	private final static String FlowFinalNodeEditPart_VISUAL_ID = "3006";
+	private final static String FlowFinalNodeFloatingNameEditPart_VISUAL_ID = "6035";
+	private final static String ForkNodeEditPart_VISUAL_ID = "3040";
+	private final static String ForkNodeFloatingNameEditPart_VISUAL_ID = "6038";
+	private final static String InitialNodeEditPart_VISUAL_ID = "3004";
+	private final static String InitialNodeFloatingNameEditPart_VISUAL_ID = "6034";
+	private final static String JoinNodeEditPart_VISUAL_ID = "3041";
+	private final static String JoinNodeFloatingNameEditPart_VISUAL_ID = "6039";
+	private final static String MergeNodeEditPart_VISUAL_ID = "3039";
+	private final static String MergeNodeFloatingNameEditPart_VISUAL_ID = "6037";
+	private final static String OpaqueActionEditPart_VISUAL_ID = "3007";
+	private final static String OpaqueActionFloatingNameEditPart_VISUAL_ID = "6028";
+	private final static String ReadExtentActionEditPart_VISUAL_ID = "3120";
+	private final static String ReadExtentActionFloatingNameEditPart_VISUAL_ID = "5402";
+	private final static String ReadIsClassifiedObjectActionEditPart_VISUAL_ID = "3122";
+	private final static String ReadIsClassifiedObjectActionFloatingNameEditPart_VISUAL_ID = "5403";
+	private final static String ReadLinkActionEditPart_VISUAL_ID = "3116";
+	private final static String ReadLinkActionFloatingNameEditPart_VISUAL_ID = "5398";
+	private final static String ReadSelfActionEditPart_VISUAL_ID = "3081";
+	private final static String ReadSelfActionFloatingNameEditPart_VISUAL_ID = "6025";
+	private final static String ReadStructuralFeatureActionEditPart_VISUAL_ID = "3088";
+	private final static String ReadStructuralFeatureActionFloatingNameEditPart_VISUAL_ID = "6023";
+	private final static String ReadVariableActionEditPart_VISUAL_ID = "3097";
+	private final static String ReadVariableActionFloatingNameEditPart_VISUAL_ID = "6021";
+	private final static String ReclassifyObjectActionEditPart_VISUAL_ID = "3221";
+	private final static String ReclassifyObjectActionFloatingNameEditPart_VISUAL_ID = "5401";
+	private final static String ReduceActionEditPart_VISUAL_ID = "3123";
+	private final static String ReduceActionFloatingNameEditPart_VISUAL_ID = "5404";
+	private final static String SendObjectActionEditPart_VISUAL_ID = "3042";
+	private final static String SendObjectActionFloatingNameEditPart_VISUAL_ID = "6027";
+	private final static String SendSignalActionEditPart_VISUAL_ID = "3052";
+	private final static String SendSignalActionFloatingNameEditPart_VISUAL_ID = "6032";
+	private final static String StartClassifierBehaviorActionEditPart_VISUAL_ID = "3124";
+	private final static String StartClassifierBehaviorActionFloatingNameEditPart_VISUAL_ID = "5405";
+	private final static String StartObjectBehavoiurActionEditPart_VISUAL_ID = "3113";
+	private final static String StartObjectBehaviorActionFloatingNameEditPart_VISUAL_ID = "5394";
+	private final static String TestIdentityActionEditPart_VISUAL_ID = "3114";
+	private final static String TestIdentityActionFloatingNameEditPart_VISUAL_ID = "5395";
+	private final static String ValueSpecificationActionEditPart_VISUAL_ID = "3076";
+	private final static String ValueSpecificationActionFloatingNameEditPart_VISUAL_ID = "6026";
+
+	/**
+	 * Gets the reconcile command.
+	 *
+	 * @param diagram
+	 *            the diagram
+	 * @return the reconcile command
+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler#getReconcileCommand(org.eclipse.gmf.runtime.notation.Diagram)
+	 */
+	@Override
+	public ICommand getReconcileCommand(Diagram diagram) {
+		return new InsertFloatingLabelFromMapCommand(diagram, getFloatingLabelMap());
+	}
+
+	/**
+	 * Gets the floating label map to add.
+	 *
+	 * @return the floating label map
+	 */
+	private Map<String, String> getFloatingLabelMap() {
+		Map<String, String> map = new HashMap<String, String>();
+		map.put(AcceptEventActionEditPart_VISUAL_ID, AcceptEventActionFloatingNameEditPart_VISUAL_ID);
+		map.put(ActivityFinalNodeEditPart_VISUAL_ID, ActivityFinalNodeFloatingNameEditPart_VISUAL_ID);
+		map.put(ActivityPartitionEditPart_VISUAL_ID, ActivityPartitionFloatingNameEditPart_VISUAL_ID);
+		map.put(AddStructuralFeatureValueActionEditPart_VISUAL_ID, AddStructuralFeatureValueActionFloatingNameEditPart_VISUAL_ID);
+		map.put(AddVariableValueActionEditPart_VISUAL_ID, AddVariableValueActionFloatingNameEditPart_VISUAL_ID);
+		map.put(BroadcastSignalActionEditPart_VISUAL_ID, BroadcastSignalActionFloatingNameEditPart_VISUAL_ID);
+		map.put(CallBehaviorActionEditPart_VISUAL_ID, CallBehaviorActionFloatingNameEditPart_VISUAL_ID);
+		map.put(CallOperationActionEditPart_VISUAL_ID, CallOperationActionFloatingNameEditPart_VISUAL_ID);
+		map.put(CentralBufferNodeEditPart_VISUAL_ID, CentralBufferNodeFloatingNameEditPart_VISUAL_ID);
+		map.put(ClearAssociationActionEditPart_VISUAL_ID, ClearAssociationActionFloatingNameEditPart_VISUAL_ID);
+		map.put(ClearStructuralFeatureActionEditPart_VISUAL_ID, ClearStructuralFeatureActionFloatingNameEditPart_VISUAL_ID);
+		map.put(CreateLinkActionEditPart_VISUAL_ID, CreateLinkActionFloatingNameEditPart_VISUAL_ID);
+		map.put(CreateLinkObjectActionEditPart_VISUAL_ID, CreateLinkObjectActionFloatingNameEditPart_VISUAL_ID);
+		map.put(CreateObjectActionEditPart_VISUAL_ID, CreateObjectActionFloatingNameEditPart_VISUAL_ID);
+		map.put(DataStoreNodeEditPart_VISUAL_ID, DataStoreNodeFloatingNameEditPart_VISUAL_ID);
+		map.put(DecisionNodeEditPart_VISUAL_ID, DecisionNodeFloatingNameEditPart_VISUAL_ID);
+		map.put(DestroyLinkActionEditPart_VISUAL_ID, DestroyLinkActionFloatingNameEditPart_VISUAL_ID);
+		map.put(DestroyObjectActionEditPart_VISUAL_ID, DestroyObjectActionFloatingNameEditPart_VISUAL_ID);
+		map.put(FlowFinalNodeEditPart_VISUAL_ID, FlowFinalNodeFloatingNameEditPart_VISUAL_ID);
+		map.put(ForkNodeEditPart_VISUAL_ID, ForkNodeFloatingNameEditPart_VISUAL_ID);
+		map.put(InitialNodeEditPart_VISUAL_ID, InitialNodeFloatingNameEditPart_VISUAL_ID);
+		map.put(JoinNodeEditPart_VISUAL_ID, JoinNodeFloatingNameEditPart_VISUAL_ID);
+		map.put(MergeNodeEditPart_VISUAL_ID, MergeNodeFloatingNameEditPart_VISUAL_ID);
+		map.put(OpaqueActionEditPart_VISUAL_ID, OpaqueActionFloatingNameEditPart_VISUAL_ID);
+		map.put(ReadExtentActionEditPart_VISUAL_ID, ReadExtentActionFloatingNameEditPart_VISUAL_ID);
+		map.put(ReadIsClassifiedObjectActionEditPart_VISUAL_ID, ReadIsClassifiedObjectActionFloatingNameEditPart_VISUAL_ID);
+		map.put(ReadLinkActionEditPart_VISUAL_ID, ReadLinkActionFloatingNameEditPart_VISUAL_ID);
+		map.put(ReadSelfActionEditPart_VISUAL_ID, ReadSelfActionFloatingNameEditPart_VISUAL_ID);
+		map.put(ReadStructuralFeatureActionEditPart_VISUAL_ID, ReadStructuralFeatureActionFloatingNameEditPart_VISUAL_ID);
+		map.put(ReadVariableActionEditPart_VISUAL_ID, ReadVariableActionFloatingNameEditPart_VISUAL_ID);
+		map.put(ReclassifyObjectActionEditPart_VISUAL_ID, ReclassifyObjectActionFloatingNameEditPart_VISUAL_ID);
+		map.put(ReduceActionEditPart_VISUAL_ID, ReduceActionFloatingNameEditPart_VISUAL_ID);
+		map.put(SendObjectActionEditPart_VISUAL_ID, SendObjectActionFloatingNameEditPart_VISUAL_ID);
+		map.put(SendSignalActionEditPart_VISUAL_ID, SendSignalActionFloatingNameEditPart_VISUAL_ID);
+		map.put(StartClassifierBehaviorActionEditPart_VISUAL_ID, StartClassifierBehaviorActionFloatingNameEditPart_VISUAL_ID);
+		map.put(StartObjectBehavoiurActionEditPart_VISUAL_ID, StartObjectBehaviorActionFloatingNameEditPart_VISUAL_ID);
+		map.put(TestIdentityActionEditPart_VISUAL_ID, TestIdentityActionFloatingNameEditPart_VISUAL_ID);
+		map.put(ValueSpecificationActionEditPart_VISUAL_ID, ValueSpecificationActionFloatingNameEditPart_VISUAL_ID);
+
+		return map;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.configuration b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.configuration
deleted file mode 100644
index e2468a0ce24..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.configuration
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<configuration:PapyrusConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmi:id="_ko07IErbEeSdQKzSRatBjg">

-  <viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="_xogdoErbEeSdQKzSRatBjg" name="Default Papyrus Viewpoint">

-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_UzcgsHDtEeWh-MssWmCB_A" implementationID="PapyrusUMLActivityDiagram">

-      <modelRules xmi:id="_UzcgsXDtEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity"/>

-      </modelRules>

-      <owningRules xmi:id="_UzcgsnDtEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity"/>

-      </owningRules>

-      <owningRules xmi:id="_Uzcgs3DtEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>

-        <newModelPath xmi:id="_UzcgtHDtEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Activity">

-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>

-        </newModelPath>

-      </owningRules>

-      <owningRules xmi:id="_UzcgtXDtEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>

-        <newModelPath xmi:id="_UzcgtnDtEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Activity">

-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>

-        </newModelPath>

-      </owningRules>

-      <owningRules xmi:id="_Uzcgt3DtEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-        <newModelPath xmi:id="_UzcguHDtEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Activity">

-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>

-        </newModelPath>

-      </owningRules>

-      <categories href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb4txhEeOqHvRyiN87hA"/>

-      <childRules xmi:id="_UzcguXDtEeWh-MssWmCB_A"/>

-    </modelKinds>

-  </viewpoints>

-  <defaultStakeholder href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmkdxhEeOqHvRyiN87hA"/>

-  <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>

-</configuration:PapyrusConfiguration>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml
index ee9945c59d1..ca04d139eae 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml
@@ -15,14 +15,6 @@
    
 -->
 <plugin>
-   <extension
-         point="org.eclipse.papyrus.infra.viewpoints.policy.custom">
-      <contribution
-            file="model/activityDiagram.configuration"
-            original="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration">
-      </contribution>
-   </extension>
-   
    <extension point="org.eclipse.ui.contexts" id="ui-context">
 				      <?gmfgen generated="true"?>
 				      <context
@@ -3284,33 +3276,26 @@ self.structuralFeature.oclAsType(Property).opposite.type = self.object.type]]>
 			</mapping>
    </diagramMappings>
 </extension>
-<extension
-      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
-   <elementTypeSet
-   		 clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
-         path="model/activityDiagram.elementtypesconfigurations">
-   </elementTypeSet>
-</extension>
 
    <extension
       point="org.eclipse.papyrus.infra.gmfdiag.common.diagramReconciler">
    <diagramReconciler
          diagramType="PapyrusUMLActivityDiagram"
-         reconcilerClass="org.eclipse.papyrus.uml.diagram.activity.migration.ActivityReconciler"
-         source="undefined"
-         target="1.1.0">
+         reconcilerClass="org.eclipse.papyrus.uml.diagram.activity.migration.ActivityReconciler_1_1_0"
+         source="1.0.0"
+         target="1.3.0">
    </diagramReconciler>
    <diagramReconciler
          diagramType="PapyrusUMLActivityDiagram"
-         reconcilerClass="org.eclipse.papyrus.uml.diagram.activity.migration.ActivityReconcilerForCompartment"
-         source="undefined"
-         target="1.2.0">
+         reconcilerClass="org.eclipse.papyrus.uml.diagram.activity.migration.ActivityReconcilerForCompartment_1_2_0"
+         source="1.1.0"
+         target="1.3.0">
    </diagramReconciler>
    <diagramReconciler
          diagramType="PapyrusUMLActivityDiagram"
          reconcilerClass="org.eclipse.papyrus.uml.diagram.activity.migration.ActivityReconciler_1_2_0"
          source="1.1.0"
-         target="1.2.0">
+         target="1.3.0">
    </diagramReconciler>
 </extension>
    <extension point="org.eclipse.papyrus.infra.gmfdiag.common.visualTypeProviders">
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/edit/policies/UMLBaseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/edit/policies/UMLBaseItemSemanticEditPolicy.java
index 5d9d13744e7..99f1dbde08e 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/edit/policies/UMLBaseItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/edit/policies/UMLBaseItemSemanticEditPolicy.java
@@ -1,894 +1,894 @@
-/*****************************************************************************

- * Copyright (c) 2009 Atos Origin.

- *

- *

- * 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:

- *   Atos Origin - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.activity.edit.policies;

-

-import java.util.Iterator;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gef.requests.ReconnectRequest;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.SemanticEditPolicy;

-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.MoveElementsCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.helpers.GeneratedEditHelperBase;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.activity.helper.CustomObjectFlowEditHelper;

-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes;

-import org.eclipse.uml2.uml.Action;

-import org.eclipse.uml2.uml.Activity;

-import org.eclipse.uml2.uml.ActivityEdge;

-import org.eclipse.uml2.uml.ActivityNode;

-import org.eclipse.uml2.uml.ActivityParameterNode;

-import org.eclipse.uml2.uml.Comment;

-import org.eclipse.uml2.uml.Constraint;

-import org.eclipse.uml2.uml.ControlFlow;

-import org.eclipse.uml2.uml.DecisionNode;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.ExceptionHandler;

-import org.eclipse.uml2.uml.ExecutableNode;

-import org.eclipse.uml2.uml.FinalNode;

-import org.eclipse.uml2.uml.ForkNode;

-import org.eclipse.uml2.uml.InitialNode;

-import org.eclipse.uml2.uml.InputPin;

-import org.eclipse.uml2.uml.JoinNode;

-import org.eclipse.uml2.uml.MergeNode;

-import org.eclipse.uml2.uml.ObjectFlow;

-import org.eclipse.uml2.uml.ObjectNode;

-import org.eclipse.uml2.uml.OutputPin;

-import org.eclipse.uml2.uml.StructuredActivityNode;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {

-

-	/**

-	 * Extended request data key to hold editpart visual id.

-	 *

-	 * @generated

-	 */

-	public static final String VISUAL_ID_KEY = "visual_id"; //$NON-NLS-1$

-

-	/**

-	 * Extended request data key to hold the edge view during a reconnect request.

-	 *

-	 * @generated

-	 */

-	public static final String GRAPHICAL_RECONNECTED_EDGE = "graphical_edge"; //$NON-NLS-1$

-

-	/**

-	 * @generated

-	 */

-	private final IElementType myElementType;

-

-	/**

-	 * @generated

-	 */

-	protected UMLBaseItemSemanticEditPolicy(IElementType elementType) {

-		myElementType = elementType;

-	}

-

-	/**

-	 * Extended request data key to hold editpart visual id.

-	 * Add visual id of edited editpart to extended data of the request

-	 * so command switch can decide what kind of diagram element is being edited.

-	 * It is done in those cases when it's not possible to deduce diagram

-	 * element kind from domain element.

-	 *

-	 * @generated

-	 */

-	@Override

-	@SuppressWarnings("unchecked")

-	public Command getCommand(Request request) {

-		if (request instanceof ReconnectRequest) {

-			Object view = ((ReconnectRequest) request).getConnectionEditPart().getModel();

-			if (view instanceof View) {

-				String id = UMLVisualIDRegistry.getVisualID((View) view);

-				request.getExtendedData().put(VISUAL_ID_KEY, id);

-				request.getExtendedData().put(GRAPHICAL_RECONNECTED_EDGE, view);

-			}

-		}

-		return super.getCommand(request);

-	}

-

-	/**

-	 * Returns visual id from request parameters.

-	 *

-	 * @generated

-	 */

-	protected String getVisualID(IEditCommandRequest request) {

-		return (String) request.getParameter(VISUAL_ID_KEY);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getSemanticCommand(IEditCommandRequest request) {

-		IEditCommandRequest completedRequest = completeRequest(request);

-		Command semanticCommand = getSemanticCommandSwitch(completedRequest);

-		semanticCommand = getEditHelperCommand(completedRequest, semanticCommand);

-		if (completedRequest instanceof DestroyRequest) {

-			DestroyRequest destroyRequest = (DestroyRequest) completedRequest;

-			return shouldProceed(destroyRequest) ? addDeleteViewCommand(semanticCommand, destroyRequest) : null;

-		}

-		return semanticCommand;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command addDeleteViewCommand(Command mainCommand, DestroyRequest completedRequest) {

-		Command deleteViewCommand = getGEFWrapper(new DeleteCommand(getEditingDomain(), (View) getHost().getModel()));

-		return mainCommand == null ? deleteViewCommand : mainCommand.chain(deleteViewCommand);

-	}

-

-	/**

-	 * @generated NOT adding the possibility to globally disabling a request

-	 */

-	private Command getEditHelperCommand(IEditCommandRequest request, Command editPolicyCommand) {

-		// disable the request if necessary

-		if (requestIsDisabled(request)) {

-			return null;

-		}

-		// return command for reorient, as this has already been computed through the edit helpers

-		if (request instanceof ReorientRelationshipRequest) {

-			return editPolicyCommand;

-		}

-		// generated code

-		if (editPolicyCommand != null) {

-			ICommand command = editPolicyCommand instanceof ICommandProxy

-					? ((ICommandProxy) editPolicyCommand).getICommand() : new CommandProxy(editPolicyCommand);

-			request.setParameter(GeneratedEditHelperBase.EDIT_POLICY_COMMAND, command);

-		}

-		IElementType requestContextElementType = getContextElementType(request);

-		if (requestContextElementType != null) {

-			request.setParameter(GeneratedEditHelperBase.CONTEXT_ELEMENT_TYPE, requestContextElementType);

-			ICommand command = requestContextElementType.getEditCommand(request);

-			request.setParameter(GeneratedEditHelperBase.EDIT_POLICY_COMMAND, null);

-			request.setParameter(GeneratedEditHelperBase.CONTEXT_ELEMENT_TYPE, null);

-			if (command != null) {

-				if (!(command instanceof CompositeTransactionalCommand)) {

-					command = new CompositeTransactionalCommand(getEditingDomain(), command.getLabel())

-							.compose(command);

-				}

-				return new ICommandProxy(command);

-			}

-		}

-		return editPolicyCommand;

-	}

-

-	/**

-	 * Check whether the request should be disabled.

-	 *

-	 * @param request

-	 *            the request to analyze

-	 * @return true if the request must not succeed

-	 * @generated NOT

-	 */

-	private boolean requestIsDisabled(IEditCommandRequest request) {

-		if (request instanceof MoveRequest) {

-			// prevent moving a constraint to another parent, since the representation would not be the same

-			for (Object element : ((MoveRequest) request).getElementsToMove().keySet()) {

-				if (element instanceof Constraint) {

-					return true;

-				}

-			}

-		}

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected IElementType getContextElementType(IEditCommandRequest request) {

-		IElementType requestContextElementType = UMLElementTypes.getElementType(getVisualID(request));

-		return requestContextElementType != null ? requestContextElementType : myElementType;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getSemanticCommandSwitch(IEditCommandRequest req) {

-		if (req instanceof CreateRelationshipRequest) {

-			return getCreateRelationshipCommand((CreateRelationshipRequest) req);

-		} else if (req instanceof CreateElementRequest) {

-			return getCreateCommand((CreateElementRequest) req);

-		} else if (req instanceof ConfigureRequest) {

-			return getConfigureCommand((ConfigureRequest) req);

-		} else if (req instanceof DestroyElementRequest) {

-			return getDestroyElementCommand((DestroyElementRequest) req);

-		} else if (req instanceof DestroyReferenceRequest) {

-			return getDestroyReferenceCommand((DestroyReferenceRequest) req);

-		} else if (req instanceof DuplicateElementsRequest) {

-			return getDuplicateCommand((DuplicateElementsRequest) req);

-		} else if (req instanceof GetEditContextRequest) {

-			return getEditContextCommand((GetEditContextRequest) req);

-		} else if (req instanceof MoveRequest) {

-			return getMoveCommand((MoveRequest) req);

-		} else if (req instanceof ReorientReferenceRelationshipRequest) {

-			return getReorientReferenceRelationshipCommand((ReorientReferenceRelationshipRequest) req);

-		} else if (req instanceof ReorientRelationshipRequest) {

-			return getReorientRelationshipCommand((ReorientRelationshipRequest) req);

-		} else if (req instanceof SetRequest) {

-			return getSetCommand((SetRequest) req);

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getConfigureCommand(ConfigureRequest req) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		IElementEditService commandService = ElementEditServiceUtils

-				.getCommandProvider(((IGraphicalEditPart) getHost()).resolveSemanticElement());

-		if (req.getElementType() != null) {

-			commandService = ElementEditServiceUtils.getCommandProvider(req.getElementType());

-		}

-

-		if (commandService == null) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		ICommand semanticCommand = commandService.getEditCommand(req);

-

-		if ((semanticCommand != null) && (semanticCommand.canExecute())) {

-			return getGEFWrapper(semanticCommand);

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		IElementType requestElementType = req.getElementType();

-		if (requestElementType instanceof IElementType) {

-			IElementEditService commandProvider = ElementEditServiceUtils.getCommandProvider(req.getContainer());

-			if (commandProvider != null) {

-				ICommand command = commandProvider.getEditCommand(req);

-				if (command != null && command.canExecute()) {

-					return new ICommandProxy(command);

-				}

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected ICommand getSemanticCreationCommand(CreateElementRequest req) {

-		IElementEditService commandService = ElementEditServiceUtils.getCommandProvider(req.getContainer());

-		if (commandService == null) {

-			return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;

-		}

-		return commandService.getEditCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getSetCommand(SetRequest req) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getEditContextCommand(GetEditContextRequest req) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getDuplicateCommand(DuplicateElementsRequest req) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getMoveCommand(MoveRequest req) {

-		EObject targetCEObject = req.getTargetContainer();

-		if (targetCEObject != null) {

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(targetCEObject);

-			if (provider != null) {

-				ICommand moveCommand = provider.getEditCommand(req);

-				if (moveCommand != null) {

-					return new ICommandProxy(moveCommand);

-				}

-			}

-			return UnexecutableCommand.INSTANCE;

-		} else {

-			return getGEFWrapper(new MoveElementsCommand(req));

-		}

-

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected final Command getGEFWrapper(ICommand cmd) {

-		return (cmd == null) ? UnexecutableCommand.INSTANCE : new ICommandProxy(cmd);

-	}

-

-	/**

-	 * Returns editing domain from the host edit part.

-	 *

-	 * @generated

-	 */

-	protected TransactionalEditingDomain getEditingDomain() {

-		return ((IGraphicalEditPart) getHost()).getEditingDomain();

-	}

-

-	/**

-	 * Clean all shortcuts to the host element from the same diagram

-	 *

-	 * @generated

-	 */

-	protected void addDestroyShortcutsCommand(ICompositeCommand cmd, View view) {

-		assert view.getEAnnotation("Shortcut") == null; //$NON-NLS-1$

-		for (Iterator<?> it = view.getDiagram().getChildren().iterator(); it.hasNext();) {

-			View nextView = (View) it.next();

-			if (nextView.getEAnnotation("Shortcut") == null || !nextView.isSetElement() //$NON-NLS-1$

-					|| nextView.getElement() != view.getElement()) {

-				continue;

-			}

-			cmd.add(new DeleteCommand(getEditingDomain(), nextView));

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public static LinkConstraints getLinkConstraints() {

-		LinkConstraints cached = UMLDiagramEditorPlugin.getInstance().getLinkConstraints();

-		if (cached == null) {

-			UMLDiagramEditorPlugin.getInstance().setLinkConstraints(cached = new LinkConstraints());

-		}

-		return cached;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static class LinkConstraints {

-

-		/**

-		 * @generated

-		 */

-		public LinkConstraints() { // use static method #getLinkConstraints() to access instance

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canCreateAction_LocalPreconditionEdge(Action source, Constraint target) {

-			if (source != null) {

-				if (source.getLocalPreconditions().contains(target)) {

-					return false;

-				}

-				if (source == target) {

-					return false;

-				}

-			}

-

-			return canExistAction_LocalPreconditionEdge(source, target);

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canCreateAction_LocalPostconditionEdge(Action source, Constraint target) {

-			if (source != null) {

-				if (source.getLocalPostconditions().contains(target)) {

-					return false;

-				}

-				if (source == target) {

-					return false;

-				}

-			}

-

-			return canExistAction_LocalPostconditionEdge(source, target);

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canCreateObjectFlow_Edge(Activity container, ActivityNode source, ActivityNode target) {

-			return canExistObjectFlow_Edge(container, null, source, target);

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canCreateControlFlow_Edge(Activity container, ActivityNode source, ActivityNode target) {

-			return canExistControlFlow_Edge(container, null, source, target);

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canCreateExceptionHandler_Edge(ExecutableNode container, ExecutableNode source,

-				ObjectNode target) {

-			return canExistExceptionHandler_Edge(container, null, source, target);

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canCreateComment_AnnotatedElementEdge(Comment source, Element target) {

-			if (source != null) {

-				if (source.getAnnotatedElements().contains(target)) {

-					return false;

-				}

-			}

-

-			return canExistComment_AnnotatedElementEdge(source, target);

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canCreateConstraint_ConstrainedElementEdge(Constraint source, Element target) {

-			if (source != null) {

-				if (source.getConstrainedElements().contains(target)) {

-					return false;

-				}

-			}

-

-			return canExistConstraint_ConstrainedElementEdge(source, target);

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canExistAction_LocalPreconditionEdge(Action source, Constraint target) {

-			return true;

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canExistAction_LocalPostconditionEdge(Action source, Constraint target) {

-			return true;

-		}

-

-		/**

-		 * modify the generation to call explicitly custom helper

-		 *

-		 * @generated NOT

-		 */

-		public boolean canExistObjectFlow_Edge(Activity container, ObjectFlow linkInstance, ActivityNode source,

-				ActivityNode target) {

-			try {

-				if (source instanceof Action) {

-					// rule validateObjectFlow_validateNoActions

-					// rule workaround by addition of pins in case of Action

-					if (!CustomObjectFlowEditHelper.canStartNewObjectFlow((Action) source)) {

-						return false;

-					}

-				}

-				if (source instanceof InputPin) {

-					// rule validateInputPin_validateOutgoingEdgesStructuredOnly

-					if (source.getOwner() instanceof StructuredActivityNode) {

-						if (target != null && !source.getOwner().equals(target.getInStructuredNode())) {

-							return false;

-						}

-					} else {

-						return false;

-					}

-				}

-				if (source instanceof InitialNode) {

-					// rule validateInitialNode_validateControlEdges

-					return false;

-				}

-				if (source instanceof FinalNode) {

-					// rule validateFinalNode_validateNoOutgoingEdges

-					return false;

-				}

-				if (source instanceof JoinNode) {

-					// rule validateJoinNode_validateOneOutgoingEdge

-					if (!source.getOutgoings().isEmpty()) {

-						return false;

-					}

-					/*

-					 * rule validateJoinNode_validateIncomingObjectFlow :

-					 * We do not prevent creation of an outgoing ObjectFlow even if there is no incoming ObjectFlow.

-					 * We let the possibility that the user intends to add an incoming ObjectFlow later.

-					 */

-				}

-				if (source instanceof ForkNode) {

-					// rule validateForkNode_validateEdges on source Fork node

-					ActivityEdge outgoingControlFlow = source.getOutgoing(null, true,

-							UMLPackage.eINSTANCE.getControlFlow());

-					ActivityEdge incomingControlFlow = source.getIncoming(null, true,

-							UMLPackage.eINSTANCE.getControlFlow());

-					if (outgoingControlFlow != null || incomingControlFlow != null) {

-						// there is a ControlFlow which means there must be no ObjectFlow

-						return false;

-					}

-				}

-				if (source instanceof MergeNode) {

-					// rule validateMergeNode_validateOneOutgoingEdge

-					if (!source.getOutgoings().isEmpty()) {

-						return false;

-					}

-					// rule validateMergeNode_validateEdges on source Merge node

-					ActivityEdge outgoingControlFlow = source.getOutgoing(null, true,

-							UMLPackage.eINSTANCE.getControlFlow());

-					ActivityEdge incomingControlFlow = source.getIncoming(null, true,

-							UMLPackage.eINSTANCE.getControlFlow());

-					if (outgoingControlFlow != null || incomingControlFlow != null) {

-						// there is a ControlFlow which means there must be no ObjectFlow

-						return false;

-					}

-				}

-				if (source instanceof DecisionNode) {

-					// rule validateDecisionNode_validateEdges on source Decision node

-					ActivityEdge outgoingControlFlow = source.getOutgoing(null, true,

-							UMLPackage.eINSTANCE.getControlFlow());

-					ActivityEdge incomingControlFlow = source.getIncoming(null, true,

-							UMLPackage.eINSTANCE.getControlFlow());

-					if (outgoingControlFlow != null || incomingControlFlow != null) {

-						// there is a ControlFlow which means there must be no ObjectFlow

-						return false;

-					}

-				}

-				if (source instanceof ActivityParameterNode) {

-					// rule validateActivityParameterNode_validateIncomingOrOutgoing

-					EList<ActivityEdge> incomings = source.getIncomings();

-					if (!incomings.isEmpty()) {

-						return false;

-					}

-				}

-				if (target instanceof Action) {

-					// rule validateObjectFlow_validateNoActions

-					// rule workaround by addition of pins in case of Action

-					if (!CustomObjectFlowEditHelper.canEndNewObjectFlow((Action) target)) {

-						return false;

-					}

-				}

-				if (target instanceof OutputPin) {

-					// rule validateOutputPin_validateIncomingEdgesStructuredOnly

-					if (target.getOwner() instanceof StructuredActivityNode) {

-						if (source != null && !target.getOwner().equals(source.getInStructuredNode())) {

-							return false;

-						}

-					} else {

-						return false;

-					}

-				}

-				if (target instanceof InitialNode) {

-					// rule validateInitialNode_validateNoIncomingEdges

-					return false;

-				}

-				if (target instanceof JoinNode) {

-					// rule validateJoinNode_validateIncomingObjectFlow

-					ActivityEdge outgoingControlFlow = target.getOutgoing(null, true,

-							UMLPackage.eINSTANCE.getControlFlow());

-					if (outgoingControlFlow != null) {

-						// the outgoing edge is a ControlFlow which means there must be no incoming ObjectFlow

-						return false;

-					}

-				}

-				if (target instanceof ForkNode) {

-					// rule validateForkNode_validateOneIncomingEdge

-					if (!target.getIncomings().isEmpty()) {

-						return false;

-					}

-					// rule validateForkNode_validateEdges on target Fork node

-					ActivityEdge outgoingControlFlow = target.getOutgoing(null, true,

-							UMLPackage.eINSTANCE.getControlFlow());

-					ActivityEdge incomingControlFlow = target.getIncoming(null, true,

-							UMLPackage.eINSTANCE.getControlFlow());

-					if (outgoingControlFlow != null || incomingControlFlow != null) {

-						// there is a ControlFlow which means there must be no ObjectFlow

-						return false;

-					}

-				}

-				if (target instanceof MergeNode) {

-					// rule validateMergeNode_validateEdges on target Merge node

-					ActivityEdge outgoingControlFlow = target.getOutgoing(null, true,

-							UMLPackage.eINSTANCE.getControlFlow());

-					ActivityEdge incomingControlFlow = target.getIncoming(null, true,

-							UMLPackage.eINSTANCE.getControlFlow());

-					if (outgoingControlFlow != null || incomingControlFlow != null) {

-						// there is a ControlFlow which means there must be no ObjectFlow

-						return false;

-					}

-				}

-				if (target instanceof DecisionNode) {

-					// rule validateDecisionNode_validateIncomingOutgoingEdges

-					if (target.getIncomings().size() >= 2) {

-						// no more than two incoming edges

-						return false;

-					}

-					// rule validateDecisionNode_validateEdges on target Decision node

-					ActivityEdge outgoingControlFlow = target.getOutgoing(null, true,

-							UMLPackage.eINSTANCE.getControlFlow());

-					ActivityEdge incomingControlFlow = target.getIncoming(null, true,

-							UMLPackage.eINSTANCE.getControlFlow());

-					if (outgoingControlFlow != null || incomingControlFlow != null) {

-						/*

-						 * There is a ControlFlow which means there must be no

-						 * ObjectFlow but the decision flow itself.

-						 * We let the user insert up to one ObjectFlow for being

-						 * able to select the decision flow among existing

-						 * input flows.

-						 */

-						if (target.getIncoming(null, true, UMLPackage.eINSTANCE.getObjectFlow()) != null) {

-							// there is already an object flow which is intended to become the decision flow

-							return false;

-						}

-					}

-				}

-				if (target instanceof ActivityParameterNode) {

-					// rule validateActivityParameterNode_validateIncomingOrOutgoing

-					EList<ActivityEdge> outgoings = target.getOutgoings();

-					if (!outgoings.isEmpty()) {

-						return false;

-					}

-				}

-				return true;

-			} catch (Exception e) {

-				UMLDiagramEditorPlugin.getInstance().logError("Link constraint evaluation error", e); //$NON-NLS-1$

-				return false;

-			}

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canExistControlFlow_Edge(Activity container, ControlFlow linkInstance, ActivityNode source,

-				ActivityNode target) {

-			try {

-				if (source instanceof ObjectNode) {

-					if (!((ObjectNode) source).isControlType()) {

-						// rule validateControlFlow_validateObjectNodes

-						return false;

-					}

-				}

-				if (source instanceof InputPin) {

-					// rule validateInputPin_validateOutgoingEdgesStructuredOnly

-					if (source.getOwner() instanceof StructuredActivityNode) {

-						if (target != null && !source.getOwner().equals(target.getInStructuredNode())) {

-							return false;

-						}

-					} else {

-						return false;

-					}

-				}

-				if (source instanceof FinalNode) {

-					// rule validateFinalNode_validateNoOutgoingEdges

-					return false;

-				}

-				if (source instanceof JoinNode) {

-					// rule validateJoinNode_validateOneOutgoingEdge

-					if (!source.getOutgoings().isEmpty()) {

-						return false;

-					}

-					// rule validateJoinNode_validateIncomingObjectFlow

-					ActivityEdge incomingObjectFlow = source.getIncoming(null, true,

-							UMLPackage.eINSTANCE.getObjectFlow());

-					if (incomingObjectFlow != null) {

-						// the outgoing edge must be an ObjectFlow

-						return false;

-					}

-				}

-				if (source instanceof ForkNode) {

-					// rule validateForkNode_validateEdges on source Fork node

-					ActivityEdge outgoingObjectFlow = source.getOutgoing(null, true,

-							UMLPackage.eINSTANCE.getObjectFlow());

-					ActivityEdge incomingObjectFlow = source.getIncoming(null, true,

-							UMLPackage.eINSTANCE.getObjectFlow());

-					if (outgoingObjectFlow != null || incomingObjectFlow != null) {

-						// there is an ObjectFlow which means there must be no ControlFlow

-						return false;

-					}

-				}

-				if (source instanceof MergeNode) {

-					// rule validateMergeNode_validateOneOutgoingEdge

-					if (!source.getOutgoings().isEmpty()) {

-						return false;

-					}

-					// rule validateMergeNode_validateEdges on source Merge node

-					ActivityEdge outgoingObjectFlow = source.getOutgoing(null, true,

-							UMLPackage.eINSTANCE.getObjectFlow());

-					ActivityEdge incomingObjectFlow = source.getIncoming(null, true,

-							UMLPackage.eINSTANCE.getObjectFlow());

-					if (outgoingObjectFlow != null || incomingObjectFlow != null) {

-						// there is an ObjectFlow which means there must be no ControlFlow

-						return false;

-					}

-				}

-				if (source instanceof DecisionNode) {

-					// rule validateDecisionNode_validateEdges on source Decision node

-					ActivityEdge outgoingObjectFlow = source.getOutgoing(null, true,

-							UMLPackage.eINSTANCE.getObjectFlow());

-					int incomingObjectFlowNumber = 0;

-					for (ActivityEdge incomingEdge : source.getIncomings()) {

-						if (incomingEdge instanceof ObjectFlow) {

-							incomingObjectFlowNumber++;

-						}

-					}

-					if (outgoingObjectFlow != null || incomingObjectFlowNumber > 1) {

-						// there is an ObjectFlow (not intended for decisionInputFlow) which means there must be no ControlFlow

-						return false;

-					}

-				}

-				if (target instanceof ObjectNode) {

-					if (!((ObjectNode) target).isControlType()) {

-						// rule validateControlFlow_validateObjectNodes

-						return false;

-					}

-				}

-				if (target instanceof OutputPin) {

-					// rule validateOutputPin_validateIncomingEdgesStructuredOnly

-					if (target.getOwner() instanceof StructuredActivityNode) {

-						if (source != null && !target.getOwner().equals(source.getInStructuredNode())) {

-							return false;

-						}

-					} else {

-						return false;

-					}

-				}

-				if (target instanceof InitialNode) {

-					// rule validateInitialNode_validateNoIncomingEdges

-					return false;

-				}

-				if (target instanceof ForkNode) {

-					// rule validateForkNode_validateOneIncomingEdge

-					if (!target.getIncomings().isEmpty()) {

-						return false;

-					}

-					// rule validateForkNode_validateEdges on target Fork node

-					ActivityEdge outgoingObjectFlow = target.getOutgoing(null, true,

-							UMLPackage.eINSTANCE.getObjectFlow());

-					ActivityEdge incomingObjectFlow = target.getIncoming(null, true,

-							UMLPackage.eINSTANCE.getObjectFlow());

-					if (outgoingObjectFlow != null || incomingObjectFlow != null) {

-						// there is an ObjectFlow which means there must be no ControlFlow

-						return false;

-					}

-				}

-				if (target instanceof MergeNode) {

-					// rule validateMergeNode_validateEdges on target Merge node

-					ActivityEdge outgoingObjectFlow = target.getOutgoing(null, true,

-							UMLPackage.eINSTANCE.getObjectFlow());

-					ActivityEdge incomingObjectFlow = target.getIncoming(null, true,

-							UMLPackage.eINSTANCE.getObjectFlow());

-					if (outgoingObjectFlow != null || incomingObjectFlow != null) {

-						// there is an ObjectFlow which means there must be no ControlFlow

-						return false;

-					}

-				}

-				if (target instanceof DecisionNode) {

-					// rule validateDecisionNode_validateIncomingOutgoingEdges

-					if (target.getIncomings().size() >= 2) {

-						// no more than two incoming edges

-						return false;

-					}

-					// rule validateDecisionNode_validateEdges on target Decision node

-					ActivityEdge outgoingObjectFlow = target.getOutgoing(null, true,

-							UMLPackage.eINSTANCE.getObjectFlow());

-					ActivityEdge incomingObjectFlow = null;

-					for (ActivityEdge incomingEdge : target.getIncomings()) {

-						// filter the decision flow

-						if (incomingEdge instanceof ObjectFlow

-								&& incomingEdge != ((DecisionNode) target).getDecisionInputFlow()) {

-							incomingObjectFlow = incomingEdge;

-						}

-					}

-					if (outgoingObjectFlow != null || incomingObjectFlow != null) {

-						// there is an ObjectFlow which means there must be no ControlFlow

-						return false;

-					}

-				}

-				return true;

-			} catch (Exception e) {

-				UMLDiagramEditorPlugin.getInstance().logError("Link constraint evaluation error", e); //$NON-NLS-1$

-				return false;

-			}

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canExistExceptionHandler_Edge(ExecutableNode container, ExceptionHandler linkInstance,

-				ExecutableNode source, ObjectNode target) {

-			return true;

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canExistComment_AnnotatedElementEdge(Comment source, Element target) {

-			return true;

-		}

-

-		/**

-		 * @generated

-		 */

-		public boolean canExistConstraint_ConstrainedElementEdge(Constraint source, Element target) {

-			return true;

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2009 Atos Origin.
+ *
+ *
+ * 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:
+ *   Atos Origin - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.activity.edit.policies;
+
+import java.util.Iterator;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gef.requests.ReconnectRequest;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;
+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;
+import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.SemanticEditPolicy;
+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.MoveElementsCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.helpers.GeneratedEditHelperBase;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.uml.diagram.activity.helper.CustomObjectFlowEditHelper;
+import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes;
+import org.eclipse.uml2.uml.Action;
+import org.eclipse.uml2.uml.Activity;
+import org.eclipse.uml2.uml.ActivityEdge;
+import org.eclipse.uml2.uml.ActivityNode;
+import org.eclipse.uml2.uml.ActivityParameterNode;
+import org.eclipse.uml2.uml.Comment;
+import org.eclipse.uml2.uml.Constraint;
+import org.eclipse.uml2.uml.ControlFlow;
+import org.eclipse.uml2.uml.DecisionNode;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.ExceptionHandler;
+import org.eclipse.uml2.uml.ExecutableNode;
+import org.eclipse.uml2.uml.FinalNode;
+import org.eclipse.uml2.uml.ForkNode;
+import org.eclipse.uml2.uml.InitialNode;
+import org.eclipse.uml2.uml.InputPin;
+import org.eclipse.uml2.uml.JoinNode;
+import org.eclipse.uml2.uml.MergeNode;
+import org.eclipse.uml2.uml.ObjectFlow;
+import org.eclipse.uml2.uml.ObjectNode;
+import org.eclipse.uml2.uml.OutputPin;
+import org.eclipse.uml2.uml.StructuredActivityNode;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
+
+	/**
+	 * Extended request data key to hold editpart visual id.
+	 *
+	 * @generated
+	 */
+	public static final String VISUAL_ID_KEY = "visual_id"; //$NON-NLS-1$
+
+	/**
+	 * Extended request data key to hold the edge view during a reconnect request.
+	 *
+	 * @generated
+	 */
+	public static final String GRAPHICAL_RECONNECTED_EDGE = "graphical_edge"; //$NON-NLS-1$
+
+	/**
+	 * @generated
+	 */
+	private final IElementType myElementType;
+
+	/**
+	 * @generated
+	 */
+	protected UMLBaseItemSemanticEditPolicy(IElementType elementType) {
+		myElementType = elementType;
+	}
+
+	/**
+	 * Extended request data key to hold editpart visual id.
+	 * Add visual id of edited editpart to extended data of the request
+	 * so command switch can decide what kind of diagram element is being edited.
+	 * It is done in those cases when it's not possible to deduce diagram
+	 * element kind from domain element.
+	 *
+	 * @generated
+	 */
+	@Override
+	@SuppressWarnings("unchecked")
+	public Command getCommand(Request request) {
+		if (request instanceof ReconnectRequest) {
+			Object view = ((ReconnectRequest) request).getConnectionEditPart().getModel();
+			if (view instanceof View) {
+				String id = UMLVisualIDRegistry.getVisualID((View) view);
+				request.getExtendedData().put(VISUAL_ID_KEY, id);
+				request.getExtendedData().put(GRAPHICAL_RECONNECTED_EDGE, view);
+			}
+		}
+		return super.getCommand(request);
+	}
+
+	/**
+	 * Returns visual id from request parameters.
+	 *
+	 * @generated
+	 */
+	protected String getVisualID(IEditCommandRequest request) {
+		return (String) request.getParameter(VISUAL_ID_KEY);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected Command getSemanticCommand(IEditCommandRequest request) {
+		IEditCommandRequest completedRequest = completeRequest(request);
+		Command semanticCommand = getSemanticCommandSwitch(completedRequest);
+		semanticCommand = getEditHelperCommand(completedRequest, semanticCommand);
+		if (completedRequest instanceof DestroyRequest) {
+			DestroyRequest destroyRequest = (DestroyRequest) completedRequest;
+			return shouldProceed(destroyRequest) ? addDeleteViewCommand(semanticCommand, destroyRequest) : null;
+		}
+		return semanticCommand;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Command addDeleteViewCommand(Command mainCommand, DestroyRequest completedRequest) {
+		Command deleteViewCommand = getGEFWrapper(new DeleteCommand(getEditingDomain(), (View) getHost().getModel()));
+		return mainCommand == null ? deleteViewCommand : mainCommand.chain(deleteViewCommand);
+	}
+
+	/**
+	 * @generated NOT adding the possibility to globally disabling a request
+	 */
+	private Command getEditHelperCommand(IEditCommandRequest request, Command editPolicyCommand) {
+		// disable the request if necessary
+		if (requestIsDisabled(request)) {
+			return null;
+		}
+		// return command for reorient, as this has already been computed through the edit helpers
+		if (request instanceof ReorientRelationshipRequest) {
+			return editPolicyCommand;
+		}
+		// generated code
+		if (editPolicyCommand != null) {
+			ICommand command = editPolicyCommand instanceof ICommandProxy
+					? ((ICommandProxy) editPolicyCommand).getICommand() : new CommandProxy(editPolicyCommand);
+			request.setParameter(GeneratedEditHelperBase.EDIT_POLICY_COMMAND, command);
+		}
+		IElementType requestContextElementType = getContextElementType(request);
+		if (requestContextElementType != null) {
+			request.setParameter(GeneratedEditHelperBase.CONTEXT_ELEMENT_TYPE, requestContextElementType);
+			ICommand command = requestContextElementType.getEditCommand(request);
+			request.setParameter(GeneratedEditHelperBase.EDIT_POLICY_COMMAND, null);
+			request.setParameter(GeneratedEditHelperBase.CONTEXT_ELEMENT_TYPE, null);
+			if (command != null) {
+				if (!(command instanceof CompositeTransactionalCommand)) {
+					command = new CompositeTransactionalCommand(getEditingDomain(), command.getLabel())
+							.compose(command);
+				}
+				return new ICommandProxy(command);
+			}
+		}
+		return editPolicyCommand;
+	}
+
+	/**
+	 * Check whether the request should be disabled.
+	 *
+	 * @param request
+	 *            the request to analyze
+	 * @return true if the request must not succeed
+	 * @generated NOT
+	 */
+	private boolean requestIsDisabled(IEditCommandRequest request) {
+		if (request instanceof MoveRequest) {
+			// prevent moving a constraint to another parent, since the representation would not be the same
+			for (Object element : ((MoveRequest) request).getElementsToMove().keySet()) {
+				if (element instanceof Constraint) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected IElementType getContextElementType(IEditCommandRequest request) {
+		IElementType requestContextElementType = UMLElementTypes.getElementType(getVisualID(request));
+		return requestContextElementType != null ? requestContextElementType : myElementType;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Command getSemanticCommandSwitch(IEditCommandRequest req) {
+		if (req instanceof CreateRelationshipRequest) {
+			return getCreateRelationshipCommand((CreateRelationshipRequest) req);
+		} else if (req instanceof CreateElementRequest) {
+			return getCreateCommand((CreateElementRequest) req);
+		} else if (req instanceof ConfigureRequest) {
+			return getConfigureCommand((ConfigureRequest) req);
+		} else if (req instanceof DestroyElementRequest) {
+			return getDestroyElementCommand((DestroyElementRequest) req);
+		} else if (req instanceof DestroyReferenceRequest) {
+			return getDestroyReferenceCommand((DestroyReferenceRequest) req);
+		} else if (req instanceof DuplicateElementsRequest) {
+			return getDuplicateCommand((DuplicateElementsRequest) req);
+		} else if (req instanceof GetEditContextRequest) {
+			return getEditContextCommand((GetEditContextRequest) req);
+		} else if (req instanceof MoveRequest) {
+			return getMoveCommand((MoveRequest) req);
+		} else if (req instanceof ReorientReferenceRelationshipRequest) {
+			return getReorientReferenceRelationshipCommand((ReorientReferenceRelationshipRequest) req);
+		} else if (req instanceof ReorientRelationshipRequest) {
+			return getReorientRelationshipCommand((ReorientRelationshipRequest) req);
+		} else if (req instanceof SetRequest) {
+			return getSetCommand((SetRequest) req);
+		}
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Command getConfigureCommand(ConfigureRequest req) {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {
+		IElementEditService commandService = ElementEditServiceUtils
+				.getCommandProvider(((IGraphicalEditPart) getHost()).resolveSemanticElement());
+		if (req.getElementType() != null) {
+			commandService = ElementEditServiceUtils.getCommandProvider(req.getElementType(), req.getClientContext());
+		}
+
+		if (commandService == null) {
+			return UnexecutableCommand.INSTANCE;
+		}
+
+		ICommand semanticCommand = commandService.getEditCommand(req);
+
+		if ((semanticCommand != null) && (semanticCommand.canExecute())) {
+			return getGEFWrapper(semanticCommand);
+		}
+		return UnexecutableCommand.INSTANCE;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Command getCreateCommand(CreateElementRequest req) {
+		IElementType requestElementType = req.getElementType();
+		if (requestElementType instanceof IElementType) {
+			IElementEditService commandProvider = ElementEditServiceUtils.getCommandProvider(req.getContainer());
+			if (commandProvider != null) {
+				ICommand command = commandProvider.getEditCommand(req);
+				if (command != null && command.canExecute()) {
+					return new ICommandProxy(command);
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected ICommand getSemanticCreationCommand(CreateElementRequest req) {
+		IElementEditService commandService = ElementEditServiceUtils.getCommandProvider(req.getContainer());
+		if (commandService == null) {
+			return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;
+		}
+		return commandService.getEditCommand(req);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Command getSetCommand(SetRequest req) {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Command getEditContextCommand(GetEditContextRequest req) {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Command getDestroyElementCommand(DestroyElementRequest req) {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Command getDuplicateCommand(DuplicateElementsRequest req) {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Command getMoveCommand(MoveRequest req) {
+		EObject targetCEObject = req.getTargetContainer();
+		if (targetCEObject != null) {
+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(targetCEObject);
+			if (provider != null) {
+				ICommand moveCommand = provider.getEditCommand(req);
+				if (moveCommand != null) {
+					return new ICommandProxy(moveCommand);
+				}
+			}
+			return UnexecutableCommand.INSTANCE;
+		} else {
+			return getGEFWrapper(new MoveElementsCommand(req));
+		}
+
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {
+		return UnexecutableCommand.INSTANCE;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {
+		return UnexecutableCommand.INSTANCE;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected final Command getGEFWrapper(ICommand cmd) {
+		return (cmd == null) ? UnexecutableCommand.INSTANCE : new ICommandProxy(cmd);
+	}
+
+	/**
+	 * Returns editing domain from the host edit part.
+	 *
+	 * @generated
+	 */
+	protected TransactionalEditingDomain getEditingDomain() {
+		return ((IGraphicalEditPart) getHost()).getEditingDomain();
+	}
+
+	/**
+	 * Clean all shortcuts to the host element from the same diagram
+	 *
+	 * @generated
+	 */
+	protected void addDestroyShortcutsCommand(ICompositeCommand cmd, View view) {
+		assert view.getEAnnotation("Shortcut") == null; //$NON-NLS-1$
+		for (Iterator<?> it = view.getDiagram().getChildren().iterator(); it.hasNext();) {
+			View nextView = (View) it.next();
+			if (nextView.getEAnnotation("Shortcut") == null || !nextView.isSetElement() //$NON-NLS-1$
+					|| nextView.getElement() != view.getElement()) {
+				continue;
+			}
+			cmd.add(new DeleteCommand(getEditingDomain(), nextView));
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	public static LinkConstraints getLinkConstraints() {
+		LinkConstraints cached = UMLDiagramEditorPlugin.getInstance().getLinkConstraints();
+		if (cached == null) {
+			UMLDiagramEditorPlugin.getInstance().setLinkConstraints(cached = new LinkConstraints());
+		}
+		return cached;
+	}
+
+	/**
+	 * @generated
+	 */
+	public static class LinkConstraints {
+
+		/**
+		 * @generated
+		 */
+		public LinkConstraints() { // use static method #getLinkConstraints() to access instance
+		}
+
+		/**
+		 * @generated
+		 */
+		public boolean canCreateAction_LocalPreconditionEdge(Action source, Constraint target) {
+			if (source != null) {
+				if (source.getLocalPreconditions().contains(target)) {
+					return false;
+				}
+				if (source == target) {
+					return false;
+				}
+			}
+
+			return canExistAction_LocalPreconditionEdge(source, target);
+		}
+
+		/**
+		 * @generated
+		 */
+		public boolean canCreateAction_LocalPostconditionEdge(Action source, Constraint target) {
+			if (source != null) {
+				if (source.getLocalPostconditions().contains(target)) {
+					return false;
+				}
+				if (source == target) {
+					return false;
+				}
+			}
+
+			return canExistAction_LocalPostconditionEdge(source, target);
+		}
+
+		/**
+		 * @generated
+		 */
+		public boolean canCreateObjectFlow_Edge(Activity container, ActivityNode source, ActivityNode target) {
+			return canExistObjectFlow_Edge(container, null, source, target);
+		}
+
+		/**
+		 * @generated
+		 */
+		public boolean canCreateControlFlow_Edge(Activity container, ActivityNode source, ActivityNode target) {
+			return canExistControlFlow_Edge(container, null, source, target);
+		}
+
+		/**
+		 * @generated
+		 */
+		public boolean canCreateExceptionHandler_Edge(ExecutableNode container, ExecutableNode source,
+				ObjectNode target) {
+			return canExistExceptionHandler_Edge(container, null, source, target);
+		}
+
+		/**
+		 * @generated
+		 */
+		public boolean canCreateComment_AnnotatedElementEdge(Comment source, Element target) {
+			if (source != null) {
+				if (source.getAnnotatedElements().contains(target)) {
+					return false;
+				}
+			}
+
+			return canExistComment_AnnotatedElementEdge(source, target);
+		}
+
+		/**
+		 * @generated
+		 */
+		public boolean canCreateConstraint_ConstrainedElementEdge(Constraint source, Element target) {
+			if (source != null) {
+				if (source.getConstrainedElements().contains(target)) {
+					return false;
+				}
+			}
+
+			return canExistConstraint_ConstrainedElementEdge(source, target);
+		}
+
+		/**
+		 * @generated
+		 */
+		public boolean canExistAction_LocalPreconditionEdge(Action source, Constraint target) {
+			return true;
+		}
+
+		/**
+		 * @generated
+		 */
+		public boolean canExistAction_LocalPostconditionEdge(Action source, Constraint target) {
+			return true;
+		}
+
+		/**
+		 * modify the generation to call explicitly custom helper
+		 *
+		 * @generated NOT
+		 */
+		public boolean canExistObjectFlow_Edge(Activity container, ObjectFlow linkInstance, ActivityNode source,
+				ActivityNode target) {
+			try {
+				if (source instanceof Action) {
+					// rule validateObjectFlow_validateNoActions
+					// rule workaround by addition of pins in case of Action
+					if (!CustomObjectFlowEditHelper.canStartNewObjectFlow((Action) source)) {
+						return false;
+					}
+				}
+				if (source instanceof InputPin) {
+					// rule validateInputPin_validateOutgoingEdgesStructuredOnly
+					if (source.getOwner() instanceof StructuredActivityNode) {
+						if (target != null && !source.getOwner().equals(target.getInStructuredNode())) {
+							return false;
+						}
+					} else {
+						return false;
+					}
+				}
+				if (source instanceof InitialNode) {
+					// rule validateInitialNode_validateControlEdges
+					return false;
+				}
+				if (source instanceof FinalNode) {
+					// rule validateFinalNode_validateNoOutgoingEdges
+					return false;
+				}
+				if (source instanceof JoinNode) {
+					// rule validateJoinNode_validateOneOutgoingEdge
+					if (!source.getOutgoings().isEmpty()) {
+						return false;
+					}
+					/*
+					 * rule validateJoinNode_validateIncomingObjectFlow :
+					 * We do not prevent creation of an outgoing ObjectFlow even if there is no incoming ObjectFlow.
+					 * We let the possibility that the user intends to add an incoming ObjectFlow later.
+					 */
+				}
+				if (source instanceof ForkNode) {
+					// rule validateForkNode_validateEdges on source Fork node
+					ActivityEdge outgoingControlFlow = source.getOutgoing(null, true,
+							UMLPackage.eINSTANCE.getControlFlow());
+					ActivityEdge incomingControlFlow = source.getIncoming(null, true,
+							UMLPackage.eINSTANCE.getControlFlow());
+					if (outgoingControlFlow != null || incomingControlFlow != null) {
+						// there is a ControlFlow which means there must be no ObjectFlow
+						return false;
+					}
+				}
+				if (source instanceof MergeNode) {
+					// rule validateMergeNode_validateOneOutgoingEdge
+					if (!source.getOutgoings().isEmpty()) {
+						return false;
+					}
+					// rule validateMergeNode_validateEdges on source Merge node
+					ActivityEdge outgoingControlFlow = source.getOutgoing(null, true,
+							UMLPackage.eINSTANCE.getControlFlow());
+					ActivityEdge incomingControlFlow = source.getIncoming(null, true,
+							UMLPackage.eINSTANCE.getControlFlow());
+					if (outgoingControlFlow != null || incomingControlFlow != null) {
+						// there is a ControlFlow which means there must be no ObjectFlow
+						return false;
+					}
+				}
+				if (source instanceof DecisionNode) {
+					// rule validateDecisionNode_validateEdges on source Decision node
+					ActivityEdge outgoingControlFlow = source.getOutgoing(null, true,
+							UMLPackage.eINSTANCE.getControlFlow());
+					ActivityEdge incomingControlFlow = source.getIncoming(null, true,
+							UMLPackage.eINSTANCE.getControlFlow());
+					if (outgoingControlFlow != null || incomingControlFlow != null) {
+						// there is a ControlFlow which means there must be no ObjectFlow
+						return false;
+					}
+				}
+				if (source instanceof ActivityParameterNode) {
+					// rule validateActivityParameterNode_validateIncomingOrOutgoing
+					EList<ActivityEdge> incomings = source.getIncomings();
+					if (!incomings.isEmpty()) {
+						return false;
+					}
+				}
+				if (target instanceof Action) {
+					// rule validateObjectFlow_validateNoActions
+					// rule workaround by addition of pins in case of Action
+					if (!CustomObjectFlowEditHelper.canEndNewObjectFlow((Action) target)) {
+						return false;
+					}
+				}
+				if (target instanceof OutputPin) {
+					// rule validateOutputPin_validateIncomingEdgesStructuredOnly
+					if (target.getOwner() instanceof StructuredActivityNode) {
+						if (source != null && !target.getOwner().equals(source.getInStructuredNode())) {
+							return false;
+						}
+					} else {
+						return false;
+					}
+				}
+				if (target instanceof InitialNode) {
+					// rule validateInitialNode_validateNoIncomingEdges
+					return false;
+				}
+				if (target instanceof JoinNode) {
+					// rule validateJoinNode_validateIncomingObjectFlow
+					ActivityEdge outgoingControlFlow = target.getOutgoing(null, true,
+							UMLPackage.eINSTANCE.getControlFlow());
+					if (outgoingControlFlow != null) {
+						// the outgoing edge is a ControlFlow which means there must be no incoming ObjectFlow
+						return false;
+					}
+				}
+				if (target instanceof ForkNode) {
+					// rule validateForkNode_validateOneIncomingEdge
+					if (!target.getIncomings().isEmpty()) {
+						return false;
+					}
+					// rule validateForkNode_validateEdges on target Fork node
+					ActivityEdge outgoingControlFlow = target.getOutgoing(null, true,
+							UMLPackage.eINSTANCE.getControlFlow());
+					ActivityEdge incomingControlFlow = target.getIncoming(null, true,
+							UMLPackage.eINSTANCE.getControlFlow());
+					if (outgoingControlFlow != null || incomingControlFlow != null) {
+						// there is a ControlFlow which means there must be no ObjectFlow
+						return false;
+					}
+				}
+				if (target instanceof MergeNode) {
+					// rule validateMergeNode_validateEdges on target Merge node
+					ActivityEdge outgoingControlFlow = target.getOutgoing(null, true,
+							UMLPackage.eINSTANCE.getControlFlow());
+					ActivityEdge incomingControlFlow = target.getIncoming(null, true,
+							UMLPackage.eINSTANCE.getControlFlow());
+					if (outgoingControlFlow != null || incomingControlFlow != null) {
+						// there is a ControlFlow which means there must be no ObjectFlow
+						return false;
+					}
+				}
+				if (target instanceof DecisionNode) {
+					// rule validateDecisionNode_validateIncomingOutgoingEdges
+					if (target.getIncomings().size() >= 2) {
+						// no more than two incoming edges
+						return false;
+					}
+					// rule validateDecisionNode_validateEdges on target Decision node
+					ActivityEdge outgoingControlFlow = target.getOutgoing(null, true,
+							UMLPackage.eINSTANCE.getControlFlow());
+					ActivityEdge incomingControlFlow = target.getIncoming(null, true,
+							UMLPackage.eINSTANCE.getControlFlow());
+					if (outgoingControlFlow != null || incomingControlFlow != null) {
+						/*
+						 * There is a ControlFlow which means there must be no
+						 * ObjectFlow but the decision flow itself.
+						 * We let the user insert up to one ObjectFlow for being
+						 * able to select the decision flow among existing
+						 * input flows.
+						 */
+						if (target.getIncoming(null, true, UMLPackage.eINSTANCE.getObjectFlow()) != null) {
+							// there is already an object flow which is intended to become the decision flow
+							return false;
+						}
+					}
+				}
+				if (target instanceof ActivityParameterNode) {
+					// rule validateActivityParameterNode_validateIncomingOrOutgoing
+					EList<ActivityEdge> outgoings = target.getOutgoings();
+					if (!outgoings.isEmpty()) {
+						return false;
+					}
+				}
+				return true;
+			} catch (Exception e) {
+				UMLDiagramEditorPlugin.getInstance().logError("Link constraint evaluation error", e); //$NON-NLS-1$
+				return false;
+			}
+		}
+
+		/**
+		 * @generated
+		 */
+		public boolean canExistControlFlow_Edge(Activity container, ControlFlow linkInstance, ActivityNode source,
+				ActivityNode target) {
+			try {
+				if (source instanceof ObjectNode) {
+					if (!((ObjectNode) source).isControlType()) {
+						// rule validateControlFlow_validateObjectNodes
+						return false;
+					}
+				}
+				if (source instanceof InputPin) {
+					// rule validateInputPin_validateOutgoingEdgesStructuredOnly
+					if (source.getOwner() instanceof StructuredActivityNode) {
+						if (target != null && !source.getOwner().equals(target.getInStructuredNode())) {
+							return false;
+						}
+					} else {
+						return false;
+					}
+				}
+				if (source instanceof FinalNode) {
+					// rule validateFinalNode_validateNoOutgoingEdges
+					return false;
+				}
+				if (source instanceof JoinNode) {
+					// rule validateJoinNode_validateOneOutgoingEdge
+					if (!source.getOutgoings().isEmpty()) {
+						return false;
+					}
+					// rule validateJoinNode_validateIncomingObjectFlow
+					ActivityEdge incomingObjectFlow = source.getIncoming(null, true,
+							UMLPackage.eINSTANCE.getObjectFlow());
+					if (incomingObjectFlow != null) {
+						// the outgoing edge must be an ObjectFlow
+						return false;
+					}
+				}
+				if (source instanceof ForkNode) {
+					// rule validateForkNode_validateEdges on source Fork node
+					ActivityEdge outgoingObjectFlow = source.getOutgoing(null, true,
+							UMLPackage.eINSTANCE.getObjectFlow());
+					ActivityEdge incomingObjectFlow = source.getIncoming(null, true,
+							UMLPackage.eINSTANCE.getObjectFlow());
+					if (outgoingObjectFlow != null || incomingObjectFlow != null) {
+						// there is an ObjectFlow which means there must be no ControlFlow
+						return false;
+					}
+				}
+				if (source instanceof MergeNode) {
+					// rule validateMergeNode_validateOneOutgoingEdge
+					if (!source.getOutgoings().isEmpty()) {
+						return false;
+					}
+					// rule validateMergeNode_validateEdges on source Merge node
+					ActivityEdge outgoingObjectFlow = source.getOutgoing(null, true,
+							UMLPackage.eINSTANCE.getObjectFlow());
+					ActivityEdge incomingObjectFlow = source.getIncoming(null, true,
+							UMLPackage.eINSTANCE.getObjectFlow());
+					if (outgoingObjectFlow != null || incomingObjectFlow != null) {
+						// there is an ObjectFlow which means there must be no ControlFlow
+						return false;
+					}
+				}
+				if (source instanceof DecisionNode) {
+					// rule validateDecisionNode_validateEdges on source Decision node
+					ActivityEdge outgoingObjectFlow = source.getOutgoing(null, true,
+							UMLPackage.eINSTANCE.getObjectFlow());
+					int incomingObjectFlowNumber = 0;
+					for (ActivityEdge incomingEdge : source.getIncomings()) {
+						if (incomingEdge instanceof ObjectFlow) {
+							incomingObjectFlowNumber++;
+						}
+					}
+					if (outgoingObjectFlow != null || incomingObjectFlowNumber > 1) {
+						// there is an ObjectFlow (not intended for decisionInputFlow) which means there must be no ControlFlow
+						return false;
+					}
+				}
+				if (target instanceof ObjectNode) {
+					if (!((ObjectNode) target).isControlType()) {
+						// rule validateControlFlow_validateObjectNodes
+						return false;
+					}
+				}
+				if (target instanceof OutputPin) {
+					// rule validateOutputPin_validateIncomingEdgesStructuredOnly
+					if (target.getOwner() instanceof StructuredActivityNode) {
+						if (source != null && !target.getOwner().equals(source.getInStructuredNode())) {
+							return false;
+						}
+					} else {
+						return false;
+					}
+				}
+				if (target instanceof InitialNode) {
+					// rule validateInitialNode_validateNoIncomingEdges
+					return false;
+				}
+				if (target instanceof ForkNode) {
+					// rule validateForkNode_validateOneIncomingEdge
+					if (!target.getIncomings().isEmpty()) {
+						return false;
+					}
+					// rule validateForkNode_validateEdges on target Fork node
+					ActivityEdge outgoingObjectFlow = target.getOutgoing(null, true,
+							UMLPackage.eINSTANCE.getObjectFlow());
+					ActivityEdge incomingObjectFlow = target.getIncoming(null, true,
+							UMLPackage.eINSTANCE.getObjectFlow());
+					if (outgoingObjectFlow != null || incomingObjectFlow != null) {
+						// there is an ObjectFlow which means there must be no ControlFlow
+						return false;
+					}
+				}
+				if (target instanceof MergeNode) {
+					// rule validateMergeNode_validateEdges on target Merge node
+					ActivityEdge outgoingObjectFlow = target.getOutgoing(null, true,
+							UMLPackage.eINSTANCE.getObjectFlow());
+					ActivityEdge incomingObjectFlow = target.getIncoming(null, true,
+							UMLPackage.eINSTANCE.getObjectFlow());
+					if (outgoingObjectFlow != null || incomingObjectFlow != null) {
+						// there is an ObjectFlow which means there must be no ControlFlow
+						return false;
+					}
+				}
+				if (target instanceof DecisionNode) {
+					// rule validateDecisionNode_validateIncomingOutgoingEdges
+					if (target.getIncomings().size() >= 2) {
+						// no more than two incoming edges
+						return false;
+					}
+					// rule validateDecisionNode_validateEdges on target Decision node
+					ActivityEdge outgoingObjectFlow = target.getOutgoing(null, true,
+							UMLPackage.eINSTANCE.getObjectFlow());
+					ActivityEdge incomingObjectFlow = null;
+					for (ActivityEdge incomingEdge : target.getIncomings()) {
+						// filter the decision flow
+						if (incomingEdge instanceof ObjectFlow
+								&& incomingEdge != ((DecisionNode) target).getDecisionInputFlow()) {
+							incomingObjectFlow = incomingEdge;
+						}
+					}
+					if (outgoingObjectFlow != null || incomingObjectFlow != null) {
+						// there is an ObjectFlow which means there must be no ControlFlow
+						return false;
+					}
+				}
+				return true;
+			} catch (Exception e) {
+				UMLDiagramEditorPlugin.getInstance().logError("Link constraint evaluation error", e); //$NON-NLS-1$
+				return false;
+			}
+		}
+
+		/**
+		 * @generated
+		 */
+		public boolean canExistExceptionHandler_Edge(ExecutableNode container, ExceptionHandler linkInstance,
+				ExecutableNode source, ObjectNode target) {
+			return true;
+		}
+
+		/**
+		 * @generated
+		 */
+		public boolean canExistComment_AnnotatedElementEdge(Comment source, Element target) {
+			return true;
+		}
+
+		/**
+		 * @generated
+		 */
+		public boolean canExistConstraint_ConstrainedElementEdge(Constraint source, Element target) {
+			return true;
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/PackageDiagramEditorFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/PackageDiagramEditorFactory.java
index 543bb725198..ae71ceb7538 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/PackageDiagramEditorFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/PackageDiagramEditorFactory.java
@@ -1,84 +1,87 @@
-/*****************************************************************************

- * Copyright (c) 2014 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:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.clazz;

-

-import org.eclipse.emf.common.command.AbstractCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResourceSet;

-import org.eclipse.papyrus.infra.gmfdiag.common.GmfEditorFactory;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;

-

-/**

- * Factory for legacy package diagrams tht migrates them to the viewpoints-defined ones

- *

- * @author Laurent Wouters

- *

- */

-public class PackageDiagramEditorFactory extends GmfEditorFactory {

-

-	/**

-	 * Initializes this factory

-	 */

-	public PackageDiagramEditorFactory() {

-		super(UmlClassDiagramForMultiEditor.class, "Package");

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.GmfEditorFactory#createIPageModel(java.lang.Object)

-	 */

-	@Override

-	public IPageModel createIPageModel(Object pageIdentifier) {

-		migrate((Diagram) pageIdentifier);

-		return super.createIPageModel(pageIdentifier);

-	}

-

-	/**

-	 * Migrate the given package diagram to the viewpoints-defined one

-	 *

-	 * @param diagram

-	 *            The diagram to migrate

-	 */

-	private void migrate(final Diagram diagram) {

-		TransactionalEditingDomain domain = null;

-		try {

-			domain = ServiceUtilsForResourceSet.getInstance().getTransactionalEditingDomain(diagram.eResource().getResourceSet());

-		} catch (ServiceException e) {

-			return;

-		}

-		domain.getCommandStack().execute(new AbstractCommand() {

-			@Override

-			public void execute() {

-				ViewPrototype proto = DiagramUtils.getPrototype(diagram);

-				DiagramUtils.setPrototype(diagram, proto);

-				diagram.setType("PapyrusUMLClassDiagram");

-			}

-

-			@Override

-			public void redo() {

-				execute();

-			}

-

-			@Override

-			public boolean canExecute() {

-				return true;

-			}

-		});

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 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:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.clazz;
+
+import org.eclipse.emf.common.command.AbstractCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResourceSet;
+import org.eclipse.papyrus.infra.gmfdiag.common.GmfEditorFactory;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramPrototype;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
+import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
+
+/**
+ * Factory for legacy package diagrams tht migrates them to the viewpoints-defined ones
+ *
+ * @author Laurent Wouters
+ *
+ */
+public class PackageDiagramEditorFactory extends GmfEditorFactory {
+
+	/**
+	 * Initializes this factory
+	 */
+	public PackageDiagramEditorFactory() {
+		super(UmlClassDiagramForMultiEditor.class, "Package");
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.GmfEditorFactory#createIPageModel(java.lang.Object)
+	 */
+	@Override
+	public IPageModel createIPageModel(Object pageIdentifier) {
+		migrate((Diagram) pageIdentifier);
+		return super.createIPageModel(pageIdentifier);
+	}
+
+	/**
+	 * Migrate the given package diagram to the viewpoints-defined one
+	 *
+	 * @param diagram
+	 *            The diagram to migrate
+	 */
+	private void migrate(final Diagram diagram) {
+		TransactionalEditingDomain domain = null;
+		try {
+			domain = ServiceUtilsForResourceSet.getInstance().getTransactionalEditingDomain(diagram.eResource().getResourceSet());
+		} catch (ServiceException e) {
+			return;
+		}
+		domain.getCommandStack().execute(new AbstractCommand() {
+			@Override
+			public void execute() {
+				ViewPrototype proto = DiagramUtils.getPrototype(diagram);
+				if (proto instanceof DiagramPrototype) {
+					DiagramUtils.setPrototype(diagram, (DiagramPrototype) proto);
+					diagram.setType("PapyrusUMLClassDiagram");
+				}
+			}
+
+			@Override
+			public void redo() {
+				execute();
+			}
+
+			@Override
+			public boolean canExecute() {
+				return true;
+			}
+		});
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/migration/ClassReconcilerForCompartment.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/migration/ClassReconcilerForCompartment_1_2_0.java
index 567e742ec06..3bac8ed066e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/migration/ClassReconcilerForCompartment.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/migration/ClassReconcilerForCompartment_1_2_0.java
@@ -20,7 +20,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.ReconcilerForCompartm
 /**
  * Diagram Reconciler for compartment from 1.1.0 to 1.2.0
  */
-public class ClassReconcilerForCompartment extends ReconcilerForCompartment {
+public class ClassReconcilerForCompartment_1_2_0 extends ReconcilerForCompartment {
 
 	private static final String ClassAttributeCompartmentEditPart_VISUAL_ID = "7017"; //$NON-NLS-1$
 	private static final String ClassOperationCompartmentEditPart_VISUAL_ID = "7018"; //$NON-NLS-1$
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/migration/ClassReconciler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/migration/ClassReconciler_1_1_0.java
index ab5beda8092..c883e42f143 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/migration/ClassReconciler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/migration/ClassReconciler_1_1_0.java
@@ -35,7 +35,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler;
 /**
  * Class Diagram Reconciler from 1.0.0 to 1.1.0
  */
-public class ClassReconciler extends DiagramReconciler {
+public class ClassReconciler_1_1_0 extends DiagramReconciler {
 
 	private final static String CONTAINMENT_LINK_OLD_VISUAL_ID = "4022"; //$NON-NLS-1$
 	private final static String CONTAINMENT_LINK_NEW_VISUAL_ID = "4023"; //$NON-NLS-1$
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/clazzdiagram.configuration b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/clazzdiagram.configuration
deleted file mode 100644
index 77d0c8d003c..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/clazzdiagram.configuration
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<configuration:PapyrusConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmi:id="_ko07IErbEeSdQKzSRatBjg">

-  <viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="_xogdoErbEeSdQKzSRatBjg" name="Default Papyrus Viewpoint">

-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_zzf4YHDtEeWh-MssWmCB_A" name="Inner Class Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/icons/obj16/Diagram_Class.gif" implementationID="PapyrusUMLClassDiagram">

-      <modelRules xmi:id="_zzf4YXDtEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-      </modelRules>

-      <owningRules xmi:id="_zzf4YnDtEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-      </owningRules>

-      <owningRules xmi:id="_zzf4Y3DtEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </owningRules>

-      <categories href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb4txhEeOqHvRyiN87hA"/>

-      <childRules xmi:id="_zzf4ZHDtEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>

-        <origin href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        <insertionPath xmi:id="_zzf4ZXDtEeWh-MssWmCB_A">

-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>

-        </insertionPath>

-      </childRules>

-      <childRules xmi:id="_zzf4ZnDtEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Comment"/>

-        <origin href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-        <insertionPath xmi:id="_zzf4Z3DtEeWh-MssWmCB_A">

-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedComment"/>

-        </insertionPath>

-      </childRules>

-      <paletteRules xmi:id="_zzf4aHDtEeWh-MssWmCB_A" element="clazz.tool.class"/>

-      <paletteRules xmi:id="_zzf4aXDtEeWh-MssWmCB_A" element="clazz.tool.comment"/>

-      <paletteRules xmi:id="_zzf4anDtEeWh-MssWmCB_A" element="clazz.tool.interface"/>

-      <paletteRules xmi:id="_zzf4a3DtEeWh-MssWmCB_A" element="clazz.tool.abstraction"/>

-      <paletteRules xmi:id="_zzf4bHDtEeWh-MssWmCB_A" element="clazz.tool.association"/>

-      <paletteRules xmi:id="_zzf4bXDtEeWh-MssWmCB_A" element="clazz.tool.generalization"/>

-      <paletteRules xmi:id="_zzf4bnDtEeWh-MssWmCB_A" element="clazz.tool.generalizationset"/>

-      <paletteRules xmi:id="_zzf4b3DtEeWh-MssWmCB_A" permit="false" element="clazz.tool.*"/>

-      <paletteRules xmi:id="_zzf4cHDtEeWh-MssWmCB_A" element=""/>

-    </modelKinds>

-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_zzf4cXDtEeWh-MssWmCB_A" name="Package Diagram" icon="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/icons/Diagram_Package.gif" implementationID="PapyrusUMLClassDiagram">

-      <modelRules xmi:id="_zzf4cnDtEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </modelRules>

-      <owningRules xmi:id="_zzf4c3DtEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </owningRules>

-      <categories href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb4txhEeOqHvRyiN87hA"/>

-      <childRules xmi:id="_zzf4dHDtEeWh-MssWmCB_A"/>

-      <paletteRules xmi:id="_zzf4dXDtEeWh-MssWmCB_A" element="clazz.tool.comment"/>

-      <paletteRules xmi:id="_zzf4dnDtEeWh-MssWmCB_A" element="clazz.tool.constraint"/>

-      <paletteRules xmi:id="_zzf4d3DtEeWh-MssWmCB_A" element="clazz.tool.model"/>

-      <paletteRules xmi:id="_zzf4eHDtEeWh-MssWmCB_A" element="clazz.tool.package"/>

-      <paletteRules xmi:id="_zzf4eXDtEeWh-MssWmCB_A" element="clazz.tool.abstraction"/>

-      <paletteRules xmi:id="_zzf4enDtEeWh-MssWmCB_A" element="clazz.tool.dependency"/>

-      <paletteRules xmi:id="_zzf4e3DtEeWh-MssWmCB_A" element="clazz.tool.packageimport"/>

-      <paletteRules xmi:id="_zzf4fHDtEeWh-MssWmCB_A" element="clazz.tool.link"/>

-      <paletteRules xmi:id="_zzf4fXDtEeWh-MssWmCB_A" element="clazz.tool.containmentlink"/>

-      <paletteRules xmi:id="_zzf4fnDtEeWh-MssWmCB_A" permit="false" element="clazz.tool.*"/>

-      <paletteRules xmi:id="_zzf4f3DtEeWh-MssWmCB_A" element=""/>

-    </modelKinds>

-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_zzf4gHDtEeWh-MssWmCB_A" implementationID="PapyrusUMLClassDiagram">

-      <modelRules xmi:id="_zzf4gXDtEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </modelRules>

-      <owningRules xmi:id="_zzf4gnDtEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </owningRules>

-      <categories href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb4txhEeOqHvRyiN87hA"/>

-      <childRules xmi:id="_zzf4g3DtEeWh-MssWmCB_A"/>

-    </modelKinds>

-  </viewpoints>

-  <defaultStakeholder href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmkdxhEeOqHvRyiN87hA"/>

-  <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>

-</configuration:PapyrusConfiguration>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml
index 5d516983f83..0786511df3b 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml
@@ -15,14 +15,6 @@
    
 -->
 <plugin> 
-   <extension
-         point="org.eclipse.papyrus.infra.viewpoints.policy.custom">
-      <contribution
-            file="model/clazzdiagram.configuration"
-            original="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration">
-      </contribution>
-   </extension>
-
    <extension point="org.eclipse.ui.contexts" id="ui-context">
 				      <?gmfgen generated="true"?>
 				      <context
@@ -1688,13 +1680,6 @@
       <?gmfgen generated="true"?>
    </extension>
 <extension
-      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
-   <elementTypeSet
-         clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
-         path="model/classdiagram.elementtypesconfigurations">
-   </elementTypeSet>
-</extension>
-<extension
       point="org.eclipse.papyrus.infra.gmfdiag.assistant.modelProviders">
    <modelProvider
          uri="model/classdiagram.assistants"></modelProvider>
@@ -1703,21 +1688,21 @@
       point="org.eclipse.papyrus.infra.gmfdiag.common.diagramReconciler">
    <diagramReconciler
          diagramType="PapyrusUMLClassDiagram"
-         reconcilerClass="org.eclipse.papyrus.uml.diagram.clazz.custom.migration.ClassReconciler"
+         reconcilerClass="org.eclipse.papyrus.uml.diagram.clazz.custom.migration.ClassReconciler_1_1_0"
          source="1.0.0" 
-         target="1.1.0">
+         target="1.3.0">
    </diagramReconciler>
    <diagramReconciler
          diagramType="PapyrusUMLClassDiagram"
-         reconcilerClass="org.eclipse.papyrus.uml.diagram.clazz.custom.migration.ClassReconcilerForCompartment"
-         source="1.0.0"
-         target="1.2.0">
+         reconcilerClass="org.eclipse.papyrus.uml.diagram.clazz.custom.migration.ClassReconcilerForCompartment_1_2_0"
+         source="1.1.0"
+         target="1.3.0">
    </diagramReconciler>
    <diagramReconciler
          diagramType="PapyrusUMLClassDiagram"
          reconcilerClass="org.eclipse.papyrus.uml.diagram.clazz.custom.migration.ClassReconciler_1_2_0"
          source="1.1.0"
-         target="1.2.0">
+         target="1.3.0">
    </diagramReconciler>
 </extension>
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/plugin.xml
index 470b3d50ce4..d98fa765037 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/plugin.xml
@@ -214,16 +214,6 @@
          realization="org.eclipse.papyrus.uml.diagram.common.providers.DefaultPasteCommandProvider">
    </PasteCommandProvider>
 </extension>
-   <extension
-         point="org.eclipse.papyrus.infra.ui.papyrusDiagram">
-      <diagramCategory
-            class="org.eclipse.papyrus.uml.diagram.common.commands.CreateUMLModelCommand"
-            description="Create Unified Modeling Language diagrams"
-            icon="icons/category_uml.gif"
-            id="uml"
-            label="UML">
-      </diagramCategory>      
-   </extension>
 
 <!-- Property tester to check the nature (UML Model or Profile) of currently opened project -->  
 <extension
@@ -610,9 +600,9 @@
        point="org.eclipse.papyrus.infra.gmfdiag.common.diagramReconciler">
     <diagramReconciler
           diagramType="AllDiagrams"
-          reconcilerClass="org.eclipse.papyrus.uml.diagram.common.stereotype.migration.StereotypeDisplayDiagramReconciler"
-          source="Undefined"
-          target="1.2.0">
+          reconcilerClass="org.eclipse.papyrus.uml.diagram.common.stereotype.migration.StereotypeDisplayDiagramReconciler_1_2_0"
+          source="1.1.0"
+          target="1.3.0">
     </diagramReconciler>
  </extension>
 </plugin>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/CreateBehavioredClassifierDiagramCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/CreateBehavioredClassifierDiagramCommand.java
index 68ca41c9922..741c98217a7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/CreateBehavioredClassifierDiagramCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/CreateBehavioredClassifierDiagramCommand.java
@@ -1,144 +1,142 @@
-/*******************************************************************************

- * Copyright (c) 2010 AtosOrigin.

- * 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:

- *     AtosOrigin - initial API and implementation

- *******************************************************************************/

-package org.eclipse.papyrus.uml.diagram.common.commands;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.gmf.runtime.diagram.core.services.ViewService;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.papyrus.infra.gmfdiag.common.AbstractPapyrusGmfCreateDiagramCommandHandler;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;

-import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;

-import org.eclipse.uml2.uml.Behavior;

-import org.eclipse.uml2.uml.BehavioredClassifier;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-

-/**

- * Define a command to create a new Behavioral Diagram. This command is used by

- * all UI (toolbar, outline, creation wizards) to create a new Behavioral

- * Diagram. This class should be extended by behavioral diagram only.

- */

-public abstract class CreateBehavioredClassifierDiagramCommand extends AbstractPapyrusGmfCreateDiagramCommandHandler {

-

-	private Behavior behavior = null;

-

-	private String name = ""; //$NON-NLS-1$

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected void initializeDiagram(EObject diagram) {

-		if (diagram instanceof Diagram) {

-			Diagram diag = (Diagram) diagram;

-			if (behavior != null) {

-				diag.setElement(behavior);

-				createBehaviorView(diag);

-			}

-			diag.setName(getName());

-		}

-

-	}

-

-	/**

-	 * Create the associated behavior

-	 *

-	 * @return

-	 */

-	protected Behavior createBehavior() {

-		Behavior newBehavior = (Behavior) UMLFactory.eINSTANCE.create(getBehaviorEClass());

-

-		return newBehavior;

-	}

-

-	/**

-	 * Get the kind of behavior associated to the diagram

-	 *

-	 * @return the EClass of the behavior supposed to own the diagram.

-	 */

-	protected abstract EClass getBehaviorEClass();

-

-	/**

-	 * {@inheritDoc}

-	 */

-	protected void initializeModel(EObject owner) {

-

-		if (owner.eClass() == getBehaviorEClass()) {

-			behavior = (Behavior) owner;

-

-		} else {

-			behavior = (Behavior) UMLFactory.eINSTANCE.create(getBehaviorEClass());

-

-			if (owner instanceof BehavioredClassifier) {

-				BehavioredClassifier behaviorClassifier = (BehavioredClassifier) owner;

-				behaviorClassifier.getOwnedBehaviors().add(behavior);

-

-			} else if (owner instanceof Package) {

-				org.eclipse.uml2.uml.Package pack = (org.eclipse.uml2.uml.Package) owner;

-				pack.getPackagedElements().add(behavior);

-

-			}

-			behavior.setName(NamedElementUtil.getName(behavior));

-		}

-	}

-

-	private void createBehaviorView(Diagram diagram) {

-		ViewService.getInstance().createView(Node.class, new EObjectAdapter(behavior), diagram, null, ViewUtil.APPEND, true, getPreferenceHint());

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Diagram doCreateDiagram(Resource diagramResource, EObject owner, EObject element, ViewPrototype prototype, String name) {

-		Diagram diagram = null;

-		if (element instanceof org.eclipse.uml2.uml.Package) {

-			diagram = ViewService.createDiagram(element, getDiagramNotationID(), getPreferenceHint());

-		} else if (element instanceof BehavioredClassifier) {

-			diagram = ViewService.createDiagram(((BehavioredClassifier) element).getNearestPackage(), getDiagramNotationID(), getPreferenceHint());

-		}

-		// create diagram

-		if (diagram != null) {

-			setName(name);

-			diagram.setElement(element);

-			DiagramUtils.setOwner(diagram, owner);

-			if (!prototype.isNatural()) {

-				DiagramUtils.setPrototype(diagram, prototype);

-			}

-			initializeModel(element);

-			initializeDiagram(diagram);

-			diagramResource.getContents().add(diagram);

-		}

-		return diagram;

-	}

-

-	/**

-	 * Set the name of the diagram and its containing element

-	 *

-	 * @param newName

-	 */

-	protected void setName(String newName) {

-		if (newName == null || newName.equals(name)) {

-			return;

-		}

-		name = newName;

-	}

-

-	protected String getName() {

-		return name;

-	}

-}

+/*******************************************************************************
+ * Copyright (c) 2010 AtosOrigin.
+ * 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:
+ *     AtosOrigin - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.papyrus.uml.diagram.common.commands;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.papyrus.infra.gmfdiag.common.AbstractPapyrusGmfCreateDiagramCommandHandler;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramPrototype;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
+import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;
+import org.eclipse.uml2.uml.Behavior;
+import org.eclipse.uml2.uml.BehavioredClassifier;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.UMLFactory;
+
+/**
+ * Define a command to create a new Behavioral Diagram. This command is used by
+ * all UI (toolbar, outline, creation wizards) to create a new Behavioral
+ * Diagram. This class should be extended by behavioral diagram only.
+ */
+public abstract class CreateBehavioredClassifierDiagramCommand extends AbstractPapyrusGmfCreateDiagramCommandHandler {
+
+	private Behavior behavior = null;
+
+	private String name = ""; //$NON-NLS-1$
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void initializeDiagram(EObject diagram) {
+		if (diagram instanceof Diagram) {
+			Diagram diag = (Diagram) diagram;
+			if (behavior != null) {
+				diag.setElement(behavior);
+				createBehaviorView(diag);
+			}
+			diag.setName(getName());
+		}
+
+	}
+
+	/**
+	 * Create the associated behavior
+	 *
+	 * @return
+	 */
+	protected Behavior createBehavior() {
+		Behavior newBehavior = (Behavior) UMLFactory.eINSTANCE.create(getBehaviorEClass());
+
+		return newBehavior;
+	}
+
+	/**
+	 * Get the kind of behavior associated to the diagram
+	 *
+	 * @return the EClass of the behavior supposed to own the diagram.
+	 */
+	protected abstract EClass getBehaviorEClass();
+
+	/**
+	 * {@inheritDoc}
+	 */
+	protected void initializeModel(EObject owner) {
+
+		if (owner.eClass() == getBehaviorEClass()) {
+			behavior = (Behavior) owner;
+
+		} else {
+			behavior = (Behavior) UMLFactory.eINSTANCE.create(getBehaviorEClass());
+
+			if (owner instanceof BehavioredClassifier) {
+				BehavioredClassifier behaviorClassifier = (BehavioredClassifier) owner;
+				behaviorClassifier.getOwnedBehaviors().add(behavior);
+
+			} else if (owner instanceof Package) {
+				org.eclipse.uml2.uml.Package pack = (org.eclipse.uml2.uml.Package) owner;
+				pack.getPackagedElements().add(behavior);
+
+			}
+			behavior.setName(NamedElementUtil.getName(behavior));
+		}
+	}
+
+	private void createBehaviorView(Diagram diagram) {
+		ViewService.getInstance().createView(Node.class, new EObjectAdapter(behavior), diagram, null, ViewUtil.APPEND, true, getPreferenceHint());
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected Diagram doCreateDiagram(Resource diagramResource, EObject owner, EObject element, DiagramPrototype prototype, String name) {
+		Diagram diagram = null;
+		if (element instanceof org.eclipse.uml2.uml.Package) {
+			diagram = ViewService.createDiagram(element, getDiagramNotationID(), getPreferenceHint());
+		} else if (element instanceof BehavioredClassifier) {
+			diagram = ViewService.createDiagram(((BehavioredClassifier) element).getNearestPackage(), getDiagramNotationID(), getPreferenceHint());
+		}
+		// create diagram
+		if (diagram != null) {
+			setName(name);
+			diagram.setElement(element);
+			DiagramUtils.setOwner(diagram, owner);
+			DiagramUtils.setPrototype(diagram, prototype);
+			initializeModel(element);
+			initializeDiagram(diagram);
+			diagramResource.getContents().add(diagram);
+		}
+		return diagram;
+	}
+
+	/**
+	 * Set the name of the diagram and its containing element
+	 *
+	 * @param newName
+	 */
+	protected void setName(String newName) {
+		if (newName == null || newName.equals(name)) {
+			return;
+		}
+		name = newName;
+	}
+
+	protected String getName() {
+		return name;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/CreateUMLModelCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/CreateUMLModelCommand.java
index 4190a606438..d6c743006b1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/CreateUMLModelCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/CreateUMLModelCommand.java
@@ -21,8 +21,6 @@ import org.eclipse.uml2.uml.UMLFactory;
  */
 public class CreateUMLModelCommand extends ModelCreationCommandBase {
 
-	public static final String COMMAND_ID = "uml";
-
 	/**
 	 * @see org.eclipse.papyrus.infra.core.extension.commands.ModelCreationCommandBase#createRootElement()
 	 *
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/ModelCreationCommandBase.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/ModelCreationCommandBase.java
index e723d778fd2..8f391aba395 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/ModelCreationCommandBase.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/ModelCreationCommandBase.java
@@ -13,19 +13,10 @@
  *****************************************************************************/
 package org.eclipse.papyrus.uml.diagram.common.commands;
 
-import java.util.Collections;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
+import org.eclipse.papyrus.infra.architecture.commands.IModelCreationCommand;
 import org.eclipse.papyrus.infra.core.resource.ModelSet;
-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.infra.ui.extension.commands.IModelCreationCommand;
 import org.eclipse.papyrus.uml.tools.model.UmlUtils;
 
 /**
@@ -34,41 +25,14 @@ import org.eclipse.papyrus.uml.tools.model.UmlUtils;
 public abstract class ModelCreationCommandBase implements IModelCreationCommand {
 
 	/**
-	 * @see org.eclipse.papyrus.infra.ui.extension.commands.IModelCreationCommand#createModel(org.eclipse.papyrus.infra.core.utils.DiResourceSet)
-	 *
-	 * @param diResourceSet
+	 * @param modelSet
 	 */
 	@Override
 	public void createModel(final ModelSet modelSet) {
-		runAsTransaction(modelSet);
-	}
-
-	/**
-	 * Run as transaction.
-	 *
-	 * @param diResourceSet
-	 *            the di resource set
-	 */
-	protected void runAsTransaction(final ModelSet modelSet) {
-		// Get the uml element to which the newly created diagram will be
-		// attached.
-		// Create the diagram
 		final Resource modelResource = UmlUtils.getUmlResource(modelSet);
-		TransactionalEditingDomain editingDomain = modelSet.getTransactionalEditingDomain();
-
-		AbstractTransactionalCommand command = new AbstractTransactionalCommand(editingDomain, "Initialize model", Collections.EMPTY_LIST) {
-
-			@Override
-			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-				EObject model = getRootElement(modelResource);
-				attachModelToResource(model, modelResource);
-
-				initializeModel(model);
-				return CommandResult.newOKCommandResult();
-
-			}
-		};
-		editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(command));
+		EObject model = getRootElement(modelResource);
+		attachModelToResource(model, modelResource);
+		initializeModel(model);
 	}
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/dialogs/CreateUmlElementDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/dialogs/CreateUmlElementDialog.java
index 36b2875b928..a75e773556c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/dialogs/CreateUmlElementDialog.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/dialogs/CreateUmlElementDialog.java
@@ -31,6 +31,7 @@ import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;
 import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
 import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.commands.CreateRelationshipCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
@@ -39,8 +40,11 @@ import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.uml.diagram.common.Activator;
 import org.eclipse.papyrus.uml.diagram.common.Messages;
 import org.eclipse.papyrus.uml.tools.utils.ElementUtil;
 import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;
@@ -297,13 +301,19 @@ public class CreateUmlElementDialog extends ElementTreeSelectionDialog {
 	 *         The command corresponding to this request or an {@link UnexecutableCommand} when the command can not be build
 	 */
 	private ICommand getCommand(IEditCommandRequest request) {
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(UMLPackage.eINSTANCE.getNamedElement());
-		{
-			if (provider != null) {
-				ICommand cmd = provider.getEditCommand(request);
-				if (cmd != null && cmd.canExecute()) {
-					return cmd;
-				}
+		IClientContext context;
+		try {
+			context = TypeContext.getContext(domain);
+		} catch (ServiceException e) {
+			Activator.log.error(e);
+			return UnexecutableCommand.INSTANCE;
+		}
+
+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(UMLPackage.eINSTANCE.getNamedElement(), context);
+		if (provider != null) {
+			ICommand cmd = provider.getEditCommand(request);
+			if (cmd != null && cmd.canExecute()) {
+				return cmd;
 			}
 		}
 		return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/EditableLabelForNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/EditableLabelForNodeEditPart.java
index c62a031a360..174b4790ed3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/EditableLabelForNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/EditableLabelForNodeEditPart.java
@@ -1,747 +1,736 @@
-/**

- * Copyright (c) 2015 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.common.editparts;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Label;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.RunnableWithResult;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.AccessibleEditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.requests.DirectEditRequest;

-import org.eclipse.gef.tools.CellEditorLocator;

-import org.eclipse.gef.tools.DirectEditManager;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserService;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

-import org.eclipse.gmf.runtime.notation.FontStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.directedit.locator.CellEditorLocatorAccess;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

-import org.eclipse.jface.viewers.ICellEditorValidator;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.extensionpoints.editors.Activator;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.IMultilineEditableFigure;

-import org.eclipse.papyrus.uml.diagram.common.locator.MultilineCellEditorLocator;

-import org.eclipse.papyrus.uml.diagram.common.parser.DefaultParserHintAdapter;

-import org.eclipse.papyrus.uml.diagram.common.parser.NamedElementLabelParser;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.accessibility.AccessibleEvent;

-import org.eclipse.swt.custom.BusyIndicator;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.uml2.uml.Feature;

-

-public class EditableLabelForNodeEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-

-	private DirectEditManager manager;

-

-	private IParser parser;

-

-	private List<?> parserElements;

-

-	private String defaultText;

-

-	/**

-	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

-	 */

-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

-

-	protected IDirectEditorConfiguration configuration;

-

-	public EditableLabelForNodeEditPart(View view) {

-		super(view);

-	}

-

-	@Override

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

-	}

-

-	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

-		} else {

-			return ((Label) figure).getText();

-		}

-	}

-

-	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

-		} else {

-			((Label) figure).setText(text);

-		}

-	}

-

-	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

-		} else {

-			return ((Label) figure).getIcon();

-		}

-	}

-

-	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

-		} else {

-			((Label) figure).setIcon(icon);

-		}

-	}

-

-	public void setLabel(IFigure

-			figure) {

-		unregisterVisuals();

-		setFigure(figure);

-		defaultText = getLabelTextHelper(figure);

-		registerVisuals();

-		refreshVisuals();

-	}

-

-	@Override

-	protected List<?> getModelChildren() {

-		return Collections.EMPTY_LIST;

-	}

-

-	@Override

-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

-		return null;

-	}

-

-	@Override

-	public void setParser(IParser parser) {

-		this.parser = parser;

-	}

-

-	protected EObject getParserElement() {

-		return resolveSemanticElement();

-	}

-

-	protected Image getLabelIcon() {

-		EObject parserElement = getParserElement();

-		if(parserElement == null) {

-			return null;

-		}

-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for(View view : views) {

-			if(AppearanceHelper.showElementIcon(view)) {

-				return  org.eclipse.papyrus.uml.diagram.common.Activator.getDefault().getImage(parserElement.eClass());

-			}

-		}

-		return null;

-	}

-

-	protected String getLabelText() {

-		String text = null;

-		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(

-					new EObjectAdapter(parserElement),

-					getParserOptions().intValue());

-		}

-		if (text == null || text.length() == 0) {

-			text = defaultText;

-		}

-		return text;

-	}

-

-	@Override

-	public void setLabelText(String text) {

-		setLabelTextHelper(getFigure(), text);

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	@Override

-	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

-			return ""; //$NON-NLS-1$

-		}

-		return getParser().getEditString(

-				new EObjectAdapter(getParserElement()),

-				getParserOptions().intValue());

-	}

-

-	protected boolean isEditable() {

-		return getParser() != null;

-	}

-

-	@Override

-	public ICellEditorValidator getEditTextValidator() {

-		return new ICellEditorValidator() {

-

-			@Override

-			public String isValid(final Object value) {

-				if (value instanceof String) {

-					final EObject element = getParserElement();

-					final IParser parser = getParser();

-					try {

-						IParserEditStatus valid =

-								(IParserEditStatus) getEditingDomain().runExclusive(

-										new RunnableWithResult.Impl<java.lang.Object>() {

-

-											@Override

-											public void run() {

-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-											}

-										});

-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

-					} catch (InterruptedException ie) {

-						ie.printStackTrace();

-					}

-				}

-

-				// shouldn't get here

-				return null;

-			}

-		};

-	}

-

-	@Override

-	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

-			return null;

-		}

-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

-	}

-

-	@Override

-	public ParserOptions getParserOptions() {

-		return ParserOptions.NONE;

-	}

-

-	public IParser getParser() {

-

-		if(parser == null) {

-			parser =ParserService.getInstance().getParser(new DefaultParserHintAdapter(getNotationView().getDiagram(), resolveSemanticElement(), getNotationView().getType()));

-			if(parser == null) {

-				parser = new NamedElementLabelParser();

-			}

-		}

-		return parser;

-	}

-

-	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), getTextCellEditorLocator(this)));

-		}

-		return manager;

-	}

-

-	protected void setManager(DirectEditManager manager) {

-		this.manager = manager;

-	}

-

-	protected void performDirectEdit() {

-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

-

-			@Override

-			public void run() {

-				getManager().show();

-			}

-		});

-	}

-

-	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

-		}

-	}

-

-	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

-		} else {

-			performDirectEdit();

-		}

-	}

-

-	public static CellEditorLocator getTextCellEditorLocator(ITextAwareEditPart source) {

-		if (source.getFigure() instanceof IMultilineEditableFigure) {

-			return new MultilineCellEditorLocator(

-					(IMultilineEditableFigure) source.getFigure());

-		}

-		else {

-			return CellEditorLocatorAccess.INSTANCE.getTextCellEditorLocator(source);

-

-		}

-	}

-	@Override

-	protected void performDirectEditRequest(Request request) {

-

-		final Request theRequest = request;

-

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

-			directEditionMode = getDirectEditionType();

-		}

-		switch (directEditionMode) {

-		case IDirectEdition.NO_DIRECT_EDITION:

-			// no direct edition mode => does nothing

-			return;

-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

-			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

-				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this),getTextCellEditorLocator(this)));

-				performDefaultDirectEditorEdit(theRequest);

-			} else {

-				configuration.preEditAction(resolveSemanticElement());

-				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

-					initializeDirectEditManager(theRequest);

-					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

-					helper.showEditor();

-					return;

-				}

-				else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

-				} else {

-					return;

-				}

-				final Dialog finalDialog = dialog;

-

-				if (Window.OK == dialog.open()) {

-					TransactionalEditingDomain domain = getEditingDomain();

-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

-

-						@Override

-						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-

-						}

-					};

-					domain.getCommandStack().execute(command);

-				}

-			}

-			break;

-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

-			initializeDirectEditManager(theRequest);

-			break;

-		default:

-			break;

-		}

-	}

-

-	protected void initializeDirectEditManager(final Request request) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(

-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						}

-						else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	@Override

-	protected void refreshVisuals() {

-		super.refreshVisuals();

-		refreshLabel();

-		refreshFont();

-		refreshFontColor();

-		refreshUnderline();

-		refreshStrikeThrough();

-	}

-

-	protected void refreshLabel() {

-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

-		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

-				setLabelTextHelper(getFigure(), getLabelText());

-				setLabelIconHelper(getFigure(), getLabelIcon());

-			}

-			else {

-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

-				setLabelIconHelper(getFigure(), null);

-			}

-		}

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	protected void refreshUnderline() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			}

-			else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

-			}

-		}

-	}

-

-	protected void refreshStrikeThrough() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

-		}

-	}

-

-	@Override

-	protected void refreshFont() {

-		FontStyle style =

-				(FontStyle) getFontStyleOwnerView().getStyle(

-						NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(

-					style.getFontName(), style.getFontHeight(),

-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

-					(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

-			setFont(fontData);

-		}

-	}

-

-	@Override

-	protected void setFontColor(Color color) {

-		getFigure().setForegroundColor(color);

-	}

-

-	@Override

-	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

-			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

-			}

-		} else {

-			super.addSemanticListeners();

-		}

-	}

-

-	@Override

-	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

-			}

-		} else {

-			super.removeSemanticListeners();

-		}

-	}

-

-	@Override

-	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

-			accessibleEP = new AccessibleGraphicalEditPart() {

-

-				@Override

-				public void getName(AccessibleEvent e) {

-					e.result = getLabelTextHelper(getFigure());

-				}

-			};

-		}

-		return accessibleEP;

-	}

-

-	private View getFontStyleOwnerView() {

-		return getPrimaryView();

-	}

-

-	/**

-	 * Returns the kind of associated editor for direct edition.

-	 *

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

-	 */

-	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

-		return IDirectEdition.NO_DIRECT_EDITION;

-	}

-

-	/**

-	 * Checks if an extended editor is present.

-	 *

-	 * @return <code>true</code> if an extended editor is present.

-	 */

-	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

-		}

-		return false;

-	}

-

-	/**

-	 * Checks if a default direct edition is available

-	 *

-	 * @return <code>true</code> if a default direct edition is available

-	 */

-	protected boolean checkDefaultEdition() {

-		return (getParser() != null);

-	}

-

-	/**

-	 * Initializes the extended editor configuration

-	 * 

-	 */

-	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

-			}

-		}

-	}

-

-	/**

-	 * Updates the preference configuration

-	 * 

-	 */

-	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

-					.eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

-			configuration = null;

-		}

-	}

-

-	/**

-	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

-	 */

-	protected void performDefaultDirectEditorEdit(final Request theRequest) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(

-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

-							performDirectEdit(editRequest.getLocation());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	@Override

-	protected void addNotationalListeners() {

-		super.addNotationalListeners();

-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

-	}

-

-	@Override

-	protected void removeNotationalListeners() {

-		super.removeNotationalListeners();

-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

-	}

-

-	@Override

-	protected void handleNotificationEvent(Notification event) {

-		refreshLabel();

-		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

-			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

-			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

-			refreshFont();

-		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

-				refreshLabel();

-			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser =

-						(ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

-					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

-						addSemanticListeners();

-					}

-					refreshLabel();

-				}

-			}

-		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

-			refreshLabel();

-		}

-		super.handleNotificationEvent(event);

-	}

-

-	protected IFigure createFigure() {

-		IFigure label=null;

-		if(getParent() instanceof ContainerNodeEditPart){

-			label= ((ContainerNodeEditPart)getParent()).getPrimaryShape().getNameLabel();

-		}

-		else{

-			label = createFigurePrim();

-		}

-		defaultText	 = getLabelTextHelper(label);

-		return label;

-	}

-

-	protected IFigure createFigurePrim() {

-		return new PapyrusWrappingLabel();

-	}

-

-	private static final String ADD_PARENT_MODEL = "AddParentModel";

-

-	@Override

-	public void activate() {

-		super.activate();

-		addOwnerElementListeners();

-	}

-

-	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

-

-	}

-

-	@Override

-	public void deactivate() {

-		removeOwnerElementListeners();

-		super.deactivate();

-

-	}

-

-	protected void removeOwnerElementListeners() {

-		removeListenerFilter(ADD_PARENT_MODEL);

-

-	}

-	

-	@Override

-	public boolean isSelectable() {

-		return getFigure().isShowing();

-	}

-}

+/**
+ * Copyright (c) 2015 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.common.editparts;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.AccessibleEditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.tools.CellEditorLocator;
+import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserService;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.viewers.ICellEditorValidator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.extensionpoints.editors.Activator;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.directedit.locator.CellEditorLocatorAccess;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.IMultilineEditableFigure;
+import org.eclipse.papyrus.uml.diagram.common.locator.MultilineCellEditorLocator;
+import org.eclipse.papyrus.uml.diagram.common.parser.DefaultParserHintAdapter;
+import org.eclipse.papyrus.uml.diagram.common.parser.NamedElementLabelParser;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Feature;
+
+public class EditableLabelForNodeEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
+
+
+	private DirectEditManager manager;
+
+	private IParser parser;
+
+	private List<?> parserElements;
+
+	private String defaultText;
+
+	/**
+	 * direct edition mode (default, undefined, registered editor, etc.)
+	 * 
+	 */
+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
+
+	protected IDirectEditorConfiguration configuration;
+
+	public EditableLabelForNodeEditPart(View view) {
+		super(view);
+	}
+
+	@Override
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
+	}
+
+	protected String getLabelTextHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getText();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getText();
+		} else {
+			return ((Label) figure).getText();
+		}
+	}
+
+	protected void setLabelTextHelper(IFigure figure, String text) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setText(text);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setText(text);
+		} else {
+			((Label) figure).setText(text);
+		}
+	}
+
+	protected Image getLabelIconHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getIcon();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getIcon();
+		} else {
+			return ((Label) figure).getIcon();
+		}
+	}
+
+	protected void setLabelIconHelper(IFigure figure, Image icon) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setIcon(icon);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setIcon(icon);
+		} else {
+			((Label) figure).setIcon(icon);
+		}
+	}
+
+	public void setLabel(IFigure figure) {
+		unregisterVisuals();
+		setFigure(figure);
+		defaultText = getLabelTextHelper(figure);
+		registerVisuals();
+		refreshVisuals();
+	}
+
+	@Override
+	protected List<?> getModelChildren() {
+		return Collections.EMPTY_LIST;
+	}
+
+	@Override
+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
+		return null;
+	}
+
+	@Override
+	public void setParser(IParser parser) {
+		this.parser = parser;
+	}
+
+	protected EObject getParserElement() {
+		return resolveSemanticElement();
+	}
+
+	protected Image getLabelIcon() {
+		EObject parserElement = getParserElement();
+		if (parserElement == null) {
+			return null;
+		}
+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
+		for (View view : views) {
+			if (AppearanceHelper.showElementIcon(view)) {
+				return org.eclipse.papyrus.uml.diagram.common.Activator.getDefault().getImage(parserElement.eClass());
+			}
+		}
+		return null;
+	}
+
+	protected String getLabelText() {
+		String text = null;
+		EObject parserElement = getParserElement();
+		if (parserElement != null && getParser() != null) {
+			text = getParser().getPrintString(
+					new EObjectAdapter(parserElement),
+					getParserOptions().intValue());
+		}
+		if (text == null || text.length() == 0) {
+			text = defaultText;
+		}
+		return text;
+	}
+
+	@Override
+	public void setLabelText(String text) {
+		setLabelTextHelper(getFigure(), text);
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	@Override
+	public String getEditText() {
+		if (getParserElement() == null || getParser() == null) {
+			return ""; //$NON-NLS-1$
+		}
+		return getParser().getEditString(
+				new EObjectAdapter(getParserElement()),
+				getParserOptions().intValue());
+	}
+
+	protected boolean isEditable() {
+		return getParser() != null;
+	}
+
+	@Override
+	public ICellEditorValidator getEditTextValidator() {
+		return new ICellEditorValidator() {
+
+			@Override
+			public String isValid(final Object value) {
+				if (value instanceof String) {
+					final EObject element = getParserElement();
+					final IParser parser = getParser();
+					try {
+						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(
+								new RunnableWithResult.Impl<java.lang.Object>() {
+
+									@Override
+									public void run() {
+										setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
+									}
+								});
+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
+					} catch (InterruptedException ie) {
+						ie.printStackTrace();
+					}
+				}
+
+				// shouldn't get here
+				return null;
+			}
+		};
+	}
+
+	@Override
+	public IContentAssistProcessor getCompletionProcessor() {
+		if (getParserElement() == null || getParser() == null) {
+			return null;
+		}
+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
+	}
+
+	@Override
+	public ParserOptions getParserOptions() {
+		return ParserOptions.NONE;
+	}
+
+	public IParser getParser() {
+
+		if (parser == null) {
+			parser = ParserService.getInstance().getParser(new DefaultParserHintAdapter(getNotationView().getDiagram(), resolveSemanticElement(), getNotationView().getType()));
+			if (parser == null) {
+				parser = new NamedElementLabelParser();
+			}
+		}
+		return parser;
+	}
+
+	protected DirectEditManager getManager() {
+		if (manager == null) {
+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), getTextCellEditorLocator(this)));
+		}
+		return manager;
+	}
+
+	protected void setManager(DirectEditManager manager) {
+		this.manager = manager;
+	}
+
+	protected void performDirectEdit() {
+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
+
+			@Override
+			public void run() {
+				getManager().show();
+			}
+		});
+	}
+
+	protected void performDirectEdit(Point eventLocation) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
+		}
+	}
+
+	private void performDirectEdit(char initialCharacter) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(initialCharacter);
+		} else {
+			performDirectEdit();
+		}
+	}
+
+	public static CellEditorLocator getTextCellEditorLocator(ITextAwareEditPart source) {
+		if (source.getFigure() instanceof IMultilineEditableFigure) {
+			return new MultilineCellEditorLocator(
+					(IMultilineEditableFigure) source.getFigure());
+		} else {
+			return CellEditorLocatorAccess.INSTANCE.getTextCellEditorLocator(source);
+
+		}
+	}
+
+	@Override
+	protected void performDirectEditRequest(Request request) {
+
+		final Request theRequest = request;
+
+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+			directEditionMode = getDirectEditionType();
+		}
+		switch (directEditionMode) {
+		case IDirectEdition.NO_DIRECT_EDITION:
+			// no direct edition mode => does nothing
+			return;
+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
+			updateExtendedEditorConfiguration();
+			if (configuration == null || configuration.getLanguage() == null) {
+				// Create default edit manager
+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), getTextCellEditorLocator(this)));
+				performDefaultDirectEditorEdit(theRequest);
+			} else {
+				configuration.preEditAction(resolveSemanticElement());
+				Dialog dialog = null;
+				if (configuration instanceof ICustomDirectEditorConfiguration) {
+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
+					initializeDirectEditManager(theRequest);
+					return;
+				} else if (configuration instanceof IPopupEditorConfiguration) {
+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
+					helper.showEditor();
+					return;
+				} else if (configuration instanceof IAdvancedEditorConfiguration) {
+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
+				} else if (configuration instanceof IDirectEditorConfiguration) {
+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);
+				} else {
+					return;
+				}
+				final Dialog finalDialog = dialog;
+
+				if (Window.OK == dialog.open()) {
+					TransactionalEditingDomain domain = getEditingDomain();
+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
+
+						@Override
+						protected void doExecute() {
+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
+
+						}
+					};
+					domain.getCommandStack().execute(command);
+				}
+			}
+			break;
+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
+			initializeDirectEditManager(theRequest);
+			break;
+		default:
+			break;
+		}
+	}
+
+	protected void initializeDirectEditManager(final Request request) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (request.getExtendedData().get(
+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						} else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	@Override
+	protected void refreshVisuals() {
+		super.refreshVisuals();
+		refreshLabel();
+		refreshFont();
+		refreshFontColor();
+		refreshUnderline();
+		refreshStrikeThrough();
+	}
+
+	protected void refreshLabel() {
+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+		if (maskLabelPolicy == null) {
+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
+		}
+		if (maskLabelPolicy == null) {
+			View view = (View) getModel();
+			if (view.isVisible()) {
+				setLabelTextHelper(getFigure(), getLabelText());
+				setLabelIconHelper(getFigure(), getLabelIcon());
+			} else {
+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
+				setLabelIconHelper(getFigure(), null);
+			}
+		}
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	protected void refreshUnderline() {
+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(
+				NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
+		}
+		if (resolveSemanticElement() instanceof Feature) {
+			if (((Feature) resolveSemanticElement()).isStatic()) {
+				((WrappingLabel) getFigure()).setTextUnderline(true);
+			} else {
+				((WrappingLabel) getFigure()).setTextUnderline(false);
+			}
+		}
+	}
+
+	protected void refreshStrikeThrough() {
+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(
+				NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		}
+	}
+
+	@Override
+	protected void refreshFont() {
+		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(
+				NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null) {
+			FontData fontData = new FontData(
+					style.getFontName(), style.getFontHeight(),
+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+			setFont(fontData);
+		}
+	}
+
+	@Override
+	protected void setFontColor(Color color) {
+		getFigure().setForegroundColor(color);
+	}
+
+	@Override
+	protected void addSemanticListeners() {
+		if (getParser() instanceof ISemanticParser) {
+			EObject element = resolveSemanticElement();
+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+			for (int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
+			}
+		} else {
+			super.addSemanticListeners();
+		}
+	}
+
+	@Override
+	protected void removeSemanticListeners() {
+		if (parserElements != null) {
+			for (int i = 0; i < parserElements.size(); i++) {
+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+			}
+		} else {
+			super.removeSemanticListeners();
+		}
+	}
+
+	@Override
+	protected AccessibleEditPart getAccessibleEditPart() {
+		if (accessibleEP == null) {
+			accessibleEP = new AccessibleGraphicalEditPart() {
+
+				@Override
+				public void getName(AccessibleEvent e) {
+					e.result = getLabelTextHelper(getFigure());
+				}
+			};
+		}
+		return accessibleEP;
+	}
+
+	private View getFontStyleOwnerView() {
+		return getPrimaryView();
+	}
+
+	/**
+	 * Returns the kind of associated editor for direct edition.
+	 *
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+	 */
+	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
+		return IDirectEdition.NO_DIRECT_EDITION;
+	}
+
+	/**
+	 * Checks if an extended editor is present.
+	 *
+	 * @return <code>true</code> if an extended editor is present.
+	 */
+	protected boolean checkExtendedEditor() {
+		if (resolveSemanticElement() != null) {
+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
+		}
+		return false;
+	}
+
+	/**
+	 * Checks if a default direct edition is available
+	 *
+	 * @return <code>true</code> if a default direct edition is available
+	 */
+	protected boolean checkDefaultEdition() {
+		return (getParser() != null);
+	}
+
+	/**
+	 * Initializes the extended editor configuration
+	 * 
+	 */
+	protected void initExtendedEditorConfiguration() {
+		if (configuration == null) {
+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+			if (languagePreferred != null && !languagePreferred.equals("")) {
+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
+			} else {
+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
+			}
+		}
+	}
+
+	/**
+	 * Updates the preference configuration
+	 * 
+	 */
+	protected void updateExtendedEditorConfiguration() {
+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
+					.eClass().getInstanceClassName());
+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+			configuration = null;
+		}
+	}
+
+	/**
+	 * Performs the direct edit usually used by GMF editors.
+	 * 
+	 * @param theRequest
+	 *            the direct edit request that starts the direct edit system
+	 */
+	protected void performDefaultDirectEditorEdit(final Request theRequest) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) theRequest.getExtendedData().get(
+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
+							performDirectEdit(editRequest.getLocation());
+						} else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	@Override
+	protected void addNotationalListeners() {
+		super.addNotationalListeners();
+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
+	}
+
+	@Override
+	protected void removeNotationalListeners() {
+		super.removeNotationalListeners();
+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
+	}
+
+	@Override
+	protected void handleNotificationEvent(Notification event) {
+		refreshLabel();
+		Object feature = event.getFeature();
+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
+			Integer c = (Integer) event.getNewValue();
+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
+			refreshUnderline();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
+			refreshStrikeThrough();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
+			refreshFont();
+		} else {
+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+				refreshLabel();
+			}
+			if (getParser() instanceof ISemanticParser) {
+				ISemanticParser modelParser = (ISemanticParser) getParser();
+				if (modelParser.areSemanticElementsAffected(null, event)) {
+					removeSemanticListeners();
+					if (resolveSemanticElement() != null) {
+						addSemanticListeners();
+					}
+					refreshLabel();
+				}
+			}
+		}
+		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
+			refreshLabel();
+		}
+		super.handleNotificationEvent(event);
+	}
+
+	protected IFigure createFigure() {
+		IFigure label = null;
+		if (getParent() instanceof ContainerNodeEditPart) {
+			label = ((ContainerNodeEditPart) getParent()).getPrimaryShape().getNameLabel();
+		} else {
+			label = createFigurePrim();
+		}
+		defaultText = getLabelTextHelper(label);
+		return label;
+	}
+
+	protected IFigure createFigurePrim() {
+		return new PapyrusWrappingLabel();
+	}
+
+	private static final String ADD_PARENT_MODEL = "AddParentModel";
+
+	@Override
+	public void activate() {
+		super.activate();
+		addOwnerElementListeners();
+	}
+
+	protected void addOwnerElementListeners() {
+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));
+
+	}
+
+	@Override
+	public void deactivate() {
+		removeOwnerElementListeners();
+		super.deactivate();
+
+	}
+
+	protected void removeOwnerElementListeners() {
+		removeListenerFilter(ADD_PARENT_MODEL);
+
+	}
+
+	@Override
+	public boolean isSelectable() {
+		return getFigure().isShowing();
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/parser/ConstraintLabelParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/parser/ConstraintLabelParser.java
index 87a03052d44..04e5c0da46b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/parser/ConstraintLabelParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/parser/ConstraintLabelParser.java
@@ -27,11 +27,13 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
 import org.eclipse.papyrus.infra.core.resource.ModelSet;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
 import org.eclipse.papyrus.infra.internationalization.common.utils.InternationalizationPreferencesUtils;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
 import org.eclipse.papyrus.uml.diagram.common.Activator;
@@ -171,7 +173,8 @@ public class ConstraintLabelParser extends NamedElementLabelParser {
 
 		try {
 			if (updateRequest != null) {
-				command = ElementEditServiceUtils.getEditServiceProvider().getEditService(constraint).getEditCommand(updateRequest);
+				IClientContext context = TypeContext.getContext(constraint);
+				command = ElementEditServiceUtils.getEditServiceProvider(context).getEditService(constraint).getEditCommand(updateRequest);
 			}
 
 		} catch (ServiceException e) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/parser/NamedElementLabelParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/parser/NamedElementLabelParser.java
index 1da684d9783..ace38c1c8cf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/parser/NamedElementLabelParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/parser/NamedElementLabelParser.java
@@ -28,6 +28,7 @@ import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;
 import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
 import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
@@ -37,6 +38,7 @@ import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.gmfdiag.common.helper.MaskLabelHelper;
 import org.eclipse.papyrus.infra.internationalization.common.utils.InternationalizationPreferencesUtils;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
 import org.eclipse.papyrus.uml.diagram.common.Activator;
 import org.eclipse.papyrus.uml.internationalization.utils.utils.UMLLabelInternationalization;
@@ -91,7 +93,8 @@ public class NamedElementLabelParser implements IMaskManagedSemanticParser {
 				final ModelSet modelSet = (ModelSet)objectToEdit.eResource().getResourceSet();
 				command = new EMFtoGMFCommandWrapper(UMLLabelInternationalization.getInstance().getSetLabelCommand(modelSet.getTransactionalEditingDomain(), (NamedElement)objectToEdit, newString, null));
 			}else{
-				command = ElementEditServiceUtils.getEditServiceProvider().getEditService(objectToEdit).getEditCommand(new SetRequest(objectToEdit, UMLPackage.eINSTANCE.getNamedElement_Name(), newString));
+				IClientContext context = TypeContext.getContext(objectToEdit);
+				command = ElementEditServiceUtils.getEditServiceProvider(context).getEditService(objectToEdit).getEditCommand(new SetRequest(objectToEdit, UMLPackage.eINSTANCE.getNamedElement_Name(), newString));
 			}
 		} catch (ServiceException e) {
 			Activator.log.error(e);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/part/UmlGmfDiagramEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/part/UmlGmfDiagramEditor.java
index 1aa258833df..df76d78fa31 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/part/UmlGmfDiagramEditor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/part/UmlGmfDiagramEditor.java
@@ -14,7 +14,6 @@
 package org.eclipse.papyrus.uml.diagram.common.part;
 
 import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.core.runtime.CoreException;
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.Notifier;
@@ -25,15 +24,12 @@ import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
 import org.eclipse.papyrus.infra.gmfdiag.common.SynchronizableGmfDiagramEditor;
 import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramHelper;
-import org.eclipse.papyrus.infra.gmfdiag.common.helper.ReconcileHelper;
-import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramVersioningUtils;
 import org.eclipse.papyrus.infra.internationalization.InternationalizationPackage;
 import org.eclipse.papyrus.infra.internationalization.common.editor.IInternationalizationEditor;
 import org.eclipse.papyrus.infra.internationalization.utils.utils.LabelInternationalization;
 import org.eclipse.papyrus.infra.internationalization.utils.utils.LabelInternationalizationUtils;
 import org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveAndDirtyService;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.contexts.IContextService;
 
 /**
@@ -86,14 +82,6 @@ public class UmlGmfDiagramEditor extends SynchronizableGmfDiagramEditor implemen
 		saveAndDirtyService.registerIsaveablePart(this);
 	}
 
-	@Override
-	public void doSetInput(IEditorInput input, boolean releaseEditorContents) throws CoreException {
-		super.doSetInput(input, releaseEditorContents);
-		if (getDiagram() != null && !DiagramVersioningUtils.isOfCurrentPapyrusVersion(getDiagram())) {
-			new ReconcileHelper(getEditingDomain()).reconcileDiagram(getDiagram());
-		}
-	}
-
 	/**
 	 * Dispose services used in this part.
 	 *
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/FilteringPaletteProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/FilteringPaletteProvider.java
index e864690a591..fdfafff7e7e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/FilteringPaletteProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/FilteringPaletteProvider.java
@@ -34,7 +34,7 @@ import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;
 import org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider;
 import org.eclipse.gmf.runtime.diagram.ui.services.palette.IPaletteProvider;
 import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram;
+import org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram;
 import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
 import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
 import org.eclipse.papyrus.uml.diagram.common.Activator;
@@ -204,7 +204,8 @@ public class FilteringPaletteProvider implements IPaletteProvider {
 				return true;
 			}
 		}
-		return PolicyChecker.getCurrent().isInPalette(((DiagramEditor) editor).getDiagram(), entryID);
+		Diagram diagram = ((DiagramEditor) editor).getDiagram();
+		return PolicyChecker.getFor(diagram).isInPalette(diagram, entryID);
 	}
 
 	/**
@@ -230,7 +231,7 @@ public class FilteringPaletteProvider implements IPaletteProvider {
 	 */
 	private String getCustomPalette(Diagram diagram) {
 		ViewPrototype proto = ViewPrototype.get(diagram);
-		PapyrusDiagram pd = (PapyrusDiagram) proto.getConfiguration();
+		PapyrusDiagram pd = (PapyrusDiagram) proto.getRepresentationKind();
 		if (pd == null) {
 			return null;
 		}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/LocalExtendedPaletteProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/LocalExtendedPaletteProvider.java
index 95fb80987e9..d0dd6ff5721 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/LocalExtendedPaletteProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/LocalExtendedPaletteProvider.java
@@ -24,6 +24,8 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.gmf.runtime.diagram.ui.services.palette.IPaletteProvider;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
 import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;
 import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
 import org.eclipse.papyrus.uml.diagram.common.Messages;
@@ -120,13 +122,18 @@ public class LocalExtendedPaletteProvider extends ExtendedPluginPaletteProvider
 				if (!elementTypeUIResource.getContents().isEmpty() && !elementTypeSemResource.getContents().isEmpty()) {
 
 					// deploy element types configuration files
-					String clientContext = "org.eclipse.papyrus.infra.services.edit.TypeContext";//$NON-NLS-1$
+					String clientContextId = "";
+					try {
+						clientContextId = TypeContext.getDefaultContext().getId();
+					} catch (ServiceException e) {
+						Activator.log.error(e);
+					}
 
-					ElementTypeSetConfigurationRegistry.getInstance().unload(clientContext, ((ElementTypeSetConfiguration) elementTypeSemResource.getContents().get(0)).getIdentifier());
-					ElementTypeSetConfigurationRegistry.getInstance().unload(clientContext, ((ElementTypeSetConfiguration) elementTypeUIResource.getContents().get(0)).getIdentifier());
+					ElementTypeSetConfigurationRegistry.getInstance().unload(clientContextId, ((ElementTypeSetConfiguration) elementTypeSemResource.getContents().get(0)).getIdentifier());
+					ElementTypeSetConfigurationRegistry.getInstance().unload(clientContextId, ((ElementTypeSetConfiguration) elementTypeUIResource.getContents().get(0)).getIdentifier());
 
-					ElementTypeSetConfigurationRegistry.getInstance().loadElementTypeSetConfiguration(clientContext, ((ElementTypeSetConfiguration) elementTypeSemResource.getContents().get(0)));
-					ElementTypeSetConfigurationRegistry.getInstance().loadElementTypeSetConfiguration(clientContext, ((ElementTypeSetConfiguration) elementTypeUIResource.getContents().get(0)));
+					ElementTypeSetConfigurationRegistry.getInstance().loadElementTypeSetConfiguration(clientContextId, ((ElementTypeSetConfiguration) elementTypeSemResource.getContents().get(0)));
+					ElementTypeSetConfigurationRegistry.getInstance().loadElementTypeSetConfiguration(clientContextId, ((ElementTypeSetConfiguration) elementTypeUIResource.getContents().get(0)));
 				}
 			}
 		}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/PapyrusPaletteService.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/PapyrusPaletteService.java
index ff93ae87e4a..8cc3f07db37 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/PapyrusPaletteService.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/PapyrusPaletteService.java
@@ -985,16 +985,17 @@ public class PapyrusPaletteService extends PaletteService implements IPalettePro
 		}
 
 		Diagram diagram = ((DiagramEditor) editor).getDiagram();
+		PolicyChecker checker = PolicyChecker.getFor(diagram);
 		for (Object o : root.getChildren()) {
 			if (o instanceof PaletteDrawer) {
 				PaletteDrawer drawer = (PaletteDrawer) o;
-				boolean isVisible = PolicyChecker.getCurrent().isInPalette(diagram, drawer.getId());
+				boolean isVisible = checker.isInPalette(diagram, drawer.getId());
 				drawer.setVisible(isVisible);
 				if (isVisible) {
 					for (Object x : drawer.getChildren()) {
 						if (x instanceof PaletteEntry) {
 							PaletteEntry entry = (PaletteEntry) x;
-							entry.setVisible(PolicyChecker.getCurrent().isInPalette(diagram, entry.getId()));
+							entry.setVisible(checker.isInPalette(diagram, entry.getId()));
 						}
 					}
 				}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/XMLPaletteApplicator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/XMLPaletteApplicator.java
index df003e3e789..dbe157cf5b0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/XMLPaletteApplicator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/XMLPaletteApplicator.java
@@ -155,7 +155,7 @@ public class XMLPaletteApplicator implements XMLPaletteDefinitionVisitor, IPapyr
 	public void onToolEntry(Node node) {
 		String id = node.getAttributes().getNamedItem(ID).getNodeValue();
 		PaletteEntry entry = predefinedEntries.get(id);
-		if (PolicyChecker.getCurrent().isInPalette(diagram, id)) {
+		if (PolicyChecker.getFor(diagram).isInPalette(diagram, id)) {
 			appendPaletteEntry(computePath(node), entry);
 		}
 	}
@@ -206,7 +206,7 @@ public class XMLPaletteApplicator implements XMLPaletteDefinitionVisitor, IPapyr
 		CombinedTemplateCreationEntry realEntry = new AspectCreationEntry(name, desc, id, iconDesc, entry, properties);
 
 		predefinedEntries.put(id, realEntry);
-		if (PolicyChecker.getCurrent().isInPalette(diagram, id)) {
+		if (PolicyChecker.getFor(diagram).isInPalette(diagram, id)) {
 			appendPaletteEntry(computePath(node), realEntry);
 		}
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/migration/StereotypeDisplayDiagramReconciler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/migration/StereotypeDisplayDiagramReconciler_1_2_0.java
index 07a4b0f863f..6fd156c4d51 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/migration/StereotypeDisplayDiagramReconciler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/migration/StereotypeDisplayDiagramReconciler_1_2_0.java
@@ -25,7 +25,7 @@ import org.eclipse.papyrus.uml.diagram.common.util.CommandUtil;
 /**
  *
  */
-public class StereotypeDisplayDiagramReconciler extends DiagramReconciler {
+public class StereotypeDisplayDiagramReconciler_1_2_0 extends DiagramReconciler {
 
 	/**
 	 * {@inheritDoc}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/migration/editpolicies/StereotypeEAnnotationLabelMigrationEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/migration/editpolicies/StereotypeEAnnotationLabelMigrationEditPolicy.java
index 5cc40882dee..dacf47eea10 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/migration/editpolicies/StereotypeEAnnotationLabelMigrationEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/migration/editpolicies/StereotypeEAnnotationLabelMigrationEditPolicy.java
@@ -19,7 +19,7 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.infra.emf.commands.RemoveEAnnotationDetailCommand;
-import org.eclipse.papyrus.uml.diagram.common.stereotype.migration.StereotypeDisplayDiagramReconciler;
+import org.eclipse.papyrus.uml.diagram.common.stereotype.migration.StereotypeDisplayDiagramReconciler_1_2_0;
 import org.eclipse.papyrus.uml.diagram.common.stereotype.migration.StereotypeDisplayMigrationConstant;
 import org.eclipse.papyrus.uml.diagram.common.stereotype.migration.commands.StereotypeLabelMigrationCommand;
 import org.eclipse.papyrus.uml.diagram.common.util.CommandUtil;
@@ -30,7 +30,7 @@ import org.eclipse.papyrus.uml.diagram.common.util.CommandUtil;
  *
  * @author Céline JANSSENS
  *
- * @deprecated Replaced by {@link StereotypeDisplayDiagramReconciler}
+ * @deprecated Replaced by {@link StereotypeDisplayDiagramReconciler_1_2_0}
  */
 @Deprecated
 public class StereotypeEAnnotationLabelMigrationEditPolicy extends StereotypeEAnnotationMigrationEditPolicy {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/migration/editpolicies/StereotypeEAnnotationMigrationEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/migration/editpolicies/StereotypeEAnnotationMigrationEditPolicy.java
index 3f60438d974..7b3d05ed21b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/migration/editpolicies/StereotypeEAnnotationMigrationEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/migration/editpolicies/StereotypeEAnnotationMigrationEditPolicy.java
@@ -32,7 +32,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.infra.emf.commands.RemoveEAnnotationCommand;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;
 import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayUtil;
-import org.eclipse.papyrus.uml.diagram.common.stereotype.migration.StereotypeDisplayDiagramReconciler;
+import org.eclipse.papyrus.uml.diagram.common.stereotype.migration.StereotypeDisplayDiagramReconciler_1_2_0;
 import org.eclipse.papyrus.uml.diagram.common.stereotype.migration.StereotypeMigrationHelper;
 import org.eclipse.papyrus.uml.diagram.common.util.CommandUtil;
 
@@ -42,7 +42,7 @@ import org.eclipse.papyrus.uml.diagram.common.util.CommandUtil;
  *
  * @author Céline JANSSENS
  *
- * @deprecated Replaced by {@link StereotypeDisplayDiagramReconciler}
+ * @deprecated Replaced by {@link StereotypeDisplayDiagramReconciler_1_2_0}
  */
 @Deprecated
 public abstract class StereotypeEAnnotationMigrationEditPolicy extends AbstractEditPolicy {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/migration/editpolicies/StereotypeEAnnotationNestedMigrationEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/migration/editpolicies/StereotypeEAnnotationNestedMigrationEditPolicy.java
index adf3e0cafd7..0ee68ebade4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/migration/editpolicies/StereotypeEAnnotationNestedMigrationEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/migration/editpolicies/StereotypeEAnnotationNestedMigrationEditPolicy.java
@@ -19,7 +19,7 @@ import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.stereotype.migration.StereotypeDisplayDiagramReconciler;
+import org.eclipse.papyrus.uml.diagram.common.stereotype.migration.StereotypeDisplayDiagramReconciler_1_2_0;
 import org.eclipse.papyrus.uml.diagram.common.stereotype.migration.commands.StereotypeNestedPropertiesMigrationCommand;
 
 /**
@@ -36,7 +36,7 @@ import org.eclipse.papyrus.uml.diagram.common.stereotype.migration.commands.Ster
  *
  * @author Céline JANSSENS
  *
- * @deprecated Replaced by {@link StereotypeDisplayDiagramReconciler}
+ * @deprecated Replaced by {@link StereotypeDisplayDiagramReconciler_1_2_0}
  */
 @Deprecated
 public class StereotypeEAnnotationNestedMigrationEditPolicy extends StereotypeEAnnotationPropertiesMigrationEditPolicy {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/migration/editpolicies/StereotypeEAnnotationPropertiesMigrationEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/migration/editpolicies/StereotypeEAnnotationPropertiesMigrationEditPolicy.java
index 86fdc7c2c28..c0898263fae 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/migration/editpolicies/StereotypeEAnnotationPropertiesMigrationEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/migration/editpolicies/StereotypeEAnnotationPropertiesMigrationEditPolicy.java
@@ -20,7 +20,7 @@ import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.infra.emf.commands.RemoveEAnnotationDetailCommand;
 import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayConstant;
-import org.eclipse.papyrus.uml.diagram.common.stereotype.migration.StereotypeDisplayDiagramReconciler;
+import org.eclipse.papyrus.uml.diagram.common.stereotype.migration.StereotypeDisplayDiagramReconciler_1_2_0;
 import org.eclipse.papyrus.uml.diagram.common.stereotype.migration.StereotypeDisplayMigrationConstant;
 import org.eclipse.papyrus.uml.diagram.common.stereotype.migration.commands.StereotypeCommentPropertiesMigrationCommand;
 import org.eclipse.papyrus.uml.diagram.common.stereotype.migration.commands.StereotypePropertiesMigrationCommand;
@@ -32,7 +32,7 @@ import org.eclipse.papyrus.uml.diagram.common.util.CommandUtil;
  *
  * @author Céline JANSSENS
  *
- * @deprecated Replaced by {@link StereotypeDisplayDiagramReconciler}
+ * @deprecated Replaced by {@link StereotypeDisplayDiagramReconciler_1_2_0}
  */
 @Deprecated
 public class StereotypeEAnnotationPropertiesMigrationEditPolicy extends StereotypeEAnnotationMigrationEditPolicy {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/migration/CommunicationReconcilerForCompartment.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/migration/CommunicationReconcilerForCompartment_1_2_0.java
index c8848da86ff..228d30ae7c9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/migration/CommunicationReconcilerForCompartment.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/migration/CommunicationReconcilerForCompartment_1_2_0.java
@@ -21,7 +21,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.ReconcilerForCompartm
 /**
  * Diagram Reconciler for compartment from 1.1.0 to 1.2.0
  */
-public class CommunicationReconcilerForCompartment extends ReconcilerForCompartment {
+public class CommunicationReconcilerForCompartment_1_2_0 extends ReconcilerForCompartment {
 
 	private static final String InteractionCompartmentEditPart_VISUAL_ID = "7001";
 	
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/migration/CommunicationReconciler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/migration/CommunicationReconciler_1_1_0.java
index 77336af6620..ab9706e9c7d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/migration/CommunicationReconciler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/migration/CommunicationReconciler_1_1_0.java
@@ -1,58 +1,58 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2015 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.communication.custom.migration;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.papyrus.infra.gmfdiag.common.commands.InsertFloatingLabelFromMapCommand;

-import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler;

-

-/**

- * Communication Diagram Reconciler from 1.0.0 to 1.1.0

- */

-public class CommunicationReconciler extends DiagramReconciler {

-

-	private static final String InteractionEditPart_VISUAL_ID = "8002";

-	private static final String InteractionFloatingLabelEditPart_VISUAL_ID = "6013";

-	private static final String LifelineEditPartCN_VISUAL_ID = "8001";

-	private static final String LifelineFloatingLabelEditPartCN_VISUAL_ID = "6014";

-

-	/**

-	 * Gets the reconcile command.

-	 *

-	 * @param diagram

-	 *            the diagram

-	 * @return the reconcile command

-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler#getReconcileCommand(org.eclipse.gmf.runtime.notation.Diagram)

-	 */

-	@Override

-	public ICommand getReconcileCommand(Diagram diagram) {

-		return new InsertFloatingLabelFromMapCommand(diagram, getFloatingLabelMap());

-	}

-

-	/**

-	 * Gets the floating label map to add.

-	 *

-	 * @return the floating label map

-	 */

-	private Map<String, String> getFloatingLabelMap() {

-		Map<String, String> map = new HashMap<String, String>();

-		map.put(InteractionEditPart_VISUAL_ID, InteractionFloatingLabelEditPart_VISUAL_ID);

-		map.put(LifelineEditPartCN_VISUAL_ID, LifelineFloatingLabelEditPartCN_VISUAL_ID);

-

-		return map;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.communication.custom.migration;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.infra.gmfdiag.common.commands.InsertFloatingLabelFromMapCommand;
+import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler;
+
+/**
+ * Communication Diagram Reconciler from 1.0.0 to 1.1.0
+ */
+public class CommunicationReconciler_1_1_0 extends DiagramReconciler {
+
+	private static final String InteractionEditPart_VISUAL_ID = "8002";
+	private static final String InteractionFloatingLabelEditPart_VISUAL_ID = "6013";
+	private static final String LifelineEditPartCN_VISUAL_ID = "8001";
+	private static final String LifelineFloatingLabelEditPartCN_VISUAL_ID = "6014";
+
+	/**
+	 * Gets the reconcile command.
+	 *
+	 * @param diagram
+	 *            the diagram
+	 * @return the reconcile command
+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler#getReconcileCommand(org.eclipse.gmf.runtime.notation.Diagram)
+	 */
+	@Override
+	public ICommand getReconcileCommand(Diagram diagram) {
+		return new InsertFloatingLabelFromMapCommand(diagram, getFloatingLabelMap());
+	}
+
+	/**
+	 * Gets the floating label map to add.
+	 *
+	 * @return the floating label map
+	 */
+	private Map<String, String> getFloatingLabelMap() {
+		Map<String, String> map = new HashMap<String, String>();
+		map.put(InteractionEditPart_VISUAL_ID, InteractionFloatingLabelEditPart_VISUAL_ID);
+		map.put(LifelineEditPartCN_VISUAL_ID, LifelineFloatingLabelEditPartCN_VISUAL_ID);
+
+		return map;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/policies/itemsemantic/CustomLifelineItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/policies/itemsemantic/CustomLifelineItemSemanticEditPolicyCN.java
index fb68d4e0f9f..0590a9f3f88 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/policies/itemsemantic/CustomLifelineItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/policies/itemsemantic/CustomLifelineItemSemanticEditPolicyCN.java
@@ -1,132 +1,146 @@
-/*****************************************************************************

- * 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:

- *  Saadia DHOUIB (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.diagram.communication.custom.policies.itemsemantic;

-

-import java.util.Iterator;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.communication.custom.commands.CustomMessageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.communication.custom.commands.CustomMessagesReorientCommand;

-import org.eclipse.papyrus.uml.diagram.communication.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.communication.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.communication.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.communication.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.communication.edit.parts.MessageEditPart;

-import org.eclipse.papyrus.uml.diagram.communication.edit.policies.LifelineItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.uml.diagram.communication.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.communication.providers.UMLElementTypes;

-import org.eclipse.uml2.uml.Message;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * this is a specialization to manage creation of Message,

- * CommentAnnotatedElement, ConstraintConstrainedElement,

- * DurationObservationEvent and TimeObservationEvent

- */

-public class CustomLifelineItemSemanticEditPolicyCN extends LifelineItemSemanticEditPolicyCN {

-

-	@Override

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-

-		if (UMLElementTypes.Path_Edge == req.getElementType()) {

-

-			return getGEFWrapper(new CustomMessageCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-

-		if (UMLElementTypes.Comment_AnnotatedElementEdge == req.getElementType()) {

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if (UMLElementTypes.Constraint_ConstrainedElementEdge == req.getElementType()) {

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-

-		if (UMLElementTypes.DurationObservation_EventEdge == req.getElementType()) {

-			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-

-		if (UMLElementTypes.TimeObservation_EventEdge == req.getElementType()) {

-			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-

-		return null;

-	}

-

-	@Override

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		if (UMLElementTypes.Path_Edge == req.getElementType()) {

-			return getGEFWrapper(new CustomMessageCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-

-		return null;

-	}

-

-	@Override

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-

-		// System.err.println("getReorientRelationshipCommand VisualID of element to reorient :" + getVisualID(req));

-		switch (getVisualID(req)) {

-		case MessageEditPart.VISUAL_ID:

-

-			// return getGEFWrapper(new CustomMessagesReorientCommand(req));

-			View connector = (View) req.getParameter(UMLBaseItemSemanticEditPolicy.GRAPHICAL_RECONNECTED_EDGE);

-			Object elementToedit = UMLPackage.eINSTANCE.getMessage();

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(elementToedit);

-			if (provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-

-			ICommand reorientCommand = null;

-			// 1. add the reorient messages command

-			reorientCommand = CompositeCommand.compose(reorientCommand, new CustomMessagesReorientCommand(req));

-

-			Iterator<?> it = connector.getChildren().iterator();

-			while (it.hasNext()) {

-				Object object = it.next();

-

-				if (object instanceof View) {

-					View child = (View) object;

-

-					if ((child.getElement() != null) && (child.getElement() instanceof Message)) {

-

-						Message messageToReorient = (Message) child.getElement();

-						ReorientRequest reorientMessageRequest = new ReorientRelationshipRequest(messageToReorient, req.getNewRelationshipEnd(), req.getOldRelationshipEnd(), req.getDirection());

-						reorientMessageRequest.setParameter(UMLBaseItemSemanticEditPolicy.GRAPHICAL_RECONNECTED_EDGE, connector);

-						ICommand reorientMessageCommand = provider.getEditCommand(reorientMessageRequest);

-						reorientCommand = CompositeCommand.compose(reorientCommand, reorientMessageCommand);

-						break;

-					}

-				}

-

-			}

-

-			if (reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-

-}

+/*****************************************************************************
+ * 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:
+ *  Saadia DHOUIB (CEA LIST) saadia.dhouib@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.communication.custom.policies.itemsemantic;
+
+import java.util.Iterator;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.uml.diagram.communication.custom.commands.CustomMessageCreateCommand;
+import org.eclipse.papyrus.uml.diagram.communication.custom.commands.CustomMessagesReorientCommand;
+import org.eclipse.papyrus.uml.diagram.communication.edit.commands.CommentAnnotatedElementCreateCommand;
+import org.eclipse.papyrus.uml.diagram.communication.edit.commands.ConnectorDurationObservationCreateCommand;
+import org.eclipse.papyrus.uml.diagram.communication.edit.commands.ConnectorTimeObservationCreateCommand;
+import org.eclipse.papyrus.uml.diagram.communication.edit.commands.ConstraintConstrainedElementCreateCommand;
+import org.eclipse.papyrus.uml.diagram.communication.edit.parts.MessageEditPart;
+import org.eclipse.papyrus.uml.diagram.communication.edit.policies.LifelineItemSemanticEditPolicyCN;
+import org.eclipse.papyrus.uml.diagram.communication.edit.policies.UMLBaseItemSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.communication.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.diagram.communication.providers.UMLElementTypes;
+import org.eclipse.uml2.uml.Message;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * this is a specialization to manage creation of Message,
+ * CommentAnnotatedElement, ConstraintConstrainedElement,
+ * DurationObservationEvent and TimeObservationEvent
+ */
+public class CustomLifelineItemSemanticEditPolicyCN extends LifelineItemSemanticEditPolicyCN {
+
+	@Override
+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {
+
+		if (UMLElementTypes.Path_Edge == req.getElementType()) {
+
+			return getGEFWrapper(new CustomMessageCreateCommand(req, req.getSource(), req.getTarget()));
+		}
+
+		if (UMLElementTypes.Comment_AnnotatedElementEdge == req.getElementType()) {
+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));
+		}
+		if (UMLElementTypes.Constraint_ConstrainedElementEdge == req.getElementType()) {
+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));
+		}
+
+		if (UMLElementTypes.DurationObservation_EventEdge == req.getElementType()) {
+			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req, req.getSource(), req.getTarget()));
+		}
+
+		if (UMLElementTypes.TimeObservation_EventEdge == req.getElementType()) {
+			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req, req.getSource(), req.getTarget()));
+		}
+
+		return null;
+	}
+
+	@Override
+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {
+		if (UMLElementTypes.Path_Edge == req.getElementType()) {
+			return getGEFWrapper(new CustomMessageCreateCommand(req, req.getSource(), req.getTarget()));
+		}
+
+		return null;
+	}
+
+	@Override
+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {
+
+		// System.err.println("getReorientRelationshipCommand VisualID of element to reorient :" + getVisualID(req));
+		switch (getVisualID(req)) {
+		case MessageEditPart.VISUAL_ID:
+
+			// return getGEFWrapper(new CustomMessagesReorientCommand(req));
+			View connector = (View) req.getParameter(UMLBaseItemSemanticEditPolicy.GRAPHICAL_RECONNECTED_EDGE);
+			EClass elementToedit = UMLPackage.eINSTANCE.getMessage();
+			
+			IClientContext context;
+			try {
+				context = TypeContext.getContext(getEditingDomain());
+			} catch (ServiceException e) {
+				UMLDiagramEditorPlugin.getInstance().getLogHelper().error(e);
+				return UnexecutableCommand.INSTANCE;
+			}
+
+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(elementToedit, context);
+			if (provider == null) {
+				return UnexecutableCommand.INSTANCE;
+			}
+
+			ICommand reorientCommand = null;
+			// 1. add the reorient messages command
+			reorientCommand = CompositeCommand.compose(reorientCommand, new CustomMessagesReorientCommand(req));
+
+			Iterator<?> it = connector.getChildren().iterator();
+			while (it.hasNext()) {
+				Object object = it.next();
+
+				if (object instanceof View) {
+					View child = (View) object;
+
+					if ((child.getElement() != null) && (child.getElement() instanceof Message)) {
+
+						Message messageToReorient = (Message) child.getElement();
+						ReorientRequest reorientMessageRequest = new ReorientRelationshipRequest(messageToReorient, req.getNewRelationshipEnd(), req.getOldRelationshipEnd(), req.getDirection());
+						reorientMessageRequest.setParameter(UMLBaseItemSemanticEditPolicy.GRAPHICAL_RECONNECTED_EDGE, connector);
+						ICommand reorientMessageCommand = provider.getEditCommand(reorientMessageRequest);
+						reorientCommand = CompositeCommand.compose(reorientCommand, reorientMessageCommand);
+						break;
+					}
+				}
+
+			}
+
+			if (reorientCommand == null) {
+				return UnexecutableCommand.INSTANCE;
+			}
+			return getGEFWrapper(reorientCommand.reduce());
+		}
+		return super.getReorientRelationshipCommand(req);
+	}
+
+
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/model/communicationdiagram.configuration b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/model/communicationdiagram.configuration
deleted file mode 100644
index d40dee1b1e2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/model/communicationdiagram.configuration
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<configuration:PapyrusConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmi:id="_ko07IErbEeSdQKzSRatBjg">

-  <viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="_xogdoErbEeSdQKzSRatBjg" name="Default Papyrus Viewpoint">

-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_jRtroHDuEeWh-MssWmCB_A" implementationID="PapyrusUMLCommunicationDiagram">

-      <modelRules xmi:id="_jRtroXDuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Interaction"/>

-      </modelRules>

-      <owningRules xmi:id="_jRtronDuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Interaction"/>

-      </owningRules>

-      <owningRules xmi:id="_jRtro3DuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>

-        <newModelPath xmi:id="_jRtrpHDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">

-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>

-        </newModelPath>

-      </owningRules>

-      <owningRules xmi:id="_jRtrpXDuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>

-        <newModelPath xmi:id="_jRtrpnDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">

-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>

-        </newModelPath>

-      </owningRules>

-      <owningRules xmi:id="_jRtrp3DuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-        <newModelPath xmi:id="_jRtrqHDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">

-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>

-        </newModelPath>

-      </owningRules>

-      <categories href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb4txhEeOqHvRyiN87hA"/>

-      <childRules xmi:id="_jRtrqXDuEeWh-MssWmCB_A"/>

-    </modelKinds>

-  </viewpoints>

-  <defaultStakeholder href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmkdxhEeOqHvRyiN87hA"/>

-  <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>

-</configuration:PapyrusConfiguration>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/plugin.xml
index 4a57beb83a4..1b800d7b8d1 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/plugin.xml
@@ -16,14 +16,6 @@
 -->
 <plugin>
    <extension
-         point="org.eclipse.papyrus.infra.viewpoints.policy.custom">
-      <contribution
-            file="model/communicationdiagram.configuration"
-            original="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration">
-      </contribution>
-   </extension>
-      
-   <extension
          point="org.eclipse.ui.commands">
       <command
 			categoryId="org.eclipse.papyrus.editor.category"
@@ -540,21 +532,21 @@
       point="org.eclipse.papyrus.infra.gmfdiag.common.diagramReconciler">
        <diagramReconciler
          diagramType="PapyrusUMLCommunicationDiagram"
-         reconcilerClass="org.eclipse.papyrus.uml.diagram.communication.custom.migration.CommunicationReconciler"
-         source="undefined"
-         target="1.1.0">
+         reconcilerClass="org.eclipse.papyrus.uml.diagram.communication.custom.migration.CommunicationReconciler_1_1_0"
+         source="1.0.0"
+         target="1.3.0">
    </diagramReconciler>
    <diagramReconciler
          diagramType="PapyrusUMLCommunicationDiagram"
-         reconcilerClass="org.eclipse.papyrus.uml.diagram.communication.custom.migration.CommunicationReconcilerForCompartment"
-         source="undefined"
-         target="1.2.0">
+         reconcilerClass="org.eclipse.papyrus.uml.diagram.communication.custom.migration.CommunicationReconcilerForCompartment_1_2_0"
+         source="1.1.0"
+         target="1.3.0">
    </diagramReconciler>
    <diagramReconciler
          diagramType="PapyrusUMLCommunicationDiagram"
          reconcilerClass="org.eclipse.papyrus.uml.diagram.communication.custom.migration.CommunicationReconciler_1_2_0"
          source="1.1.0"
-         target="1.2.0">
+         target="1.3.0">
    </diagramReconciler>
 </extension>
    <extension point="org.eclipse.papyrus.infra.gmfdiag.common.visualTypeProviders">
@@ -578,14 +570,4 @@
             path="model/communicationdiagram-notation.elementtypesconfigurations">
       </elementTypeSet>
    </extension>
-   <extension
-         point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
-      <elementTypeSet
-            clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
-            path="model/communicationdiagram-uml.elementtypesconfigurations">
-      </elementTypeSet>
-   </extension>
-
-
-
 </plugin>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/commands/CommentCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/commands/CommentCreateCommandCN.java
index 2f6ed62de1c..6520e077b93 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/commands/CommentCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/commands/CommentCreateCommandCN.java
@@ -1,127 +1,127 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.communication.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.communication.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Comment;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class CommentCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public CommentCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getComment());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Comment newElement = UMLFactory.eINSTANCE.createComment();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Element qualifiedTarget = (Element) target;

-				qualifiedTarget.getOwnedComments()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Comment_Shape(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Comment newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.communication.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.papyrus.uml.diagram.communication.providers.ElementInitializers;
+import org.eclipse.uml2.uml.Comment;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class CommentCreateCommandCN extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	public CommentCreateCommandCN(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		return container;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getComment());
+		return data.isPermitted();
+
+
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+
+		Comment newElement = UMLFactory.eINSTANCE.createComment();
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+
+				Element qualifiedTarget = (Element) target;
+				qualifiedTarget.getOwnedComments()
+						.add(newElement);
+
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+
+
+		ElementInitializers.getInstance().init_Comment_Shape(newElement);
+
+		doConfigure(newElement, monitor, info);
+
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(Comment newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/commands/ConstraintCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/commands/ConstraintCreateCommandCN.java
index 766d19c5178..b481bb9a180 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/commands/ConstraintCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/commands/ConstraintCreateCommandCN.java
@@ -1,127 +1,127 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.communication.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.communication.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Constraint;

-import org.eclipse.uml2.uml.Namespace;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ConstraintCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ConstraintCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getConstraint());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Constraint newElement = UMLFactory.eINSTANCE.createConstraint();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Namespace qualifiedTarget = (Namespace) target;

-				qualifiedTarget.getOwnedRules()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Constraint_Shape(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Constraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.communication.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.papyrus.uml.diagram.communication.providers.ElementInitializers;
+import org.eclipse.uml2.uml.Constraint;
+import org.eclipse.uml2.uml.Namespace;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class ConstraintCreateCommandCN extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	public ConstraintCreateCommandCN(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		return container;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getConstraint());
+		return data.isPermitted();
+
+
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+
+		Constraint newElement = UMLFactory.eINSTANCE.createConstraint();
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+
+				Namespace qualifiedTarget = (Namespace) target;
+				qualifiedTarget.getOwnedRules()
+						.add(newElement);
+
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+
+
+		ElementInitializers.getInstance().init_Constraint_Shape(newElement);
+
+		doConfigure(newElement, monitor, info);
+
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(Constraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/commands/DurationObservationCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/commands/DurationObservationCreateCommandCN.java
index 24f6b455f56..ada8432ae64 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/commands/DurationObservationCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/commands/DurationObservationCreateCommandCN.java
@@ -1,127 +1,127 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.communication.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.communication.providers.ElementInitializers;

-import org.eclipse.uml2.uml.DurationObservation;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class DurationObservationCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public DurationObservationCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDurationObservation());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		DurationObservation newElement = UMLFactory.eINSTANCE.createDurationObservation();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_DurationObservation_Shape(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(DurationObservation newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.communication.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.papyrus.uml.diagram.communication.providers.ElementInitializers;
+import org.eclipse.uml2.uml.DurationObservation;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class DurationObservationCreateCommandCN extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	public DurationObservationCreateCommandCN(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		return container;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDurationObservation());
+		return data.isPermitted();
+
+
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+
+		DurationObservation newElement = UMLFactory.eINSTANCE.createDurationObservation();
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+
+				Package qualifiedTarget = (Package) target;
+				qualifiedTarget.getPackagedElements()
+						.add(newElement);
+
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+
+
+		ElementInitializers.getInstance().init_DurationObservation_Shape(newElement);
+
+		doConfigure(newElement, monitor, info);
+
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(DurationObservation newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/commands/InteractionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/commands/InteractionCreateCommand.java
index b22b3c41e45..a61802a6192 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/commands/InteractionCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/commands/InteractionCreateCommand.java
@@ -1,131 +1,131 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.communication.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.communication.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Component;

-import org.eclipse.uml2.uml.Interaction;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class InteractionCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public InteractionCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInteraction());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Interaction newElement = UMLFactory.eINSTANCE.createInteraction();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-		Component childHolder = (Component) getElementToEdit();

-		childHolder.getPackagedElements()

-				.add(newElement);

-

-		ElementInitializers.getInstance().init_Interaction_Shape(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Interaction newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.communication.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.papyrus.uml.diagram.communication.providers.ElementInitializers;
+import org.eclipse.uml2.uml.Component;
+import org.eclipse.uml2.uml.Interaction;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class InteractionCreateCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	public InteractionCreateCommand(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		return container;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInteraction());
+		return data.isPermitted();
+
+
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+
+		Interaction newElement = UMLFactory.eINSTANCE.createInteraction();
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+
+				Package qualifiedTarget = (Package) target;
+				qualifiedTarget.getPackagedElements()
+						.add(newElement);
+
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+
+		Component childHolder = (Component) getElementToEdit();
+		childHolder.getPackagedElements()
+				.add(newElement);
+
+		ElementInitializers.getInstance().init_Interaction_Shape(newElement);
+
+		doConfigure(newElement, monitor, info);
+
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(Interaction newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/commands/LifelineCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/commands/LifelineCreateCommandCN.java
index b1e4b9835ec..6e359c9d63d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/commands/LifelineCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/commands/LifelineCreateCommandCN.java
@@ -1,127 +1,127 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.communication.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.communication.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Interaction;

-import org.eclipse.uml2.uml.Lifeline;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class LifelineCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public LifelineCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getLifeline());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Lifeline newElement = UMLFactory.eINSTANCE.createLifeline();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Interaction qualifiedTarget = (Interaction) target;

-				qualifiedTarget.getLifelines()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Lifeline_Shape(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Lifeline newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.communication.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.papyrus.uml.diagram.communication.providers.ElementInitializers;
+import org.eclipse.uml2.uml.Interaction;
+import org.eclipse.uml2.uml.Lifeline;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class LifelineCreateCommandCN extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	public LifelineCreateCommandCN(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		return container;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getLifeline());
+		return data.isPermitted();
+
+
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+
+		Lifeline newElement = UMLFactory.eINSTANCE.createLifeline();
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+
+				Interaction qualifiedTarget = (Interaction) target;
+				qualifiedTarget.getLifelines()
+						.add(newElement);
+
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+
+
+		ElementInitializers.getInstance().init_Lifeline_Shape(newElement);
+
+		doConfigure(newElement, monitor, info);
+
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(Lifeline newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/commands/TimeObservationCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/commands/TimeObservationCreateCommandCN.java
index af9c4e68618..190a4e90dc1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/commands/TimeObservationCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/commands/TimeObservationCreateCommandCN.java
@@ -1,127 +1,127 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.communication.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.communication.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.TimeObservation;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class TimeObservationCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public TimeObservationCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getTimeObservation());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		TimeObservation newElement = UMLFactory.eINSTANCE.createTimeObservation();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_TimeObservation_Shape(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(TimeObservation newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.communication.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.papyrus.uml.diagram.communication.providers.ElementInitializers;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.TimeObservation;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class TimeObservationCreateCommandCN extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	public TimeObservationCreateCommandCN(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		return container;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getTimeObservation());
+		return data.isPermitted();
+
+
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+
+		TimeObservation newElement = UMLFactory.eINSTANCE.createTimeObservation();
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+
+				Package qualifiedTarget = (Package) target;
+				qualifiedTarget.getPackagedElements()
+						.add(newElement);
+
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+
+
+		ElementInitializers.getInstance().init_TimeObservation_Shape(newElement);
+
+		doConfigure(newElement, monitor, info);
+
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(TimeObservation newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/migration/ComponentReconcilerForCompartment.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/migration/ComponentReconcilerForCompartment_1_2_0.java
index f9b4f52ee91..65ceca684d0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/migration/ComponentReconcilerForCompartment.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/migration/ComponentReconcilerForCompartment_1_2_0.java
@@ -21,7 +21,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.ReconcilerForCompartm
 /**
  * Diagram Reconciler for compartment from 1.1.0 to 1.2.0
  */
-public class ComponentReconcilerForCompartment extends ReconcilerForCompartment {
+public class ComponentReconcilerForCompartment_1_2_0 extends ReconcilerForCompartment {
 
 	private static final String ComponentCompositeCompartmentEditPart_VISUAL_ID = "7001"; //$NON-NLS-1$
 	private static final String ModelPackageableElementCompartmentEditPart_VISUAL_ID = "7006"; //$NON-NLS-1$
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/migration/ComponentReconciler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/migration/ComponentReconciler_1_1_0.java
index 5d6f313ccc2..1c7e0829d31 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/migration/ComponentReconciler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/migration/ComponentReconciler_1_1_0.java
@@ -1,76 +1,76 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2015 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.component.custom.migration;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.papyrus.infra.gmfdiag.common.commands.InsertFloatingLabelFromMapCommand;

-import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler;

-

-/**

- * Component Diagram Reconciler from 1.0.0 to 1.1.0

- */

-public class ComponentReconciler extends DiagramReconciler {

-

-	private final static String ComponentEditPart_VISUAL_ID = "2002"; //$NON-NLS-1$

-	private final static String ComponentFloatingLabelEditPart_VISUAL_ID = "6030"; //$NON-NLS-1$

-	private final static String ComponentEditPartCN_VISUAL_ID = "3070"; //$NON-NLS-1$

-	private final static String ComponentFloatingLabelEditPartCN_VISUAL_ID = "6026"; //$NON-NLS-1$

-	private final static String ComponentEditPartPCN_VISUAL_ID = "3071"; //$NON-NLS-1$

-	private final static String ComponentFloatingLabelEditPartPCN_VISUAL_ID = "6027"; //$NON-NLS-1$

-	private final static String DependencyNodeEditPart_VISUAL_ID = "3203"; //$NON-NLS-1$

-	private final static String DependencyNodeFloatingLabelEditPart_VISUAL_ID = "6029"; //$NON-NLS-1$

-	private final static String InterfaceEditPart_VISUAL_ID = "2003"; //$NON-NLS-1$

-	private final static String InterfaceFloatingLabelEditPart_VISUAL_ID = "6032"; //$NON-NLS-1$

-	private final static String InterfaceEditPartPCN_VISUAL_ID = "3072"; //$NON-NLS-1$

-	private final static String InterfaceFloatingLabelEditPartPCN_VISUAL_ID = "6028"; //$NON-NLS-1$

-	private final static String RectangleInterfaceEditPart_VISUAL_ID = "3205"; //$NON-NLS-1$

-	private final static String RectangleInterfaceFloatingLabelEditPart_VISUAL_ID = "6031"; //$NON-NLS-1$

-	private final static String RectangleInterfaceEditPartCN_VISUAL_ID = "3078"; //$NON-NLS-1$

-	private final static String RectangleInterfaceFloatingLabelEditPartCN_VISUAL_ID = "6033"; //$NON-NLS-1$

-

-	/**

-	 * Gets the reconcile command.

-	 *

-	 * @param diagram

-	 *            the diagram

-	 * @return the reconcile command

-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler#getReconcileCommand(org.eclipse.gmf.runtime.notation.Diagram)

-	 */

-	@Override

-	public ICommand getReconcileCommand(Diagram diagram) {

-		return new InsertFloatingLabelFromMapCommand(diagram, getFloatingLabelMap());

-	}

-

-	/**

-	 * Gets the floating label map to add.

-	 *

-	 * @return the floating label map

-	 */

-	private Map<String, String> getFloatingLabelMap() {

-		Map<String, String> map = new HashMap<>();

-		map.put(ComponentEditPart_VISUAL_ID, ComponentFloatingLabelEditPart_VISUAL_ID);

-		map.put(ComponentEditPartCN_VISUAL_ID, ComponentFloatingLabelEditPartCN_VISUAL_ID);

-		map.put(ComponentEditPartPCN_VISUAL_ID, ComponentFloatingLabelEditPartPCN_VISUAL_ID);

-		map.put(DependencyNodeEditPart_VISUAL_ID, DependencyNodeFloatingLabelEditPart_VISUAL_ID);

-		map.put(InterfaceEditPart_VISUAL_ID, InterfaceFloatingLabelEditPart_VISUAL_ID);

-		map.put(InterfaceEditPartPCN_VISUAL_ID, InterfaceFloatingLabelEditPartPCN_VISUAL_ID);

-		map.put(RectangleInterfaceEditPart_VISUAL_ID, RectangleInterfaceFloatingLabelEditPart_VISUAL_ID);

-		map.put(RectangleInterfaceEditPartCN_VISUAL_ID, RectangleInterfaceFloatingLabelEditPartCN_VISUAL_ID);

-

-		return map;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.component.custom.migration;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.infra.gmfdiag.common.commands.InsertFloatingLabelFromMapCommand;
+import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler;
+
+/**
+ * Component Diagram Reconciler from 1.0.0 to 1.1.0
+ */
+public class ComponentReconciler_1_1_0 extends DiagramReconciler {
+
+	private final static String ComponentEditPart_VISUAL_ID = "2002"; //$NON-NLS-1$
+	private final static String ComponentFloatingLabelEditPart_VISUAL_ID = "6030"; //$NON-NLS-1$
+	private final static String ComponentEditPartCN_VISUAL_ID = "3070"; //$NON-NLS-1$
+	private final static String ComponentFloatingLabelEditPartCN_VISUAL_ID = "6026"; //$NON-NLS-1$
+	private final static String ComponentEditPartPCN_VISUAL_ID = "3071"; //$NON-NLS-1$
+	private final static String ComponentFloatingLabelEditPartPCN_VISUAL_ID = "6027"; //$NON-NLS-1$
+	private final static String DependencyNodeEditPart_VISUAL_ID = "3203"; //$NON-NLS-1$
+	private final static String DependencyNodeFloatingLabelEditPart_VISUAL_ID = "6029"; //$NON-NLS-1$
+	private final static String InterfaceEditPart_VISUAL_ID = "2003"; //$NON-NLS-1$
+	private final static String InterfaceFloatingLabelEditPart_VISUAL_ID = "6032"; //$NON-NLS-1$
+	private final static String InterfaceEditPartPCN_VISUAL_ID = "3072"; //$NON-NLS-1$
+	private final static String InterfaceFloatingLabelEditPartPCN_VISUAL_ID = "6028"; //$NON-NLS-1$
+	private final static String RectangleInterfaceEditPart_VISUAL_ID = "3205"; //$NON-NLS-1$
+	private final static String RectangleInterfaceFloatingLabelEditPart_VISUAL_ID = "6031"; //$NON-NLS-1$
+	private final static String RectangleInterfaceEditPartCN_VISUAL_ID = "3078"; //$NON-NLS-1$
+	private final static String RectangleInterfaceFloatingLabelEditPartCN_VISUAL_ID = "6033"; //$NON-NLS-1$
+
+	/**
+	 * Gets the reconcile command.
+	 *
+	 * @param diagram
+	 *            the diagram
+	 * @return the reconcile command
+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler#getReconcileCommand(org.eclipse.gmf.runtime.notation.Diagram)
+	 */
+	@Override
+	public ICommand getReconcileCommand(Diagram diagram) {
+		return new InsertFloatingLabelFromMapCommand(diagram, getFloatingLabelMap());
+	}
+
+	/**
+	 * Gets the floating label map to add.
+	 *
+	 * @return the floating label map
+	 */
+	private Map<String, String> getFloatingLabelMap() {
+		Map<String, String> map = new HashMap<>();
+		map.put(ComponentEditPart_VISUAL_ID, ComponentFloatingLabelEditPart_VISUAL_ID);
+		map.put(ComponentEditPartCN_VISUAL_ID, ComponentFloatingLabelEditPartCN_VISUAL_ID);
+		map.put(ComponentEditPartPCN_VISUAL_ID, ComponentFloatingLabelEditPartPCN_VISUAL_ID);
+		map.put(DependencyNodeEditPart_VISUAL_ID, DependencyNodeFloatingLabelEditPart_VISUAL_ID);
+		map.put(InterfaceEditPart_VISUAL_ID, InterfaceFloatingLabelEditPart_VISUAL_ID);
+		map.put(InterfaceEditPartPCN_VISUAL_ID, InterfaceFloatingLabelEditPartPCN_VISUAL_ID);
+		map.put(RectangleInterfaceEditPart_VISUAL_ID, RectangleInterfaceFloatingLabelEditPart_VISUAL_ID);
+		map.put(RectangleInterfaceEditPartCN_VISUAL_ID, RectangleInterfaceFloatingLabelEditPartCN_VISUAL_ID);
+
+		return map;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.configuration b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.configuration
deleted file mode 100644
index 49c8ae8a468..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.configuration
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<configuration:PapyrusConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmi:id="_ko07IErbEeSdQKzSRatBjg">

-  <viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="_xogdoErbEeSdQKzSRatBjg" name="Default Papyrus Viewpoint">

-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_fa4kAHDuEeWh-MssWmCB_A" implementationID="PapyrusUMLComponentDiagram">

-      <modelRules xmi:id="_fa4kAXDuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </modelRules>

-      <owningRules xmi:id="_fa4kAnDuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </owningRules>

-      <categories href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb4txhEeOqHvRyiN87hA"/>

-      <childRules xmi:id="_fa4kA3DuEeWh-MssWmCB_A"/>

-    </modelKinds>

-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_fa4kBHDuEeWh-MssWmCB_A" implementationID="PapyrusUMLComponentDiagram">

-      <modelRules xmi:id="_fa4kBXDuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>

-      </modelRules>

-      <owningRules xmi:id="_fa4kBnDuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>

-      </owningRules>

-      <owningRules xmi:id="_fa4kB3DuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </owningRules>

-      <categories href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb4txhEeOqHvRyiN87hA"/>

-      <childRules xmi:id="_fa4kCHDuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>

-        <origin href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>

-        <insertionPath xmi:id="_fa4kCXDuEeWh-MssWmCB_A">

-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>

-        </insertionPath>

-      </childRules>

-      <childRules xmi:id="_fa4kCnDuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Comment"/>

-        <origin href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>

-        <insertionPath xmi:id="_fa4kC3DuEeWh-MssWmCB_A">

-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedComment"/>

-        </insertionPath>

-      </childRules>

-      <childRules xmi:id="_fa4kDHDuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Constraint"/>

-        <origin href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>

-        <insertionPath xmi:id="_fa4kDXDuEeWh-MssWmCB_A">

-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedRule"/>

-        </insertionPath>

-      </childRules>

-      <childRules xmi:id="_fa4kDnDuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>

-        <origin href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>

-        <insertionPath xmi:id="_fa4kD3DuEeWh-MssWmCB_A">

-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//EncapsulatedClassifier/ownedPort"/>

-        </insertionPath>

-      </childRules>

-      <paletteRules xmi:id="_fa4kEHDuEeWh-MssWmCB_A" permit="false" element="component.tool.model"/>

-      <paletteRules xmi:id="_fa4kEXDuEeWh-MssWmCB_A" permit="false" element="component.tool.package"/>

-    </modelKinds>

-  </viewpoints>

-  <defaultStakeholder href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmkdxhEeOqHvRyiN87hA"/>

-  <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>

-</configuration:PapyrusConfiguration>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml
index 2075685f23b..5bf98565fa2 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml
@@ -15,14 +15,6 @@
 -->
 <plugin>
    <extension
-         point="org.eclipse.papyrus.infra.viewpoints.policy.custom">
-      <contribution
-            file="model/ComponentDiagram.configuration"
-            original="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration">
-      </contribution>
-   </extension>
-
-<extension
       point="org.eclipse.ui.commands">
    <command
          categoryId="org.eclipse.papyrus.editor.category"
@@ -965,21 +957,21 @@
       point="org.eclipse.papyrus.infra.gmfdiag.common.diagramReconciler">
    <diagramReconciler
          diagramType="PapyrusUMLComponentDiagram"
-         reconcilerClass="org.eclipse.papyrus.uml.diagram.component.custom.migration.ComponentReconciler"
-         source="undefined"
-         target="1.1.0">
+         reconcilerClass="org.eclipse.papyrus.uml.diagram.component.custom.migration.ComponentReconciler_1_1_0"
+         source="1.0.0"
+         target="1.3.0">
    </diagramReconciler>
    <diagramReconciler
          diagramType="PapyrusUMLComponentDiagram"
-         reconcilerClass="org.eclipse.papyrus.uml.diagram.component.custom.migration.ComponentReconcilerForCompartment"
-         source="undefined"
-         target="1.2.0">
+         reconcilerClass="org.eclipse.papyrus.uml.diagram.component.custom.migration.ComponentReconcilerForCompartment_1_2_0"
+         source="1.1.0"
+         target="1.3.0">
    </diagramReconciler>
    <diagramReconciler
          diagramType="PapyrusUMLComponentDiagram"
          reconcilerClass="org.eclipse.papyrus.uml.diagram.component.custom.migration.ComponentReconciler_1_2_0"
          source="1.1.0"
-         target="1.2.0">
+         target="1.3.0">
    </diagramReconciler>
 </extension>
    <extension point="org.eclipse.papyrus.infra.gmfdiag.common.visualTypeProviders">
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/PortCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/PortCreateCommand.java
index ae59beb70b9..5637da197e5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/PortCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/commands/PortCreateCommand.java
@@ -1,127 +1,127 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.component.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Port;

-import org.eclipse.uml2.uml.StructuredClassifier;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class PortCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public PortCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getPort());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Port newElement = UMLFactory.eINSTANCE.createPort();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				StructuredClassifier qualifiedTarget = (StructuredClassifier) target;

-				qualifiedTarget.getOwnedAttributes()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Port_Shape(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Port newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.component.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;
+import org.eclipse.uml2.uml.Port;
+import org.eclipse.uml2.uml.StructuredClassifier;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class PortCreateCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	public PortCreateCommand(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		return container;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getPort());
+		return data.isPermitted();
+
+
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+
+		Port newElement = UMLFactory.eINSTANCE.createPort();
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+
+				StructuredClassifier qualifiedTarget = (StructuredClassifier) target;
+				qualifiedTarget.getOwnedAttributes()
+						.add(newElement);
+
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+
+
+		ElementInitializers.getInstance().init_Port_Shape(newElement);
+
+		doConfigure(newElement, monitor, info);
+
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(Port newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/CreateCompositeDiagramCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/CreateCompositeDiagramCommand.java
index fa1851698af..b4f4b956fb2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/CreateCompositeDiagramCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/CreateCompositeDiagramCommand.java
@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.infra.gmfdiag.common.AbstractPapyrusGmfCreateDiagramCommandHandler;
-import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramPrototype;
 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;
 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;
 import org.eclipse.uml2.uml.Collaboration;
@@ -100,7 +100,7 @@ public class CreateCompositeDiagramCommand extends AbstractPapyrusGmfCreateDiagr
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected Diagram doCreateDiagram(Resource diagramResource, EObject owner, EObject element, ViewPrototype prototype, String name) {
+	protected Diagram doCreateDiagram(Resource diagramResource, EObject owner, EObject element, DiagramPrototype prototype, String name) {
 		Diagram diagram = null;
 
 		if (element instanceof org.eclipse.uml2.uml.Class || (element instanceof Collaboration)) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/migration/CompositeReconcilerForCompartment.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/migration/CompositeReconcilerForCompartment_1_2_0.java
index de5f4495dde..6c3847e7852 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/migration/CompositeReconcilerForCompartment.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/migration/CompositeReconcilerForCompartment_1_2_0.java
@@ -21,7 +21,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.ReconcilerForCompartm
 /**
  * Diagram Reconciler for compartment from 1.1.0 to 1.2.0
  */
-public class CompositeReconcilerForCompartment extends ReconcilerForCompartment {
+public class CompositeReconcilerForCompartment_1_2_0 extends ReconcilerForCompartment {
 
 	private static final String DataTypeAttributeCompartmentEditPart_VISUAL_ID = "7033"; //$NON-NLS-1$
 	private static final String DataTypeOperationCompartmentEditPart_VISUAL_ID = "7034"; //$NON-NLS-1$
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/migration/CompositeReconciler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/migration/CompositeReconciler_1_1_0.java
index b72c6b599eb..d9b4e6e1bad 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/migration/CompositeReconciler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/migration/CompositeReconciler_1_1_0.java
@@ -24,7 +24,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler;
 /**
  * Composite Diagram Reconciler from 1.0.0 to 1.1.0
  */
-public class CompositeReconciler extends DiagramReconciler {
+public class CompositeReconciler_1_1_0 extends DiagramReconciler {
 
 	private final static String ActivityCompositeEditPart_VISUAL_ID = "2060"; //$NON-NLS-1$
 	private final static String ActivityCompositeFloatingLabelEditPart_VISUAL_ID = "6079"; //$NON-NLS-1$
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/parsers/NamedElementLabelParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/parsers/NamedElementLabelParser.java
index bfc9de47a96..309c3202e97 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/parsers/NamedElementLabelParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/parsers/NamedElementLabelParser.java
@@ -28,11 +28,13 @@ import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
 import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
 import org.eclipse.papyrus.infra.core.resource.ModelSet;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.internationalization.common.utils.InternationalizationPreferencesUtils;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
 import org.eclipse.papyrus.uml.diagram.common.Activator;
 import org.eclipse.papyrus.uml.internationalization.utils.utils.UMLLabelInternationalization;
@@ -87,7 +89,8 @@ public class NamedElementLabelParser implements ISemanticParser {
 				final ModelSet modelSet = (ModelSet)objectToEdit.eResource().getResourceSet();
 				command = new EMFtoGMFCommandWrapper(UMLLabelInternationalization.getInstance().getSetLabelCommand(modelSet.getTransactionalEditingDomain(), (NamedElement)objectToEdit, newString, null));
 			}else{
-				command = ElementEditServiceUtils.getEditServiceProvider().getEditService(objectToEdit).getEditCommand(new SetRequest(objectToEdit, UMLPackage.eINSTANCE.getNamedElement_Name(), newString));
+				IClientContext context = TypeContext.getContext(objectToEdit);
+				command = ElementEditServiceUtils.getEditServiceProvider(context).getEditService(objectToEdit).getEditCommand(new SetRequest(objectToEdit, UMLPackage.eINSTANCE.getNamedElement_Name(), newString));
 			}
 		} catch (ServiceException e) {
 			Activator.log.error(e);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.configuration b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.configuration
deleted file mode 100644
index c14ed30d72e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.configuration
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<configuration:PapyrusConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmi:id="_ko07IErbEeSdQKzSRatBjg">

-  <viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="_xogdoErbEeSdQKzSRatBjg" name="Default Papyrus Viewpoint">

-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_bKiwMHDuEeWh-MssWmCB_A" implementationID="CompositeStructure">

-      <modelRules xmi:id="_bKiwMXDuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </modelRules>

-      <owningRules xmi:id="_bKiwMnDuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </owningRules>

-      <categories href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb4txhEeOqHvRyiN87hA"/>

-      <childRules xmi:id="_bKiwM3DuEeWh-MssWmCB_A"/>

-    </modelKinds>

-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_bKiwNHDuEeWh-MssWmCB_A" implementationID="CompositeStructure">

-      <modelRules xmi:id="_bKiwNXDuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier"/>

-      </modelRules>

-      <owningRules xmi:id="_bKiwNnDuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier"/>

-      </owningRules>

-      <owningRules xmi:id="_bKiwN3DuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </owningRules>

-      <categories href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb4txhEeOqHvRyiN87hA"/>

-      <childRules xmi:id="_bKiwOHDuEeWh-MssWmCB_A"/>

-    </modelKinds>

-  </viewpoints>

-  <defaultStakeholder href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmkdxhEeOqHvRyiN87hA"/>

-  <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>

-</configuration:PapyrusConfiguration>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml
index f7c0dbbeff2..2ea2838337c 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml
@@ -15,14 +15,6 @@
    
 -->
 <plugin>
-   <extension
-         point="org.eclipse.papyrus.infra.viewpoints.policy.custom">
-      <contribution
-            file="model/compositediagram.configuration"
-            original="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration">
-      </contribution>
-   </extension>
-   
    <extension point="org.eclipse.ui.contexts" id="ui-context">
 				      <?gmfgen generated="true"?>
 				      <context
@@ -939,13 +931,6 @@
       </enablement>
    </semanticChildrenStrategy>
 </extension>
-<extension
-      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
-   <elementTypeSet
-   		clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
-         path="model/compositediagram.elementtypesconfigurations">
-   </elementTypeSet>
-</extension>
 
 <extension point="org.eclipse.papyrus.infra.gmfdiag.common.notationTypesMapping"> 
    <?gmfgen generated="true"?>
@@ -1513,21 +1498,21 @@
       point="org.eclipse.papyrus.infra.gmfdiag.common.diagramReconciler">
    <diagramReconciler
          diagramType="CompositeStructure"
-         reconcilerClass="org.eclipse.papyrus.uml.diagram.composite.custom.migration.CompositeReconciler"
-         source="undefined"
-         target="1.1.0">
+         reconcilerClass="org.eclipse.papyrus.uml.diagram.composite.custom.migration.CompositeReconciler_1_1_0"
+         source="1.0.0"
+         target="1.3.0">
    </diagramReconciler>
    <diagramReconciler
          diagramType="CompositeStructure"
-         reconcilerClass="org.eclipse.papyrus.uml.diagram.composite.custom.migration.CompositeReconcilerForCompartment"
-         source="undefined"
-         target="1.2.0">
+         reconcilerClass="org.eclipse.papyrus.uml.diagram.composite.custom.migration.CompositeReconcilerForCompartment_1_2_0"
+         source="1.1.0"
+         target="1.3.0">
    </diagramReconciler>
    <diagramReconciler
          diagramType="CompositeStructure"
          reconcilerClass="org.eclipse.papyrus.uml.diagram.composite.custom.migration.CompositeReconciler_1_2_0"
          source="1.1.0"
-         target="1.2.0">
+         target="1.3.0">
    </diagramReconciler>
 </extension>
    <extension point="org.eclipse.papyrus.infra.gmfdiag.common.visualTypeProviders">
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/migration/DeploymentReconcilerForCompartment.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/migration/DeploymentReconcilerForCompartment_1_2_0.java
index 56b218a0301..266390e3b41 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/migration/DeploymentReconcilerForCompartment.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/migration/DeploymentReconcilerForCompartment_1_2_0.java
@@ -21,7 +21,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.ReconcilerForCompartm
 /**
  * Diagram Reconciler for compartment from 1.1.0 to 1.2.0
  */
-public class DeploymentReconcilerForCompartment extends ReconcilerForCompartment {
+public class DeploymentReconcilerForCompartment_1_2_0 extends ReconcilerForCompartment {
 
 	private static final String ModelPackageableElementCompartmentEditPart_VISUAL_ID = "51";
 	private static final String PackagePackageableElementCompartmentEditPart_VISUAL_ID = "38";
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/migration/DeploymentReconciler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/migration/DeploymentReconciler_1_1_0.java
index 0b1b8e0051f..5fd3e472d72 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/migration/DeploymentReconciler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/migration/DeploymentReconciler_1_1_0.java
@@ -1,62 +1,62 @@
-/*****************************************************************************

- * Copyright (c) 2009-2015 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:

- *  Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.deployment.custom.migration;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.papyrus.infra.gmfdiag.common.commands.InsertFloatingLabelFromMapCommand;

-import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler;

-

-/**

- * Deployment Diagram Reconciler from 1.0.0 to 1.1.0

- */

-public class DeploymentReconciler extends DiagramReconciler {

-

-	private final static String ArtifactEditPart_VISUAL_ID = "2006";

-	private final static String ArtifactFloatingLabelEditPart_VISUAL_ID = "61";

-	private final static String ArtifactEditPartACN_VISUAL_ID = "28";

-	private final static String ArtifactFloatingLabelEditPartACN_VISUAL_ID = "60";

-	private final static String ArtifactEditPartCN_VISUAL_ID = "25";

-	private final static String ArtifactFloatingLabelEditPartCN_VISUAL_ID = "59";

-

-	/**

-	 * Gets the reconcile command.

-	 *

-	 * @param diagram

-	 *            the diagram

-	 * @return the reconcile command

-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler#getReconcileCommand(org.eclipse.gmf.runtime.notation.Diagram)

-	 */

-	@Override

-	public ICommand getReconcileCommand(Diagram diagram) {

-		return new InsertFloatingLabelFromMapCommand(diagram, getFloatingLabelMap());

-	}

-

-	/**

-	 * Gets the floating label map to add.

-	 *

-	 * @return the floating label map

-	 */

-	private Map<String, String> getFloatingLabelMap() {

-		Map<String, String> map = new HashMap<String, String>();

-		map.put(ArtifactEditPart_VISUAL_ID, ArtifactFloatingLabelEditPart_VISUAL_ID);

-		map.put(ArtifactEditPartACN_VISUAL_ID, ArtifactFloatingLabelEditPartACN_VISUAL_ID);

-		map.put(ArtifactEditPartCN_VISUAL_ID, ArtifactFloatingLabelEditPartCN_VISUAL_ID);

-

-		return map;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2009-2015 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:
+ *  Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.deployment.custom.migration;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.infra.gmfdiag.common.commands.InsertFloatingLabelFromMapCommand;
+import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler;
+
+/**
+ * Deployment Diagram Reconciler from 1.0.0 to 1.1.0
+ */
+public class DeploymentReconciler_1_1_0 extends DiagramReconciler {
+
+	private final static String ArtifactEditPart_VISUAL_ID = "2006";
+	private final static String ArtifactFloatingLabelEditPart_VISUAL_ID = "61";
+	private final static String ArtifactEditPartACN_VISUAL_ID = "28";
+	private final static String ArtifactFloatingLabelEditPartACN_VISUAL_ID = "60";
+	private final static String ArtifactEditPartCN_VISUAL_ID = "25";
+	private final static String ArtifactFloatingLabelEditPartCN_VISUAL_ID = "59";
+
+	/**
+	 * Gets the reconcile command.
+	 *
+	 * @param diagram
+	 *            the diagram
+	 * @return the reconcile command
+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler#getReconcileCommand(org.eclipse.gmf.runtime.notation.Diagram)
+	 */
+	@Override
+	public ICommand getReconcileCommand(Diagram diagram) {
+		return new InsertFloatingLabelFromMapCommand(diagram, getFloatingLabelMap());
+	}
+
+	/**
+	 * Gets the floating label map to add.
+	 *
+	 * @return the floating label map
+	 */
+	private Map<String, String> getFloatingLabelMap() {
+		Map<String, String> map = new HashMap<String, String>();
+		map.put(ArtifactEditPart_VISUAL_ID, ArtifactFloatingLabelEditPart_VISUAL_ID);
+		map.put(ArtifactEditPartACN_VISUAL_ID, ArtifactFloatingLabelEditPartACN_VISUAL_ID);
+		map.put(ArtifactEditPartCN_VISUAL_ID, ArtifactFloatingLabelEditPartCN_VISUAL_ID);
+
+		return map;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/model/DeploymentDiagram.configuration b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/model/DeploymentDiagram.configuration
deleted file mode 100644
index e12548d2e03..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/model/DeploymentDiagram.configuration
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<configuration:PapyrusConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmi:id="_ko07IErbEeSdQKzSRatBjg">

-  <viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="_xogdoErbEeSdQKzSRatBjg" name="Default Papyrus Viewpoint">

-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_ARGokHDuEeWh-MssWmCB_A" implementationID="PapyrusUMLDeploymentDiagram">

-      <modelRules xmi:id="_ARGokXDuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </modelRules>

-      <owningRules xmi:id="_ARGoknDuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </owningRules>

-      <categories href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb4txhEeOqHvRyiN87hA"/>

-      <childRules xmi:id="_ARGok3DuEeWh-MssWmCB_A"/>

-    </modelKinds>

-  </viewpoints>

-  <defaultStakeholder href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmkdxhEeOqHvRyiN87hA"/>

-  <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>

-</configuration:PapyrusConfiguration>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/plugin.xml
index 9b4c8d055c9..90b4cd183fd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/plugin.xml
@@ -14,14 +14,6 @@
    
 -->
 <plugin>
-   <extension
-         point="org.eclipse.papyrus.infra.viewpoints.policy.custom">
-      <contribution
-            file="model/DeploymentDiagram.configuration"
-            original="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration">
-      </contribution>
-   </extension>
-
 <extension
       point="org.eclipse.ui.commands">
    <command
@@ -716,21 +708,21 @@
       point="org.eclipse.papyrus.infra.gmfdiag.common.diagramReconciler">
    <diagramReconciler
          diagramType="PapyrusUMLDeploymentDiagram"
-         reconcilerClass="org.eclipse.papyrus.uml.diagram.deployment.custom.migration.DeploymentReconciler"
-         source="undefined"
-         target="1.1.0">
+         reconcilerClass="org.eclipse.papyrus.uml.diagram.deployment.custom.migration.DeploymentReconciler_1_1_0"
+         source="1.0.0"
+         target="1.3.0">
    </diagramReconciler>
    <diagramReconciler
          diagramType="PapyrusUMLDeploymentDiagram"
-         reconcilerClass="org.eclipse.papyrus.uml.diagram.deployment.custom.migration.DeploymentReconcilerForCompartment"
-         source="undefined"
-         target="1.2.0">
+         reconcilerClass="org.eclipse.papyrus.uml.diagram.deployment.custom.migration.DeploymentReconcilerForCompartment_1_2_0"
+         source="1.1.0"
+         target="1.3.0">
    </diagramReconciler>
    <diagramReconciler
          diagramType="PapyrusUMLDeploymentDiagram"
          reconcilerClass="org.eclipse.papyrus.uml.diagram.deployment.custom.migration.DeploymentReconciler_1_2_0"
          source="1.1.0"
-         target="1.2.0">
+         target="1.3.0">
    </diagramReconciler>
 </extension>
    <extension point="org.eclipse.papyrus.infra.gmfdiag.common.visualTypeProviders">
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/build.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/build.properties
index 218388d3d0b..d23d7a93367 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/build.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/build.properties
@@ -1,15 +1,14 @@
-source.. = src/,\

-           src-gen/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               palettes/,\

-               icons/,\

-               about.html,\

-               plugin.properties,\

-               messages.properties,\

-               model/interactionOverviewDiagram.elementtypesconfigurations,\

-               model/InteractionOverviewDiagram.configuration

-

-src.includes = about.html

+source.. = src/,\
+           src-gen/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               palettes/,\
+               icons/,\
+               about.html,\
+               plugin.properties,\
+               messages.properties,\
+               model/interactionOverviewDiagram.elementtypesconfigurations
+
+src.includes = about.html
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/model/InteractionOverviewDiagram.configuration b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/model/InteractionOverviewDiagram.configuration
deleted file mode 100755
index 02826b837d9..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/model/InteractionOverviewDiagram.configuration
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<configuration:PapyrusConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/Activity_Shape/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmi:id="_ko07IErbEeSdQKzSRatBjg">

-  <viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="_xogdoErbEeSdQKzSRatBjg" name="Default Papyrus Viewpoint">

-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_FuMjYHDuEeWh-MssWmCB_A" implementationID="PapyrusUMLInteractionOverviewDiagram">

-      <modelRules xmi:id="_FuMjYXDuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity"/>

-      </modelRules>

-      <owningRules xmi:id="_FuMjYnDuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity"/>

-      </owningRules>

-      <owningRules xmi:id="_FuMjY3DuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>

-        <newModelPath xmi:id="_FuMjZHDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Activity">

-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>

-        </newModelPath>

-      </owningRules>

-      <owningRules xmi:id="_FuMjZXDuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>

-        <newModelPath xmi:id="_FuMjZnDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Activity">

-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>

-        </newModelPath>

-      </owningRules>

-      <owningRules xmi:id="_FuMjZ3DuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-        <newModelPath xmi:id="_FuMjaHDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Activity">

-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>

-        </newModelPath>

-      </owningRules>

-      <categories href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb4txhEeOqHvRyiN87hA"/>

-      <childRules xmi:id="_FuMjaXDuEeWh-MssWmCB_A"/>

-    </modelKinds>

-  </viewpoints>

-  <defaultStakeholder href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmkdxhEeOqHvRyiN87hA"/>

-  <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>

-</configuration:PapyrusConfiguration>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.xml
index ab5f80c2b92..f8b4282b4bb 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.xml
@@ -1,719 +1,704 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<!--

- Copyright (c) 2013, 2014 CEA and others.

- 

- All rights reserved. This program and the accompanying materials

- are made available under the terms of the Eclipse Public License v1.0

- which accompanies this distribution, and is available at

- http://www.eclipse.org/legal/epl-v10.html

- 

- Contributors:

-   CEA - Initial API and implementation

-   Christian W. Damus (CEA) - bug 323802

-   

--->

-<plugin>

-   <extension

-         point="org.eclipse.papyrus.infra.viewpoints.policy.custom">

-      <contribution

-            file="model/InteractionOverviewDiagram.configuration"

-            original="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration">

-      </contribution>

-   </extension>

-

-    <!-- Diagram declaration -->

-    <extension point="org.eclipse.papyrus.infra.ui.papyrusDiagram">

-        <creationCommand

-            creationCommandClass="org.eclipse.papyrus.uml.diagram.interactionoverview.InteractionOverviewDiagramCreateCommand"

-            creationCondition="org.eclipse.papyrus.uml.diagram.interactionoverview.InteractionOverviewDiagramCreationCondition"

-            icon="icons/obj16/interactionOverviewDiagram.gif"

-            id="org.eclipse.papyrus.uml.diagram.interactionoverview.CreateCommand"

-            label="Interaction Overview Diagram"

-            language="uml"/>

-        <editorDiagram

-            actionBarContributorId="org.eclipse.papyrus.uml.diagram.common.part.UMLDiagramActionBarContributor"

-            factoryClass="org.eclipse.papyrus.uml.diagram.interactionoverview.InteractionOverviewDiagramEditorFactory"

-            icon="icons/obj16/interactionOverviewDiagram.gif"/>

-    </extension>

-

-    <!-- Diagram creation command and handler -->

-    <extension point="org.eclipse.ui.commands">

-        <command

-            id="org.eclipse.papyrus.uml.diagram.interactionoverview.CreateCommand"

-            name="Create a new Interaction Overview Diagram"

-            description="Create a new Interaction Overview Diagram"

-            categoryId="org.eclipse.papyrus.editor.category"/>

-    </extension>

-

-

-    <!-- Diagram creation command registration in menu and toolbar -->

-

-    <!-- Palette tool declaration (declares the real palette containment) -->

-    <extension

-        point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition"

-        name="UML_InteractionOverviewDiagram">

-

-        <paletteDefinition

-            ID="UML_InteractionOverviewDiagram"

-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"

-            name="UML_InteractionOverviewDiagram"

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

-            path="palettes/interactionoverviewdiagram.palette.xml"

-            provider="CEA LIST">

-            <Priority name="Low"/>

-

-            <!-- Specify diagram this palette tools relate to -->

-            <editor

-                  id="org.eclipse.papyrus.uml.diagram.interactionoverview"/>

-        </paletteDefinition>

-    </extension>

-

-    <!-- Diagram view providers declaration -->

-    <extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders">

-        <!-- Diagram view provider -->

-        <viewProvider class="org.eclipse.papyrus.uml.diagram.interactionoverview.provider.InteractionOverviewDiagramViewProvider">

-            <Priority name="Medium"/>

-            <context

-                viewClass="org.eclipse.gmf.runtime.notation.Diagram"

-                semanticHints=""/>

-         

-            

-        </viewProvider>

-

-        <!-- ViewProvider for inherited elements (from ActivityDiagram ViewProvider) -->

-        <viewProvider class="org.eclipse.papyrus.uml.diagram.interactionoverview.provider.InheritedActivityDiagramViewProvider">

-            <Priority name="Low"/>

-

-            <context

-                viewClass="org.eclipse.gmf.runtime.notation.Node"

-                semanticHints="ActivityFinalNode_Shape, CallBehaviorAction_Shape, Comment_Shape, ConditionalNode_Shape, DecisionNode_Shape, FlowFinalNode_Shape, ForkNode_Shape, InitialNode_Shape, JoinNode_Shape, LoopNode_Shape, MergeNode_Shape, NamedElement_DefaultShape, Activity_Shape, SequenceNode_Shape, Constraint_Shape"/>

-

-            <context

-                viewClass="org.eclipse.gmf.runtime.notation.Node"

-                semanticHints="Parameter_ParameterLabel, Constraint_PreconditionLabel, Constraint_PostconditionLabel"/>

-

-            <context

-                viewClass="org.eclipse.gmf.runtime.notation.Edge"

-                semanticHints="Comment_AnnotatedElementEdge, ControlFlow_Edge"/>

-

-            <object

-                id="elementtype.node"

-                class="org.eclipse.papyrus.gmf.diagram.common.commands.ISemanticHintAdapter(org.eclipse.papyrus.sysml.diagram.common)">

-

-                <method

-                    name="getSemanticHint()"

-                    value="ActivityFinalNode_Shape, CallBehaviorAction_Shape, Comment_Shape, ConditionalNode_Shape, DecisionNode_Shape, FlowFinalNode_Shape, ForkNode_Shape, InitialNode_Shape, JoinNode_Shape, LoopNode_Shape, MergeNode_Shape, NamedElement_DefaultShape, Activity_Shape, SequenceNode_Shape, Constraint_Shape">

-                </method>

-            </object>

-            <context

-                viewClass="org.eclipse.gmf.runtime.notation.Node"

-                elements="elementtype.node"/>

-

-            <object

-                id="elementtype.edge"

-                class="org.eclipse.papyrus.gmf.diagram.common.commands.ISemanticHintAdapter(org.eclipse.papyrus.sysml.diagram.common)">

-

-                <method

-                    name="getSemanticHint()"

-                    value="Comment_AnnotatedElementEdge, ControlFlow_Edge">

-                </method>

-            </object>

-            <context

-                viewClass="org.eclipse.gmf.runtime.notation.Edge"

-                elements="elementtype.edge"/>

-

-

-            <!-- Additional descriptors provided in case the semantic hint is is not provided -->

-

-            <!-- "uml.ActivityFinalNode" -->

-            <object

-                id="uml.ActivityFinalNode"

-                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">

-                <method

-                    name="getProxyClassID()"

-                    value="uml.ActivityFinalNode"/>

-            </object>

-

-            <!-- "uml.CallBehaviorAction" -->

-            <object

-                id="uml.CallBehaviorAction"

-                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">

-                <method

-                    name="getProxyClassID()"

-                    value="uml.CallBehaviorAction"/>

-            </object>

-

-            <!-- "uml.Comment" -->

-            <object

-                id="uml.Comment"

-                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">

-                <method

-                    name="getProxyClassID()"

-                    value="uml.Comment"/>

-            </object>

-

-            <!-- "uml.ConditionalNode" -->

-            <object

-                id="uml.ConditionalNode"

-                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">

-                <method

-                    name="getProxyClassID()"

-                    value="uml.ConditionalNode"/>

-            </object>

-

-            <!-- "uml.DecisionNode" -->

-            <object

-                id="uml.DecisionNode"

-                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">

-                <method

-                    name="getProxyClassID()"

-                    value="uml.DecisionNode"/>

-            </object>

-

-            <!-- "uml.FlowFinalNode" -->

-            <object

-                id="uml.FlowFinalNode"

-                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">

-                <method

-                    name="getProxyClassID()"

-                    value="uml.FlowFinalNode"/>

-            </object>

-

-            <!-- "uml.ForkNode" -->

-            <object

-                id="uml.ForkNode"

-                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">

-                <method

-                    name="getProxyClassID()"

-                    value="uml.ForkNode"/>

-            </object>

-

-            <!-- "uml.InitialNode" -->

-            <object

-                id="uml.InitialNode"

-                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">

-                <method

-                    name="getProxyClassID()"

-                    value="uml.InitialNode"/>

-            </object>

-

-            <!-- "uml.JoinNode" -->

-            <object

-                id="uml.JoinNode"

-                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">

-                <method

-                    name="getProxyClassID()"

-                    value="uml.JoinNode"/>

-            </object>

-

-            <!-- "uml.LoopNode" -->

-            <object

-                id="uml.LoopNode"

-                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">

-                <method

-                    name="getProxyClassID()"

-                    value="uml.LoopNode"/>

-            </object>

-

-            <!-- "uml.MergeNode" -->

-            <object

-                id="uml.MergeNode"

-                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">

-                <method

-                    name="getProxyClassID()"

-                    value="uml.MergeNode"/>

-            </object>

-

-            <!-- "uml.NamedElement" -->

-            <object

-                id="uml.NamedElement"

-                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">

-                <method

-                    name="getProxyClassID()"

-                    value="uml.NamedElement"/>

-            </object>

-

-            <!-- "uml.Activity" -->

-            <object

-                id="uml.Activity"

-                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">

-                <method

-                    name="getProxyClassID()"

-                    value="uml.Activity"/>

-            </object>

-

-            <!-- "uml.SequenceNode" -->

-            <object

-                id="uml.SequenceNode"

-                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">

-                <method

-                    name="getProxyClassID()"

-                    value="uml.SequenceNode"/>

-            </object>

-

-            <!-- "uml.Constraint" -->

-            <object

-                id="uml.Constraint"

-                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">

-                <method

-                    name="getProxyClassID()"

-                    value="uml.Constraint"/>

-            </object>

-

-            <!-- "uml.Parameter" -->

-            <object

-                id="uml.Parameter"

-                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">

-                <method

-                    name="getProxyClassID()"

-                    value="uml.Parameter"/>

-            </object>

-

-            <!-- "uml.ControlFlow" -->

-            <object

-                id="uml.ControlFlow"

-                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">

-                <method

-                    name="getProxyClassID()"

-                    value="uml.ControlFlow"/>

-            </object>

-

-            <!-- Additional activation contexts for nodes semantic objects -->

-            <context

-                viewClass="org.eclipse.gmf.runtime.notation.Node"

-                elements="uml.ActivityFinalNode, uml.CallBehaviorAction, uml.Comment, uml.ConditionalNode, uml.DecisionNode, uml.FlowFinalNode, uml.ForkNode, uml.InitialNode, uml.JoinNode, uml.LoopNode, uml.MergeNode, uml.NamedElement, uml.Activity, uml.SequenceNode, uml.Constraint, uml.Parameter"/>

-

-            <!-- Additional activation contexts for edges semantic objects -->

-            <context

-                viewClass="org.eclipse.gmf.runtime.notation.Edge"

-                elements="uml.ControlFlow"/>

-

-        </viewProvider>

-        <viewProvider

-              class="org.eclipse.papyrus.uml.diagram.interactionoverview.provider.CustomViewProvider">

-           <Priority

-                 name="High">

-           </Priority>

-           <context

-                viewClass="org.eclipse.gmf.runtime.notation.Node"

-                semanticHints="CallBehaviorAction_InteractionShape, CallBehaviorAction_InteractionUseShape"/>

-

-            <object

-                id="elementtype.node"

-                class="org.eclipse.papyrus.gmf.diagram.common.commands.ISemanticHintAdapter(org.eclipse.papyrus.sysml.diagram.common)">

-

-                <method

-                    name="getSemanticHint()"

-                    value="CallBehaviorAction_InteractionShape">

-                </method>

-            </object>

-            <object

-                id=""

-                class="org.eclipse.papyrus.gmf.diagram.common.commands.ISemanticHintAdapter(org.eclipse.papyrus.sysml.diagram.common)">

-

-                <method

-                    name="getSemanticHint()"

-                    value="CallBehaviorAction_InteractionUseShape">

-                </method>

-            </object>

-            <context

-                viewClass="org.eclipse.gmf.runtime.notation.Node"

-                elements="elementtype.node"/>

-

-           </viewProvider>

-    </extension>

-

-    <!-- Diagram edit part providers declaration -->

-    <extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders">

-

-        <!-- Diagram edit part provider -->

-        <editpartProvider class="org.eclipse.papyrus.uml.diagram.interactionoverview.provider.InteractionOverviewDiagramEditPartProvider">

-            <Priority name="Low"/>

-            <object

-                id="org.eclipse.papyrus.uml.diagram.interactionoverview.Diagram"

-                class="org.eclipse.gmf.runtime.notation.Diagram">

-                <method

-                    name="getType()"

-                    value="PapyrusUMLInteractionOverviewDiagram"/>

-            </object>

-            <context views="org.eclipse.papyrus.uml.diagram.interactionoverview.Diagram"/>

-        </editpartProvider>

-

-        <!-- EditPartProvider for inherited elements (from ActivityDiagram) -->

-        <editpartProvider class="org.eclipse.papyrus.uml.diagram.interactionoverview.provider.InheritedActivityDiagramEditPartProvider">

-            <Priority name="Low"/>

-            <object

-                id="ACTIVITY_FINAL_NODE_CN"

-                class="org.eclipse.gmf.runtime.notation.Node">

-                <method

-                    name="getType()"

-                    value="ActivityFinalNode_Shape, ActivityFinalNode_StereotypeLabel"/>

-            </object>

-            <object

-                id="CALL_BEHAVIOR_ACTION_CN"

-                class="org.eclipse.gmf.runtime.notation.Node">

-                <method

-                    name="getType()"

-                    value="CallBehaviorAction_Shape, CallBehaviorAction_NameLabel"/>

-            </object>

-            <object

-                id="COMMENT_CN"

-                class="org.eclipse.gmf.runtime.notation.Node">

-                <method

-                    name="getType()"

-                    value="Comment_Shape, Comment_BodyLabel"/>

-            </object>

-            <object

-                id="CONDITIONAL_NODE_CN"

-                class="org.eclipse.gmf.runtime.notation.Node">

-                <method

-                    name="getType()"

-                    value="ConditionalNode_Shape, ConditionalNode_KeywordLabel, ConditionalNode_ActivityNodeCompartment"/>

-            </object>

-            <object

-                id="DECISION_NODE_CN"

-                class="org.eclipse.gmf.runtime.notation.Node">

-                <method

-                    name="getType()"

-                    value="DecisionNode_Shape, DecisionNode_DecisionInputLabel, DecisionNode_StereotypeLabel"/>

-            </object>

-            <object

-                id="FLOW_FINAL_NODE_CN"

-                class="org.eclipse.gmf.runtime.notation.Node">

-                <method

-                    name="getType()"

-                    value="FlowFinalNode_Shape, FlowFinalNode_StereotypeLabel"/>

-            </object>

-            <object

-                id="FORK_NODE_CN"

-                class="org.eclipse.gmf.runtime.notation.Node">

-                <method

-                    name="getType()"

-                    value="ForkNode_Shape, ForkNode_StereotypeLabel"/>

-            </object>

-            <object

-                id="INITIAL_NODE_CN"

-                class="org.eclipse.gmf.runtime.notation.Node">

-                <method

-                    name="getType()"

-                    value="InitialNode_Shape, InitialNode_StereotypeLabel"/>

-            </object>

-            <object

-                id="JOIN_NODE_CN"

-                class="org.eclipse.gmf.runtime.notation.Node">

-                <method

-                    name="getType()"

-                    value="JoinNode_Shape, JoinNode_JoinSpecLabel, JoinNode_StereotypeLabel"/>

-            </object>

-            <object

-                id="LOOP_NODE_CN"

-                class="org.eclipse.gmf.runtime.notation.Node">

-                <method

-                    name="getType()"

-                    value="LoopNode_Shape, LoopNode_KeywordLabel, LoopNode_ActivityNodeCompartment"/>

-            </object>

-            <object

-                id="MERGE_NODE_CN"

-                class="org.eclipse.gmf.runtime.notation.Node">

-                <method

-                    name="getType()"

-                    value="MergeNode_Shape, MergeNode_StereotypeLabel"/>

-            </object>

-            <object

-                id="SHAPE_NAMED_ELEMENT_CN"

-                class="org.eclipse.gmf.runtime.notation.Node">

-                <method

-                    name="getType()"

-                    value="NamedElement_DefaultShape, NamedElement_NameLabel"/>

-            </object>

-            <object

-                id="ACTIVITY"

-                class="org.eclipse.gmf.runtime.notation.Node">

-                <method

-                    name="getType()"

-                    value="Activity_NameLabel, Activity_KeywordLabel, Activity_ParameterCompartment, Activity_PreconditionCompartment, Activity_PostconditionCompartment, Activity_ActivityNodeCompartment"/>

-            </object>

-            <object

-                id="SEQUENCE_NODE_CN"

-                class="org.eclipse.gmf.runtime.notation.Node">

-                <method

-                    name="getType()"

-                    value="SequenceNode_Shape, SequenceNode_KeywordLabel, SequenceNode_ActivityNodeCompartment"/>

-            </object>

-            <object

-                id="CONSTRAINT_CN"

-                class="org.eclipse.gmf.runtime.notation.Node">

-                <method

-                    name="getType()"

-                    value="Constraint_Shape, Constraint_NameLabel, Constraint_BodyLabel"/>

-            </object>

-

-            <object

-                id="ACTIVITY_PARAMETER_CLN"

-                class="org.eclipse.gmf.runtime.notation.Node">

-                <method

-                    name="getType()"

-                    value="Parameter_ParameterLabel"/>

-            </object>

-            <object

-                id="ACTIVITY_CONSTRAINT_CLN"

-                class="org.eclipse.gmf.runtime.notation.Node">

-                <method

-                    name="getType()"

-                    value="Constraint_PreconditionLabel"/>

-            </object>

-            <object

-                id="ACTIVITY_CONSTRAINT_CLN"

-                class="org.eclipse.gmf.runtime.notation.Node">

-                <method

-                    name="getType()"

-                    value="Constraint_PostconditionLabel"/>

-            </object>

-

-            <object

-                id="COMMENT_ANNOTATED_ELEMENT"

-                class="org.eclipse.gmf.runtime.notation.Edge">

-                <method

-                    name="getType()"

-                    value="Comment_AnnotatedElementEdge"/>

-            </object>

-            <object

-                id="CONTROL_FLOW"

-                class="org.eclipse.gmf.runtime.notation.Edge">

-                <method

-                    name="getType()"

-                    value="ControlFlow_Edge, ControlFlow_NameLabel, ControlFlow_WeightLabel, ControlFlow_GuardLabel, ControlFlow_StereotypeLabel, ControlFlow_IconLabel"/>

-            </object>

-

-            <context

-                views="ACTIVITY_FINAL_NODE_CN, CALL_BEHAVIOR_ACTION_CN, COMMENT_CN, CONDITIONAL_NODE_CN, DECISION_NODE_CN, FLOW_FINAL_NODE_CN, FORK_NODE_CN, INITIAL_NODE_CN, JOIN_NODE_CN, LOOP_NODE_CN, MERGE_NODE_CN, SHAPE_NAMED_ELEMENT_CN, SEQUENCE_NODE_CN, CONSTRAINT_CN"/>

-            <context views="ACTIVITY_PARAMETER_CLN, ACTIVITY_CONSTRAINT_CLN, ACTIVITY_CONSTRAINT_CLN"/>

-            <context views="COMMENT_ANNOTATED_ELEMENT, CONTROL_FLOW"/>

-

-        </editpartProvider>

-    </extension>

-

-<extension

-       id="custom-ep-provider"

-       point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders">

-       <editpartProvider

-            class="org.eclipse.papyrus.uml.diagram.interactionoverview.provider.CustomEditPartProvider">

-            <Priority name="Medium"/>

-			<object

-	     		class="org.eclipse.gmf.runtime.notation.Node"

-		    	id="ACTIVITY">

-			    <method name="getType()" value="Activity_Shape"/>

-		   </object>

-		   <context views="ACTIVITY"/>

-	   </editpartProvider>

-   </extension>

-

-    <!-- Diagram edit policy provider -->

-    <extension point="org.eclipse.gmf.runtime.diagram.ui.editpolicyProviders">

-        <editpolicyProvider class="org.eclipse.papyrus.uml.diagram.interactionoverview.provider.CustomEditPolicyProvider">

-            <Priority name="Low"/>

-        </editpolicyProvider>

-    </extension>

-

-    <!-- Preference pages declaration -->

-    <extension

-        point="org.eclipse.ui.preferencePages"

-        id="prefpages">

-

-        <!-- Diagram Preference pages declaration -->

-        <page

-            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

-            name="InteractionOverviewDiagram Diagram"

-            category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"

-            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.InteractionOverviewDiagramGeneralPreferencePage">

-        </page>

-

-        <!-- Element Preference pages declaration -->

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-    </extension>

-

-    <!-- // Start of user code custom extensions -->

-

-	   <extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">

-      <?gmfgen generated="true"?>

-      <ParserProvider class="org.eclipse.papyrus.uml.diagram.interactionoverview.provider.CustomUMLParserProvider">

-         <Priority name="Low"/>

-      </ParserProvider>

-   </extension>

-   <extension

-		id="org.eclipse.papyrus.uml.diagram.timing.palettedefinition"

-		name="Papyrus Interaction Overview Diagram  Predefined Entries"

-          point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders">

-       <paletteProvider

-             class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">

-          <Priority

-                name="Medium">

-          </Priority>

-          <contribution

-                factoryClass="org.eclipse.papyrus.uml.diagram.interactionoverview.part.CustomIODPaletteFactory">

-             <entry

-                   defineOnly="false"

-                   description="Create a new Interaction with snapshot"

-                   id="createCallBehaviorActionAsInteractionCreationTool"

-                   kind="tool"

-                   label="Interaction"

-                   large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interaction.gif"

-                   path="/interactionoverview.drawer.nodes/"

-                   small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interaction.gif">

-             </entry>

-             <entry

-                   defineOnly="false"

-                   description="Create a new InteractionUse"

-                   id="interactionoverview.drawer.nodes.interactionuse"

-                   kind="tool"

-                   label="Interaction Use"

-                   large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InteractionUse.gif"

-                   path="/interactionoverview.drawer.nodes/"

-                   small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InteractionUse.gif">

-             </entry>

-          </contribution>

-          <editor

-                id="org.eclipse.papyrus.uml.diagram.interactionoverview">

-          </editor>

-       </paletteProvider>

-    </extension>

-    <extension

-          point="org.eclipse.ui.commands">

-       <command

-             defaultHandler="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.commands.UpdateDiagramInSnapshotCommandHandler"

-             description="Update Snapshot in Interaction"

-             id="org.eclipse.papyrus.uml.diagram.interactionoverview.updateSnapshotCommand"

-             name="Update Snapshot in Interaction">

-       </command>

-       <command

-             defaultHandler="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.commands.SwitchInteractionFormCommandHandler"

-             description="Switch Interaction &lt;-&gt; InteractionUse"

-             id="org.eclipse.papyrus.uml.diagram.interactionoverview.switchInteraction"

-             name="Switch Interaction &lt;-&gt; InteractionUse">

-       </command>

-    </extension>

-    <extension

-          point="org.eclipse.ui.menus">

-       <menuContribution

-             allPopups="true"

-             locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu?after=additions">

-          <command

-                commandId="org.eclipse.papyrus.uml.diagram.interactionoverview.updateSnapshotCommand"

-                label="Update Snapshot"

-                style="push">

-             <visibleWhen>

-                

-	                    <iterate

-                           ifEmpty="false"

-                           operator="or">

-	                        <instanceof value="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.part.CallBehaviorActionAsInteractionEditPart">

-	                        </instanceof>

-	                    </iterate>

-	                

-             </visibleWhen>

-          </command>

-          <command

-                commandId="org.eclipse.papyrus.uml.diagram.interactionoverview.switchInteraction"

-                label="Switch Interaction &lt;-&gt;InteractionUse"

-                style="push">

-             <visibleWhen>

-                   <iterate

-                         ifEmpty="false"

-                         operator="or">

-                      <instanceof

-                            value="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.part.CallBehaviorActionAsInteractionEditPart">

-                      </instanceof>

-                      <instanceof

-                            value="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.part.CustomInteractionUseEditPartCN">

-                      </instanceof>

-                   </iterate>

-             </visibleWhen>

-          </command>

-       </menuContribution>

-    </extension>

-    <extension

-          point="org.eclipse.papyrus.infra.gmfdiag.dnd.dropStrategy">

-       <strategy

-             strategy="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.commands.CallBehaviorActionToInteractionDropStrategy">

-       </strategy>

-    </extension>

-    <!-- Insert custom extensions here. -->

-

-    <!-- // End of user code -->

-<extension point="org.eclipse.papyrus.infra.gmfdiag.common.notationTypesMapping">

-   <diagramMappings diagramID="PapyrusUMLInteractionOverviewDiagram">

-          <mapping type="PapyrusUMLInteractionOverviewDiagram" humanReadableType="InteractionOverviewDiagram"/>

-          <!-- Compartments -->

-   

-          <!-- Link labels -->

-   </diagramMappings>

-</extension>

-<extension

-      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">

-   <elementTypeSet

-   clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"

-         path="model/interactionOverviewDiagram.elementtypesconfigurations">

-   </elementTypeSet>

-</extension>

-

-<extension

-      point="org.eclipse.papyrus.infra.gmfdiag.common.diagramReconciler">

-   <diagramReconciler

-         diagramType="PapyrusUMLInteractionOverviewDiagram"

-         reconcilerClass="org.eclipse.papyrus.uml.diagram.activity.migration.ActivityReconciler"

-         source="undefined"

-         target="1.1.0">

-   </diagramReconciler>

-   <diagramReconciler

-         diagramType="PapyrusUMLInteractionOverviewDiagram"

-         reconcilerClass="org.eclipse.papyrus.uml.diagram.interactionoverview.migration.InteractionOverviewReconciler_1_2_0"

-         source="1.1.0"

-         target="1.2.0">

-   </diagramReconciler>

-</extension>

-

-   <extension point="org.eclipse.papyrus.infra.gmfdiag.common.visualTypeProviders">

-      <?gmfgen generated="true"?>

-      <visualTypeProvider

-            class="org.eclipse.papyrus.uml.diagram.interactionoverview.provider.UMLVisualTypeProvider"

-            diagramType="PapyrusUMLInteractionOverviewDiagram">

-      </visualTypeProvider>

-   </extension>

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<!--
+ Copyright (c) 2013, 2014 CEA and others.
+ 
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+ 
+ Contributors:
+   CEA - Initial API and implementation
+   Christian W. Damus (CEA) - bug 323802
+   
+-->
+<plugin>
+    <!-- Diagram declaration -->
+    <extension point="org.eclipse.papyrus.infra.ui.papyrusDiagram">
+        <creationCommand
+            creationCommandClass="org.eclipse.papyrus.uml.diagram.interactionoverview.InteractionOverviewDiagramCreateCommand"
+            creationCondition="org.eclipse.papyrus.uml.diagram.interactionoverview.InteractionOverviewDiagramCreationCondition"
+            icon="icons/obj16/interactionOverviewDiagram.gif"
+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.CreateCommand"
+            label="Interaction Overview Diagram"
+            language="uml"/>
+        <editorDiagram
+            actionBarContributorId="org.eclipse.papyrus.uml.diagram.common.part.UMLDiagramActionBarContributor"
+            factoryClass="org.eclipse.papyrus.uml.diagram.interactionoverview.InteractionOverviewDiagramEditorFactory"
+            icon="icons/obj16/interactionOverviewDiagram.gif"/>
+    </extension>
+
+    <!-- Diagram creation command and handler -->
+    <extension point="org.eclipse.ui.commands">
+        <command
+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.CreateCommand"
+            name="Create a new Interaction Overview Diagram"
+            description="Create a new Interaction Overview Diagram"
+            categoryId="org.eclipse.papyrus.editor.category"/>
+    </extension>
+
+
+    <!-- Diagram creation command registration in menu and toolbar -->
+
+    <!-- Palette tool declaration (declares the real palette containment) -->
+    <extension
+        point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition"
+        name="UML_InteractionOverviewDiagram">
+
+        <paletteDefinition
+            ID="UML_InteractionOverviewDiagram"
+            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
+            name="UML_InteractionOverviewDiagram"
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+            path="palettes/interactionoverviewdiagram.palette.xml"
+            provider="CEA LIST">
+            <Priority name="Low"/>
+
+            <!-- Specify diagram this palette tools relate to -->
+            <editor
+                  id="org.eclipse.papyrus.uml.diagram.interactionoverview"/>
+        </paletteDefinition>
+    </extension>
+
+    <!-- Diagram view providers declaration -->
+    <extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders">
+        <!-- Diagram view provider -->
+        <viewProvider class="org.eclipse.papyrus.uml.diagram.interactionoverview.provider.InteractionOverviewDiagramViewProvider">
+            <Priority name="Medium"/>
+            <context
+                viewClass="org.eclipse.gmf.runtime.notation.Diagram"
+                semanticHints=""/>
+         
+            
+        </viewProvider>
+
+        <!-- ViewProvider for inherited elements (from ActivityDiagram ViewProvider) -->
+        <viewProvider class="org.eclipse.papyrus.uml.diagram.interactionoverview.provider.InheritedActivityDiagramViewProvider">
+            <Priority name="Low"/>
+
+            <context
+                viewClass="org.eclipse.gmf.runtime.notation.Node"
+                semanticHints="ActivityFinalNode_Shape, CallBehaviorAction_Shape, Comment_Shape, ConditionalNode_Shape, DecisionNode_Shape, FlowFinalNode_Shape, ForkNode_Shape, InitialNode_Shape, JoinNode_Shape, LoopNode_Shape, MergeNode_Shape, NamedElement_DefaultShape, Activity_Shape, SequenceNode_Shape, Constraint_Shape"/>
+
+            <context
+                viewClass="org.eclipse.gmf.runtime.notation.Node"
+                semanticHints="Parameter_ParameterLabel, Constraint_PreconditionLabel, Constraint_PostconditionLabel"/>
+
+            <context
+                viewClass="org.eclipse.gmf.runtime.notation.Edge"
+                semanticHints="Comment_AnnotatedElementEdge, ControlFlow_Edge"/>
+
+            <object
+                id="elementtype.node"
+                class="org.eclipse.papyrus.gmf.diagram.common.commands.ISemanticHintAdapter(org.eclipse.papyrus.sysml.diagram.common)">
+
+                <method
+                    name="getSemanticHint()"
+                    value="ActivityFinalNode_Shape, CallBehaviorAction_Shape, Comment_Shape, ConditionalNode_Shape, DecisionNode_Shape, FlowFinalNode_Shape, ForkNode_Shape, InitialNode_Shape, JoinNode_Shape, LoopNode_Shape, MergeNode_Shape, NamedElement_DefaultShape, Activity_Shape, SequenceNode_Shape, Constraint_Shape">
+                </method>
+            </object>
+            <context
+                viewClass="org.eclipse.gmf.runtime.notation.Node"
+                elements="elementtype.node"/>
+
+            <object
+                id="elementtype.edge"
+                class="org.eclipse.papyrus.gmf.diagram.common.commands.ISemanticHintAdapter(org.eclipse.papyrus.sysml.diagram.common)">
+
+                <method
+                    name="getSemanticHint()"
+                    value="Comment_AnnotatedElementEdge, ControlFlow_Edge">
+                </method>
+            </object>
+            <context
+                viewClass="org.eclipse.gmf.runtime.notation.Edge"
+                elements="elementtype.edge"/>
+
+
+            <!-- Additional descriptors provided in case the semantic hint is is not provided -->
+
+            <!-- "uml.ActivityFinalNode" -->
+            <object
+                id="uml.ActivityFinalNode"
+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
+                <method
+                    name="getProxyClassID()"
+                    value="uml.ActivityFinalNode"/>
+            </object>
+
+            <!-- "uml.CallBehaviorAction" -->
+            <object
+                id="uml.CallBehaviorAction"
+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
+                <method
+                    name="getProxyClassID()"
+                    value="uml.CallBehaviorAction"/>
+            </object>
+
+            <!-- "uml.Comment" -->
+            <object
+                id="uml.Comment"
+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
+                <method
+                    name="getProxyClassID()"
+                    value="uml.Comment"/>
+            </object>
+
+            <!-- "uml.ConditionalNode" -->
+            <object
+                id="uml.ConditionalNode"
+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
+                <method
+                    name="getProxyClassID()"
+                    value="uml.ConditionalNode"/>
+            </object>
+
+            <!-- "uml.DecisionNode" -->
+            <object
+                id="uml.DecisionNode"
+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
+                <method
+                    name="getProxyClassID()"
+                    value="uml.DecisionNode"/>
+            </object>
+
+            <!-- "uml.FlowFinalNode" -->
+            <object
+                id="uml.FlowFinalNode"
+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
+                <method
+                    name="getProxyClassID()"
+                    value="uml.FlowFinalNode"/>
+            </object>
+
+            <!-- "uml.ForkNode" -->
+            <object
+                id="uml.ForkNode"
+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
+                <method
+                    name="getProxyClassID()"
+                    value="uml.ForkNode"/>
+            </object>
+
+            <!-- "uml.InitialNode" -->
+            <object
+                id="uml.InitialNode"
+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
+                <method
+                    name="getProxyClassID()"
+                    value="uml.InitialNode"/>
+            </object>
+
+            <!-- "uml.JoinNode" -->
+            <object
+                id="uml.JoinNode"
+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
+                <method
+                    name="getProxyClassID()"
+                    value="uml.JoinNode"/>
+            </object>
+
+            <!-- "uml.LoopNode" -->
+            <object
+                id="uml.LoopNode"
+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
+                <method
+                    name="getProxyClassID()"
+                    value="uml.LoopNode"/>
+            </object>
+
+            <!-- "uml.MergeNode" -->
+            <object
+                id="uml.MergeNode"
+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
+                <method
+                    name="getProxyClassID()"
+                    value="uml.MergeNode"/>
+            </object>
+
+            <!-- "uml.NamedElement" -->
+            <object
+                id="uml.NamedElement"
+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
+                <method
+                    name="getProxyClassID()"
+                    value="uml.NamedElement"/>
+            </object>
+
+            <!-- "uml.Activity" -->
+            <object
+                id="uml.Activity"
+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
+                <method
+                    name="getProxyClassID()"
+                    value="uml.Activity"/>
+            </object>
+
+            <!-- "uml.SequenceNode" -->
+            <object
+                id="uml.SequenceNode"
+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
+                <method
+                    name="getProxyClassID()"
+                    value="uml.SequenceNode"/>
+            </object>
+
+            <!-- "uml.Constraint" -->
+            <object
+                id="uml.Constraint"
+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
+                <method
+                    name="getProxyClassID()"
+                    value="uml.Constraint"/>
+            </object>
+
+            <!-- "uml.Parameter" -->
+            <object
+                id="uml.Parameter"
+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
+                <method
+                    name="getProxyClassID()"
+                    value="uml.Parameter"/>
+            </object>
+
+            <!-- "uml.ControlFlow" -->
+            <object
+                id="uml.ControlFlow"
+                class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
+                <method
+                    name="getProxyClassID()"
+                    value="uml.ControlFlow"/>
+            </object>
+
+            <!-- Additional activation contexts for nodes semantic objects -->
+            <context
+                viewClass="org.eclipse.gmf.runtime.notation.Node"
+                elements="uml.ActivityFinalNode, uml.CallBehaviorAction, uml.Comment, uml.ConditionalNode, uml.DecisionNode, uml.FlowFinalNode, uml.ForkNode, uml.InitialNode, uml.JoinNode, uml.LoopNode, uml.MergeNode, uml.NamedElement, uml.Activity, uml.SequenceNode, uml.Constraint, uml.Parameter"/>
+
+            <!-- Additional activation contexts for edges semantic objects -->
+            <context
+                viewClass="org.eclipse.gmf.runtime.notation.Edge"
+                elements="uml.ControlFlow"/>
+
+        </viewProvider>
+        <viewProvider
+              class="org.eclipse.papyrus.uml.diagram.interactionoverview.provider.CustomViewProvider">
+           <Priority
+                 name="High">
+           </Priority>
+           <context
+                viewClass="org.eclipse.gmf.runtime.notation.Node"
+                semanticHints="CallBehaviorAction_InteractionShape, CallBehaviorAction_InteractionUseShape"/>
+
+            <object
+                id="elementtype.node"
+                class="org.eclipse.papyrus.gmf.diagram.common.commands.ISemanticHintAdapter(org.eclipse.papyrus.sysml.diagram.common)">
+
+                <method
+                    name="getSemanticHint()"
+                    value="CallBehaviorAction_InteractionShape">
+                </method>
+            </object>
+            <object
+                id=""
+                class="org.eclipse.papyrus.gmf.diagram.common.commands.ISemanticHintAdapter(org.eclipse.papyrus.sysml.diagram.common)">
+
+                <method
+                    name="getSemanticHint()"
+                    value="CallBehaviorAction_InteractionUseShape">
+                </method>
+            </object>
+            <context
+                viewClass="org.eclipse.gmf.runtime.notation.Node"
+                elements="elementtype.node"/>
+
+           </viewProvider>
+    </extension>
+
+    <!-- Diagram edit part providers declaration -->
+    <extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders">
+
+        <!-- Diagram edit part provider -->
+        <editpartProvider class="org.eclipse.papyrus.uml.diagram.interactionoverview.provider.InteractionOverviewDiagramEditPartProvider">
+            <Priority name="Low"/>
+            <object
+                id="org.eclipse.papyrus.uml.diagram.interactionoverview.Diagram"
+                class="org.eclipse.gmf.runtime.notation.Diagram">
+                <method
+                    name="getType()"
+                    value="PapyrusUMLInteractionOverviewDiagram"/>
+            </object>
+            <context views="org.eclipse.papyrus.uml.diagram.interactionoverview.Diagram"/>
+        </editpartProvider>
+
+        <!-- EditPartProvider for inherited elements (from ActivityDiagram) -->
+        <editpartProvider class="org.eclipse.papyrus.uml.diagram.interactionoverview.provider.InheritedActivityDiagramEditPartProvider">
+            <Priority name="Low"/>
+            <object
+                id="ACTIVITY_FINAL_NODE_CN"
+                class="org.eclipse.gmf.runtime.notation.Node">
+                <method
+                    name="getType()"
+                    value="ActivityFinalNode_Shape, ActivityFinalNode_StereotypeLabel"/>
+            </object>
+            <object
+                id="CALL_BEHAVIOR_ACTION_CN"
+                class="org.eclipse.gmf.runtime.notation.Node">
+                <method
+                    name="getType()"
+                    value="CallBehaviorAction_Shape, CallBehaviorAction_NameLabel"/>
+            </object>
+            <object
+                id="COMMENT_CN"
+                class="org.eclipse.gmf.runtime.notation.Node">
+                <method
+                    name="getType()"
+                    value="Comment_Shape, Comment_BodyLabel"/>
+            </object>
+            <object
+                id="CONDITIONAL_NODE_CN"
+                class="org.eclipse.gmf.runtime.notation.Node">
+                <method
+                    name="getType()"
+                    value="ConditionalNode_Shape, ConditionalNode_KeywordLabel, ConditionalNode_ActivityNodeCompartment"/>
+            </object>
+            <object
+                id="DECISION_NODE_CN"
+                class="org.eclipse.gmf.runtime.notation.Node">
+                <method
+                    name="getType()"
+                    value="DecisionNode_Shape, DecisionNode_DecisionInputLabel, DecisionNode_StereotypeLabel"/>
+            </object>
+            <object
+                id="FLOW_FINAL_NODE_CN"
+                class="org.eclipse.gmf.runtime.notation.Node">
+                <method
+                    name="getType()"
+                    value="FlowFinalNode_Shape, FlowFinalNode_StereotypeLabel"/>
+            </object>
+            <object
+                id="FORK_NODE_CN"
+                class="org.eclipse.gmf.runtime.notation.Node">
+                <method
+                    name="getType()"
+                    value="ForkNode_Shape, ForkNode_StereotypeLabel"/>
+            </object>
+            <object
+                id="INITIAL_NODE_CN"
+                class="org.eclipse.gmf.runtime.notation.Node">
+                <method
+                    name="getType()"
+                    value="InitialNode_Shape, InitialNode_StereotypeLabel"/>
+            </object>
+            <object
+                id="JOIN_NODE_CN"
+                class="org.eclipse.gmf.runtime.notation.Node">
+                <method
+                    name="getType()"
+                    value="JoinNode_Shape, JoinNode_JoinSpecLabel, JoinNode_StereotypeLabel"/>
+            </object>
+            <object
+                id="LOOP_NODE_CN"
+                class="org.eclipse.gmf.runtime.notation.Node">
+                <method
+                    name="getType()"
+                    value="LoopNode_Shape, LoopNode_KeywordLabel, LoopNode_ActivityNodeCompartment"/>
+            </object>
+            <object
+                id="MERGE_NODE_CN"
+                class="org.eclipse.gmf.runtime.notation.Node">
+                <method
+                    name="getType()"
+                    value="MergeNode_Shape, MergeNode_StereotypeLabel"/>
+            </object>
+            <object
+                id="SHAPE_NAMED_ELEMENT_CN"
+                class="org.eclipse.gmf.runtime.notation.Node">
+                <method
+                    name="getType()"
+                    value="NamedElement_DefaultShape, NamedElement_NameLabel"/>
+            </object>
+            <object
+                id="ACTIVITY"
+                class="org.eclipse.gmf.runtime.notation.Node">
+                <method
+                    name="getType()"
+                    value="Activity_NameLabel, Activity_KeywordLabel, Activity_ParameterCompartment, Activity_PreconditionCompartment, Activity_PostconditionCompartment, Activity_ActivityNodeCompartment"/>
+            </object>
+            <object
+                id="SEQUENCE_NODE_CN"
+                class="org.eclipse.gmf.runtime.notation.Node">
+                <method
+                    name="getType()"
+                    value="SequenceNode_Shape, SequenceNode_KeywordLabel, SequenceNode_ActivityNodeCompartment"/>
+            </object>
+            <object
+                id="CONSTRAINT_CN"
+                class="org.eclipse.gmf.runtime.notation.Node">
+                <method
+                    name="getType()"
+                    value="Constraint_Shape, Constraint_NameLabel, Constraint_BodyLabel"/>
+            </object>
+
+            <object
+                id="ACTIVITY_PARAMETER_CLN"
+                class="org.eclipse.gmf.runtime.notation.Node">
+                <method
+                    name="getType()"
+                    value="Parameter_ParameterLabel"/>
+            </object>
+            <object
+                id="ACTIVITY_CONSTRAINT_CLN"
+                class="org.eclipse.gmf.runtime.notation.Node">
+                <method
+                    name="getType()"
+                    value="Constraint_PreconditionLabel"/>
+            </object>
+            <object
+                id="ACTIVITY_CONSTRAINT_CLN"
+                class="org.eclipse.gmf.runtime.notation.Node">
+                <method
+                    name="getType()"
+                    value="Constraint_PostconditionLabel"/>
+            </object>
+
+            <object
+                id="COMMENT_ANNOTATED_ELEMENT"
+                class="org.eclipse.gmf.runtime.notation.Edge">
+                <method
+                    name="getType()"
+                    value="Comment_AnnotatedElementEdge"/>
+            </object>
+            <object
+                id="CONTROL_FLOW"
+                class="org.eclipse.gmf.runtime.notation.Edge">
+                <method
+                    name="getType()"
+                    value="ControlFlow_Edge, ControlFlow_NameLabel, ControlFlow_WeightLabel, ControlFlow_GuardLabel, ControlFlow_StereotypeLabel, ControlFlow_IconLabel"/>
+            </object>
+
+            <context
+                views="ACTIVITY_FINAL_NODE_CN, CALL_BEHAVIOR_ACTION_CN, COMMENT_CN, CONDITIONAL_NODE_CN, DECISION_NODE_CN, FLOW_FINAL_NODE_CN, FORK_NODE_CN, INITIAL_NODE_CN, JOIN_NODE_CN, LOOP_NODE_CN, MERGE_NODE_CN, SHAPE_NAMED_ELEMENT_CN, SEQUENCE_NODE_CN, CONSTRAINT_CN"/>
+            <context views="ACTIVITY_PARAMETER_CLN, ACTIVITY_CONSTRAINT_CLN, ACTIVITY_CONSTRAINT_CLN"/>
+            <context views="COMMENT_ANNOTATED_ELEMENT, CONTROL_FLOW"/>
+
+        </editpartProvider>
+    </extension>
+
+<extension
+       id="custom-ep-provider"
+       point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders">
+       <editpartProvider
+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.provider.CustomEditPartProvider">
+            <Priority name="Medium"/>
+			<object
+	     		class="org.eclipse.gmf.runtime.notation.Node"
+		    	id="ACTIVITY">
+			    <method name="getType()" value="Activity_Shape"/>
+		   </object>
+		   <context views="ACTIVITY"/>
+	   </editpartProvider>
+   </extension>
+
+    <!-- Diagram edit policy provider -->
+    <extension point="org.eclipse.gmf.runtime.diagram.ui.editpolicyProviders">
+        <editpolicyProvider class="org.eclipse.papyrus.uml.diagram.interactionoverview.provider.CustomEditPolicyProvider">
+            <Priority name="Low"/>
+        </editpolicyProvider>
+    </extension>
+
+    <!-- Preference pages declaration -->
+    <extension
+        point="org.eclipse.ui.preferencePages"
+        id="prefpages">
+
+        <!-- Diagram Preference pages declaration -->
+        <page
+            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"
+            name="InteractionOverviewDiagram Diagram"
+            category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"
+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.InteractionOverviewDiagramGeneralPreferencePage">
+        </page>
+
+        <!-- Element Preference pages declaration -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    </extension>
+
+    <!-- // Start of user code custom extensions -->
+
+	   <extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">
+      <?gmfgen generated="true"?>
+      <ParserProvider class="org.eclipse.papyrus.uml.diagram.interactionoverview.provider.CustomUMLParserProvider">
+         <Priority name="Low"/>
+      </ParserProvider>
+   </extension>
+   <extension
+		id="org.eclipse.papyrus.uml.diagram.timing.palettedefinition"
+		name="Papyrus Interaction Overview Diagram  Predefined Entries"
+          point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders">
+       <paletteProvider
+             class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
+          <Priority
+                name="Medium">
+          </Priority>
+          <contribution
+                factoryClass="org.eclipse.papyrus.uml.diagram.interactionoverview.part.CustomIODPaletteFactory">
+             <entry
+                   defineOnly="false"
+                   description="Create a new Interaction with snapshot"
+                   id="createCallBehaviorActionAsInteractionCreationTool"
+                   kind="tool"
+                   label="Interaction"
+                   large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interaction.gif"
+                   path="/interactionoverview.drawer.nodes/"
+                   small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interaction.gif">
+             </entry>
+             <entry
+                   defineOnly="false"
+                   description="Create a new InteractionUse"
+                   id="interactionoverview.drawer.nodes.interactionuse"
+                   kind="tool"
+                   label="Interaction Use"
+                   large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InteractionUse.gif"
+                   path="/interactionoverview.drawer.nodes/"
+                   small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InteractionUse.gif">
+             </entry>
+          </contribution>
+          <editor
+                id="org.eclipse.papyrus.uml.diagram.interactionoverview">
+          </editor>
+       </paletteProvider>
+    </extension>
+    <extension
+          point="org.eclipse.ui.commands">
+       <command
+             defaultHandler="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.commands.UpdateDiagramInSnapshotCommandHandler"
+             description="Update Snapshot in Interaction"
+             id="org.eclipse.papyrus.uml.diagram.interactionoverview.updateSnapshotCommand"
+             name="Update Snapshot in Interaction">
+       </command>
+       <command
+             defaultHandler="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.commands.SwitchInteractionFormCommandHandler"
+             description="Switch Interaction &lt;-&gt; InteractionUse"
+             id="org.eclipse.papyrus.uml.diagram.interactionoverview.switchInteraction"
+             name="Switch Interaction &lt;-&gt; InteractionUse">
+       </command>
+    </extension>
+    <extension
+          point="org.eclipse.ui.menus">
+       <menuContribution
+             allPopups="true"
+             locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu?after=additions">
+          <command
+                commandId="org.eclipse.papyrus.uml.diagram.interactionoverview.updateSnapshotCommand"
+                label="Update Snapshot"
+                style="push">
+             <visibleWhen>
+                
+	                    <iterate
+                           ifEmpty="false"
+                           operator="or">
+	                        <instanceof value="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.part.CallBehaviorActionAsInteractionEditPart">
+	                        </instanceof>
+	                    </iterate>
+	                
+             </visibleWhen>
+          </command>
+          <command
+                commandId="org.eclipse.papyrus.uml.diagram.interactionoverview.switchInteraction"
+                label="Switch Interaction &lt;-&gt;InteractionUse"
+                style="push">
+             <visibleWhen>
+                   <iterate
+                         ifEmpty="false"
+                         operator="or">
+                      <instanceof
+                            value="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.part.CallBehaviorActionAsInteractionEditPart">
+                      </instanceof>
+                      <instanceof
+                            value="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.part.CustomInteractionUseEditPartCN">
+                      </instanceof>
+                   </iterate>
+             </visibleWhen>
+          </command>
+       </menuContribution>
+    </extension>
+    <extension
+          point="org.eclipse.papyrus.infra.gmfdiag.dnd.dropStrategy">
+       <strategy
+             strategy="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.commands.CallBehaviorActionToInteractionDropStrategy">
+       </strategy>
+    </extension>
+    <!-- Insert custom extensions here. -->
+
+    <!-- // End of user code -->
+<extension point="org.eclipse.papyrus.infra.gmfdiag.common.notationTypesMapping">
+   <diagramMappings diagramID="PapyrusUMLInteractionOverviewDiagram">
+          <mapping type="PapyrusUMLInteractionOverviewDiagram" humanReadableType="InteractionOverviewDiagram"/>
+          <!-- Compartments -->
+   
+          <!-- Link labels -->
+   </diagramMappings>
+</extension>
+
+<extension
+      point="org.eclipse.papyrus.infra.gmfdiag.common.diagramReconciler">
+   <diagramReconciler
+         diagramType="PapyrusUMLInteractionOverviewDiagram"
+         reconcilerClass="org.eclipse.papyrus.uml.diagram.activity.migration.ActivityReconciler_1_1_0"
+         source="1.0.0"
+         target="1.3.0">
+   </diagramReconciler>
+   <diagramReconciler
+         diagramType="PapyrusUMLInteractionOverviewDiagram"
+         reconcilerClass="org.eclipse.papyrus.uml.diagram.interactionoverview.migration.InteractionOverviewReconciler_1_2_0"
+         source="1.1.0"
+         target="1.3.0">
+   </diagramReconciler>
+</extension>
+
+   <extension point="org.eclipse.papyrus.infra.gmfdiag.common.visualTypeProviders">
+      <?gmfgen generated="true"?>
+      <visualTypeProvider
+            class="org.eclipse.papyrus.uml.diagram.interactionoverview.provider.UMLVisualTypeProvider"
+            diagramType="PapyrusUMLInteractionOverviewDiagram">
+      </visualTypeProvider>
+   </extension>
+</plugin>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policy/DiagramSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policy/DiagramSemanticEditPolicy.java
index f412f123a9f..8d77aebb030 100755..100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policy/DiagramSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/policy/DiagramSemanticEditPolicy.java
@@ -1,43 +1,43 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.interactionoverview.edit.policy;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.SemanticEditPolicy;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;

-// Start of user code custom imports

-// End of user code

-

-public class DiagramSemanticEditPolicy extends SemanticEditPolicy {

-

-	protected Command getCreateCommand(final CreateElementRequest req) {

-

-		final IElementEditService commandService = ElementEditServiceUtils.getCommandProvider(UMLElementTypes.Package_ActivityDiagram);

-		if (commandService == null) {

-			return UnexecutableCommand.INSTANCE;

-		}

-

-		// Start of user code custom creation commands

-		// End of user code

-

-		if (ElementTypes.ACTIVITY == req.getElementType()) {

-			final CreateElementRequest createRequest = new CreateElementRequest(req.getContainer(), UMLElementTypes.Activity_Shape);

-			return new ICommandProxy(commandService.getEditCommand(createRequest));

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.interactionoverview.edit.policy;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.SemanticEditPolicy;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
+// Start of user code custom imports
+// End of user code
+
+public class DiagramSemanticEditPolicy extends SemanticEditPolicy {
+
+	protected Command getCreateCommand(final CreateElementRequest req) {
+
+		final IElementEditService commandService = ElementEditServiceUtils.getCommandProvider(UMLElementTypes.Package_ActivityDiagram, req.getClientContext());
+		if (commandService == null) {
+			return UnexecutableCommand.INSTANCE;
+		}
+
+		// Start of user code custom creation commands
+		// End of user code
+
+		if (ElementTypes.ACTIVITY == req.getElementType()) {
+			final CreateElementRequest createRequest = new CreateElementRequest(req.getContainer(), UMLElementTypes.Activity_Shape);
+			return new ICommandProxy(commandService.getEditCommand(createRequest));
+		}
+		return UnexecutableCommand.INSTANCE;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/CreateProfileModelCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/CreateProfileModelCommand.java
index 6ea452c1d7b..48de978b291 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/CreateProfileModelCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/CreateProfileModelCommand.java
@@ -1,59 +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

- *

- * Contributors:

- *  Tatiana Fesenko (CEA LIST) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.profile;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.uml.diagram.common.commands.ModelCreationCommandBase;

-import org.eclipse.uml2.uml.UMLFactory;

-

-

-/**

- * The Class CreateProfileModelCommand.

- */

-public class CreateProfileModelCommand extends ModelCreationCommandBase {

-

-	public static final String COMMAND_ID = "profile";

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.extension.commands.ModelCreationCommandBase#createRootElement()

-	 *

-	 * @return

-	 */

-

-	@Override

-	protected EObject createRootElement() {

-		return UMLFactory.eINSTANCE.createProfile();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.extension.commands.ModelCreationCommandBase#initializeModel(org.eclipse.emf.ecore.EObject)

-	 *

-	 * @param owner

-	 */

-

-	@Override

-	protected void initializeModel(EObject owner) {

-		super.initializeModel(owner);

-		((org.eclipse.uml2.uml.Package) owner).setName(getModelName());

-	}

-

-	/**

-	 * Gets the model name.

-	 *

-	 * @return the model name

-	 */

-	protected String getModelName() {

-		return "profile"; //$NON-NLS-1$

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  Tatiana Fesenko (CEA LIST) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.profile;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.uml.diagram.common.commands.ModelCreationCommandBase;
+import org.eclipse.uml2.uml.UMLFactory;
+
+
+/**
+ * The Class CreateProfileModelCommand.
+ */
+public class CreateProfileModelCommand extends ModelCreationCommandBase {
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.extension.commands.ModelCreationCommandBase#createRootElement()
+	 *
+	 * @return
+	 */
+
+	@Override
+	protected EObject createRootElement() {
+		return UMLFactory.eINSTANCE.createProfile();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.extension.commands.ModelCreationCommandBase#initializeModel(org.eclipse.emf.ecore.EObject)
+	 *
+	 * @param owner
+	 */
+
+	@Override
+	protected void initializeModel(EObject owner) {
+		super.initializeModel(owner);
+		((org.eclipse.uml2.uml.Package) owner).setName(getModelName());
+	}
+
+	/**
+	 * Gets the model name.
+	 *
+	 * @return the model name
+	 */
+	protected String getModelName() {
+		return "profile"; //$NON-NLS-1$
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.configuration b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.configuration
deleted file mode 100644
index 154f3ca79de..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.configuration
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<configuration:PapyrusConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmi:id="_ko07IErbEeSdQKzSRatBjg">

-  <viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="_xogdoErbEeSdQKzSRatBjg" name="Default Papyrus Viewpoint">

-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_UekVgHDwEeWh-MssWmCB_A" implementationID="PapyrusUMLProfileDiagram">

-      <modelRules xmi:id="_UekVgXDwEeWh-MssWmCB_A">

-        <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_UekVgnDwEeWh-MssWmCB_A" name="IsContainedByProfile">

-          <constraintType href="platform:/plugin/org.eclipse.papyrus.infra.constraints/Model/ConstraintEnvironment.xmi#//@constraintTypes.4"/>

-          <properties xsi:type="constraints:ValueProperty" xmi:id="_UekVg3DwEeWh-MssWmCB_A" name="className" value="org.eclipse.papyrus.infra.viewpoints.policy.query.IsContainedByProfileQuery"/>

-        </constraints>

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </modelRules>

-      <owningRules xmi:id="_UekVhHDwEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </owningRules>

-      <owningRules xmi:id="_UekVhXDwEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Profile"/>

-      </owningRules>

-      <categories href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb5NxhEeOqHvRyiN87hA"/>

-      <childRules xmi:id="_UekVhnDwEeWh-MssWmCB_A"/>

-    </modelKinds>

-  </viewpoints>

-  <defaultStakeholder href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmkdxhEeOqHvRyiN87hA"/>

-  <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>

-</configuration:PapyrusConfiguration>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.xml
index 8a891dcfe9d..859b4a18895 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.xml
@@ -15,14 +15,6 @@
    
 -->
 <plugin>
-   <extension
-         point="org.eclipse.papyrus.infra.viewpoints.policy.custom">
-      <contribution
-            file="model/profilediagram.configuration"
-            original="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration">
-      </contribution>
-   </extension>
-
    <extension point="org.eclipse.ui.contexts" id="ui-context">
 				      <?gmfgen generated="true"?>
 				      <context
@@ -692,18 +684,6 @@
    </command>
 </extension>
 
-<extension
-	point="org.eclipse.papyrus.infra.ui.papyrusDiagram">
-	<diagramCategory
-       class="org.eclipse.papyrus.uml.diagram.profile.CreateProfileModelCommand"
-       description="Profile diagram"
-       extensionPrefix="profile"
-       icon="icons/wizban/category_profile.gif"
-       id="profile"
-       label="Profile">
-	</diagramCategory>      
-</extension>
-
 <extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">
       <?gmfgen generated="true"?>
       <ParserProvider class="org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider">
@@ -948,7 +928,7 @@
          diagramType="PapyrusUMLProfileDiagram"
          reconcilerClass="org.eclipse.papyrus.uml.diagram.profile.custom.migration.ProfileReconciler_1_2_0"
          source="1.1.0"
-         target="1.2.0">
+         target="1.3.0">
    </diagramReconciler>
 </extension>
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src-gen/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ClassPropertyCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src-gen/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ClassPropertyCreateCommand.java
index aca088e7930..01042d3f895 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src-gen/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ClassPropertyCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src-gen/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ClassPropertyCreateCommand.java
@@ -1,127 +1,127 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.profile.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.profile.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.StructuredClassifier;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ClassPropertyCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public ClassPropertyCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getProperty());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Property newElement = UMLFactory.eINSTANCE.createProperty();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				StructuredClassifier qualifiedTarget = (StructuredClassifier) target;

-				qualifiedTarget.getOwnedAttributes()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-		ElementInitializers.getInstance().init_Property_ClassAttributeLabel(newElement);

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Property newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.profile.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.papyrus.uml.diagram.profile.providers.ElementInitializers;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.StructuredClassifier;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class ClassPropertyCreateCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	public ClassPropertyCreateCommand(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		return container;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getProperty());
+		return data.isPermitted();
+
+
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+
+		Property newElement = UMLFactory.eINSTANCE.createProperty();
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+
+				StructuredClassifier qualifiedTarget = (StructuredClassifier) target;
+				qualifiedTarget.getOwnedAttributes()
+						.add(newElement);
+
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+
+
+		ElementInitializers.getInstance().init_Property_ClassAttributeLabel(newElement);
+
+		doConfigure(newElement, monitor, info);
+
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(Property newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/build.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/build.properties
index eaf6940f889..e20fc25145c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/build.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/build.properties
@@ -9,7 +9,6 @@ bin.includes = META-INF/,\
                plugin.xml,\
                about.html,\
                custom-messages.properties,\
-               model/sequenceDiagram.configuration,\
                model/sequencediagram-uml.elementtypesconfigurations,\
                model/sequencediagram.elementtypesconfigurations
 output..=bin/
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/migration/SequenceReconcilerForCompartment.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/migration/SequenceReconcilerForCompartment_1_2_0.java
index b392cc05ff2..043417932f5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/migration/SequenceReconcilerForCompartment.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/migration/SequenceReconcilerForCompartment_1_2_0.java
@@ -21,7 +21,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.ReconcilerForCompartm
 /**
  * Diagram Reconciler for compartment from 1.1.0 to 1.2.0
  */
-public class SequenceReconcilerForCompartment extends ReconcilerForCompartment {
+public class SequenceReconcilerForCompartment_1_2_0 extends ReconcilerForCompartment {
 
 	private static final String InteractionInteractionCompartmentEditPart_VISUAL_ID = "7001";
 	private static final String CombinedFragmentCombinedFragmentCompartmentEditPart_VISUAL_ID = "7004";
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/sequenceDiagram.configuration b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/sequenceDiagram.configuration
deleted file mode 100644
index 2322f2f4a16..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/sequenceDiagram.configuration
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<configuration:PapyrusConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmi:id="_ko07IErbEeSdQKzSRatBjg">

-  <viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="_xogdoErbEeSdQKzSRatBjg" name="Default Papyrus Viewpoint">

-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_TR15IHDvEeWh-MssWmCB_A" implementationID="PapyrusUMLSequenceDiagram">

-      <modelRules xmi:id="_TR15IXDvEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Interaction"/>

-      </modelRules>

-      <owningRules xmi:id="_TR15InDvEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Interaction"/>

-      </owningRules>

-      <owningRules xmi:id="_TR15I3DvEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>

-        <newModelPath xmi:id="_TR15JHDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">

-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>

-        </newModelPath>

-      </owningRules>

-      <owningRules xmi:id="_TR15JXDvEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>

-        <newModelPath xmi:id="_TR15JnDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">

-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>

-        </newModelPath>

-      </owningRules>

-      <owningRules xmi:id="_TR15J3DvEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-        <newModelPath xmi:id="_TR15KHDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">

-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>

-        </newModelPath>

-      </owningRules>

-      <owningRules xmi:id="_TR15KXDvEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//UseCase"/>

-        <newModelPath xmi:id="_TR15KnDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">

-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>

-        </newModelPath>

-      </owningRules>

-      <categories href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb4txhEeOqHvRyiN87hA"/>

-      <childRules xmi:id="_TR15K3DvEeWh-MssWmCB_A"/>

-    </modelKinds>

-  </viewpoints>

-  <defaultStakeholder href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmkdxhEeOqHvRyiN87hA"/>

-  <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>

-</configuration:PapyrusConfiguration>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml
index b1c9e0a9ba7..1b1404602c0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml
@@ -14,15 +14,6 @@
    
 -->
 <plugin>
-   <extension
-         point="org.eclipse.papyrus.infra.viewpoints.policy.custom">
-      <contribution
-            file="model/sequenceDiagram.configuration"
-            original="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration">
-      </contribution>
-   </extension>
-
-
    <extension point="org.eclipse.ui.contexts" id="ui-context">
 				      <?gmfgen generated="true"?>
 				      <context
@@ -1436,21 +1427,21 @@
           point="org.eclipse.papyrus.infra.gmfdiag.common.diagramReconciler">
        <diagramReconciler
              diagramType="PapyrusUMLSequenceDiagram"
-             reconcilerClass="org.eclipse.papyrus.uml.diagram.sequence.migration.SequenceReconcilerForCompartment"
-             source="undefined"
-             target="1.2.0">
+             reconcilerClass="org.eclipse.papyrus.uml.diagram.sequence.migration.SequenceReconcilerForCompartment_1_2_0"
+             source="1.1.0"
+             target="1.3.0">
        </diagramReconciler>
        <diagramReconciler
              diagramType="PapyrusUMLSequenceDiagram"
              reconcilerClass="org.eclipse.papyrus.uml.diagram.sequence.migration.SequenceReconciler_1_2_0"
              source="1.1.0"
-             target="1.2.0">
+             target="1.3.0">
        </diagramReconciler>
        <diagramReconciler
              diagramType="PapyrusUMLSequenceDiagram"
              reconcilerClass="org.eclipse.papyrus.uml.diagram.sequence.migration.SequenceDiagramLunaToMarsReconciler"
              source="1.0.0"
-             target="1.2.0">
+             target="1.3.0">
    	   </diagramReconciler>
     </extension>
    <extension point="org.eclipse.papyrus.infra.gmfdiag.common.visualTypeProviders">
@@ -1470,13 +1461,6 @@
          path="model/sequencediagram.elementtypesconfigurations">
    </elementTypeSet>
 </extension>
-<extension
-      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
-   <elementTypeSet
-         clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
-         path="model/sequencediagram-uml.elementtypesconfigurations">
-   </elementTypeSet>
-</extension>
 <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes" id="element-types">
       <?gmfgen generated="true"?>
       <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/ActionExecutionSpecificationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/ActionExecutionSpecificationCreateCommand.java
index 6e3d7062210..be36f1672f2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/ActionExecutionSpecificationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/ActionExecutionSpecificationCreateCommand.java
@@ -1,141 +1,141 @@
-/*****************************************************************************

- * Copyright (c) 2009 Atos Origin.

- *

- *

- * 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:

- *   Atos Origin - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.uml2.uml.ActionExecutionSpecification;

-import org.eclipse.uml2.uml.Interaction;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ActionExecutionSpecificationCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	private EObject eObject = null;

-

-	/**

-	 * @generated

-	 */

-	public ActionExecutionSpecificationCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.eObject = eObject;

-		this.diagram = diagram;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static ActionExecutionSpecificationCreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		return new ActionExecutionSpecificationCreateCommand(req, eObject, diagram);

-	}

-

-	/**

-	 * @generated

-	 */

-	public ActionExecutionSpecificationCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		if (container != null) {

-			return container;

-		}

-		return eObject;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getActionExecutionSpecification());

-		return data.isPermitted();

-	}

-

-	/**

-	 * To add the lifeline to the attribute covered of the AES

-	 *

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		ActionExecutionSpecification newElement = UMLFactory.eINSTANCE.createActionExecutionSpecification();

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-				Interaction qualifiedTarget = (Interaction) target;

-				qualifiedTarget.getFragments().add(newElement);

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(ActionExecutionSpecification newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2009 Atos Origin.
+ *
+ *
+ * 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:
+ *   Atos Origin - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.uml2.uml.ActionExecutionSpecification;
+import org.eclipse.uml2.uml.Interaction;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class ActionExecutionSpecificationCreateCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	private EObject eObject = null;
+
+	/**
+	 * @generated
+	 */
+	public ActionExecutionSpecificationCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.eObject = eObject;
+		this.diagram = diagram;
+	}
+
+	/**
+	 * @generated
+	 */
+	public static ActionExecutionSpecificationCreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		return new ActionExecutionSpecificationCreateCommand(req, eObject, diagram);
+	}
+
+	/**
+	 * @generated
+	 */
+	public ActionExecutionSpecificationCreateCommand(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		if (container != null) {
+			return container;
+		}
+		return eObject;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getActionExecutionSpecification());
+		return data.isPermitted();
+	}
+
+	/**
+	 * To add the lifeline to the attribute covered of the AES
+	 *
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		ActionExecutionSpecification newElement = UMLFactory.eINSTANCE.createActionExecutionSpecification();
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+				Interaction qualifiedTarget = (Interaction) target;
+				qualifiedTarget.getFragments().add(newElement);
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+		doConfigure(newElement, monitor, info);
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(ActionExecutionSpecification newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/BehaviorExecutionSpecificationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/BehaviorExecutionSpecificationCreateCommand.java
index dd0fb407d06..ec0002963da 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/BehaviorExecutionSpecificationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/BehaviorExecutionSpecificationCreateCommand.java
@@ -1,141 +1,141 @@
-/*****************************************************************************

- * Copyright (c) 2009 Atos Origin.

- *

- *

- * 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:

- *   Atos Origin - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.uml2.uml.BehaviorExecutionSpecification;

-import org.eclipse.uml2.uml.Interaction;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class BehaviorExecutionSpecificationCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	private EObject eObject = null;

-

-	/**

-	 * @generated

-	 */

-	public BehaviorExecutionSpecificationCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.eObject = eObject;

-		this.diagram = diagram;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static BehaviorExecutionSpecificationCreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		return new BehaviorExecutionSpecificationCreateCommand(req, eObject, diagram);

-	}

-

-	/**

-	 * @generated

-	 */

-	public BehaviorExecutionSpecificationCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		if (container != null) {

-			return container;

-		}

-		return eObject;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getBehaviorExecutionSpecification());

-		return data.isPermitted();

-	}

-

-	/**

-	 * To add the lifeline to the attribute covered of the AES

-	 *

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		BehaviorExecutionSpecification newElement = UMLFactory.eINSTANCE.createBehaviorExecutionSpecification();

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-				Interaction qualifiedTarget = (Interaction) target;

-				qualifiedTarget.getFragments().add(newElement);

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(BehaviorExecutionSpecification newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2009 Atos Origin.
+ *
+ *
+ * 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:
+ *   Atos Origin - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.uml2.uml.BehaviorExecutionSpecification;
+import org.eclipse.uml2.uml.Interaction;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class BehaviorExecutionSpecificationCreateCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	private EObject eObject = null;
+
+	/**
+	 * @generated
+	 */
+	public BehaviorExecutionSpecificationCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.eObject = eObject;
+		this.diagram = diagram;
+	}
+
+	/**
+	 * @generated
+	 */
+	public static BehaviorExecutionSpecificationCreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		return new BehaviorExecutionSpecificationCreateCommand(req, eObject, diagram);
+	}
+
+	/**
+	 * @generated
+	 */
+	public BehaviorExecutionSpecificationCreateCommand(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		if (container != null) {
+			return container;
+		}
+		return eObject;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getBehaviorExecutionSpecification());
+		return data.isPermitted();
+	}
+
+	/**
+	 * To add the lifeline to the attribute covered of the AES
+	 *
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		BehaviorExecutionSpecification newElement = UMLFactory.eINSTANCE.createBehaviorExecutionSpecification();
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+				Interaction qualifiedTarget = (Interaction) target;
+				qualifiedTarget.getFragments().add(newElement);
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+		doConfigure(newElement, monitor, info);
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(BehaviorExecutionSpecification newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/CombinedFragment2CreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/CombinedFragment2CreateCommand.java
index 0189cde6749..9bed99d049f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/CombinedFragment2CreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/CombinedFragment2CreateCommand.java
@@ -1,145 +1,145 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA

- *

- *

- * 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:

- *   Atos Origin - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

-import org.eclipse.uml2.uml.CombinedFragment;

-import org.eclipse.uml2.uml.Interaction;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class CombinedFragment2CreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	private EObject eObject = null;

-

-	/**

-	 * @generated

-	 */

-	public CombinedFragment2CreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.eObject = eObject;

-		this.diagram = diagram;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static CombinedFragment2CreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		return new CombinedFragment2CreateCommand(req, eObject, diagram);

-	}

-

-	/**

-	 * @generated

-	 */

-	public CombinedFragment2CreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		if (container != null) {

-			return container;

-		}

-		return eObject;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getCombinedFragment());

-		return data.isPermitted();

-	}

-

-	/**

-	 * Create a CoRegion :

-	 * - creates two operands

-	 * - set the Interaction Operator to parallel

-	 *

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		CombinedFragment newElement = UMLFactory.eINSTANCE.createCombinedFragment();

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-				Interaction qualifiedTarget = (Interaction) target;

-				qualifiedTarget.getFragments().add(newElement);

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-		ElementInitializers.getInstance().init_CombinedFragment_CoRegionShape(newElement);

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(CombinedFragment newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA
+ *
+ *
+ * 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:
+ *   Atos Origin - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;
+import org.eclipse.uml2.uml.CombinedFragment;
+import org.eclipse.uml2.uml.Interaction;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class CombinedFragment2CreateCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	private EObject eObject = null;
+
+	/**
+	 * @generated
+	 */
+	public CombinedFragment2CreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.eObject = eObject;
+		this.diagram = diagram;
+	}
+
+	/**
+	 * @generated
+	 */
+	public static CombinedFragment2CreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		return new CombinedFragment2CreateCommand(req, eObject, diagram);
+	}
+
+	/**
+	 * @generated
+	 */
+	public CombinedFragment2CreateCommand(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		if (container != null) {
+			return container;
+		}
+		return eObject;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getCombinedFragment());
+		return data.isPermitted();
+	}
+
+	/**
+	 * Create a CoRegion :
+	 * - creates two operands
+	 * - set the Interaction Operator to parallel
+	 *
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		CombinedFragment newElement = UMLFactory.eINSTANCE.createCombinedFragment();
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+				Interaction qualifiedTarget = (Interaction) target;
+				qualifiedTarget.getFragments().add(newElement);
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+		ElementInitializers.getInstance().init_CombinedFragment_CoRegionShape(newElement);
+		doConfigure(newElement, monitor, info);
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(CombinedFragment newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/CombinedFragmentCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/CombinedFragmentCreateCommand.java
index 3bce792cf24..a41f8c5730f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/CombinedFragmentCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/CombinedFragmentCreateCommand.java
@@ -1,146 +1,146 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA

- *

- *

- * 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:

- *   Atos Origin - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

-import org.eclipse.uml2.uml.CombinedFragment;

-import org.eclipse.uml2.uml.Interaction;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class CombinedFragmentCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	private EObject eObject = null;

-

-	/**

-	 * @generated

-	 */

-	public CombinedFragmentCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.eObject = eObject;

-		this.diagram = diagram;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static CombinedFragmentCreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		return new CombinedFragmentCreateCommand(req, eObject, diagram);

-	}

-

-	/**

-	 * @generated

-	 */

-	public CombinedFragmentCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		if (container != null) {

-			return container;

-		}

-		return eObject;

-	}

-

-	/**

-	 * The creation command can only be executed if the elementToEdit (i.e the container) is an Interaction or an InteractionOperand

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getCombinedFragment());

-		return data.isPermitted();

-	}

-

-	/**

-	 * Handle creation on InteractionOperand

-	 *

-	 * @generated

-	 */

-	@Override

-	@SuppressWarnings("unchecked")

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		CombinedFragment newElement = UMLFactory.eINSTANCE.createCombinedFragment();

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-				Interaction qualifiedTarget = (Interaction) target;

-				qualifiedTarget.getFragments().add(newElement);

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-		ElementInitializers.getInstance().init_CombinedFragment_Shape(newElement);

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(CombinedFragment newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA
+ *
+ *
+ * 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:
+ *   Atos Origin - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;
+import org.eclipse.uml2.uml.CombinedFragment;
+import org.eclipse.uml2.uml.Interaction;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class CombinedFragmentCreateCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	private EObject eObject = null;
+
+	/**
+	 * @generated
+	 */
+	public CombinedFragmentCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.eObject = eObject;
+		this.diagram = diagram;
+	}
+
+	/**
+	 * @generated
+	 */
+	public static CombinedFragmentCreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		return new CombinedFragmentCreateCommand(req, eObject, diagram);
+	}
+
+	/**
+	 * @generated
+	 */
+	public CombinedFragmentCreateCommand(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		if (container != null) {
+			return container;
+		}
+		return eObject;
+	}
+
+	/**
+	 * The creation command can only be executed if the elementToEdit (i.e the container) is an Interaction or an InteractionOperand
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getCombinedFragment());
+		return data.isPermitted();
+	}
+
+	/**
+	 * Handle creation on InteractionOperand
+	 *
+	 * @generated
+	 */
+	@Override
+	@SuppressWarnings("unchecked")
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		CombinedFragment newElement = UMLFactory.eINSTANCE.createCombinedFragment();
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+				Interaction qualifiedTarget = (Interaction) target;
+				qualifiedTarget.getFragments().add(newElement);
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+		ElementInitializers.getInstance().init_CombinedFragment_Shape(newElement);
+		doConfigure(newElement, monitor, info);
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(CombinedFragment newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/CommentCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/CommentCreateCommand.java
index a8335a3a056..d994f4bf0cb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/CommentCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/CommentCreateCommand.java
@@ -1,141 +1,141 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA

- *

- *

- * 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:

- *   Atos Origin - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Comment;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class CommentCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	private EObject eObject = null;

-

-	/**

-	 * @generated

-	 */

-	public CommentCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.eObject = eObject;

-		this.diagram = diagram;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static CommentCreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		return new CommentCreateCommand(req, eObject, diagram);

-	}

-

-	/**

-	 * @generated

-	 */

-	public CommentCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		if (container != null) {

-			return container;

-		}

-		return eObject;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getComment());

-		return data.isPermitted();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		Comment newElement = UMLFactory.eINSTANCE.createComment();

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-				Element qualifiedTarget = (Element) target;

-				qualifiedTarget.getOwnedComments().add(newElement);

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-		ElementInitializers.getInstance().init_Comment_Shape(newElement);

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Comment newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA
+ *
+ *
+ * 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:
+ *   Atos Origin - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;
+import org.eclipse.uml2.uml.Comment;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class CommentCreateCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	private EObject eObject = null;
+
+	/**
+	 * @generated
+	 */
+	public CommentCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.eObject = eObject;
+		this.diagram = diagram;
+	}
+
+	/**
+	 * @generated
+	 */
+	public static CommentCreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		return new CommentCreateCommand(req, eObject, diagram);
+	}
+
+	/**
+	 * @generated
+	 */
+	public CommentCreateCommand(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		if (container != null) {
+			return container;
+		}
+		return eObject;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getComment());
+		return data.isPermitted();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		Comment newElement = UMLFactory.eINSTANCE.createComment();
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+				Element qualifiedTarget = (Element) target;
+				qualifiedTarget.getOwnedComments().add(newElement);
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+		ElementInitializers.getInstance().init_Comment_Shape(newElement);
+		doConfigure(newElement, monitor, info);
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(Comment newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/ConsiderIgnoreFragmentCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/ConsiderIgnoreFragmentCreateCommand.java
index c752d6b19f2..fb016e80183 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/ConsiderIgnoreFragmentCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/ConsiderIgnoreFragmentCreateCommand.java
@@ -1,146 +1,146 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA

- *

- *

- * 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:

- *   Atos Origin - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

-import org.eclipse.uml2.uml.ConsiderIgnoreFragment;

-import org.eclipse.uml2.uml.Interaction;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ConsiderIgnoreFragmentCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	private EObject eObject = null;

-

-	/**

-	 * @generated

-	 */

-	public ConsiderIgnoreFragmentCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.eObject = eObject;

-		this.diagram = diagram;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static ConsiderIgnoreFragmentCreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		return new ConsiderIgnoreFragmentCreateCommand(req, eObject, diagram);

-	}

-

-	/**

-	 * @generated

-	 */

-	public ConsiderIgnoreFragmentCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		if (container != null) {

-			return container;

-		}

-		return eObject;

-	}

-

-	/**

-	 * The creation command can only be executed if the elementToEdit (i.e the container) is an Interaction or an InteractionOperand

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getConsiderIgnoreFragment());

-		return data.isPermitted();

-	}

-

-	/**

-	 * Handle creation on InteractionOperand

-	 *

-	 * @generated

-	 */

-	@Override

-	@SuppressWarnings("unchecked")

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		ConsiderIgnoreFragment newElement = UMLFactory.eINSTANCE.createConsiderIgnoreFragment();

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-				Interaction qualifiedTarget = (Interaction) target;

-				qualifiedTarget.getFragments().add(newElement);

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-		ElementInitializers.getInstance().init_ConsiderIgnoreFragment_Shape(newElement);

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(ConsiderIgnoreFragment newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA
+ *
+ *
+ * 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:
+ *   Atos Origin - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;
+import org.eclipse.uml2.uml.ConsiderIgnoreFragment;
+import org.eclipse.uml2.uml.Interaction;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class ConsiderIgnoreFragmentCreateCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	private EObject eObject = null;
+
+	/**
+	 * @generated
+	 */
+	public ConsiderIgnoreFragmentCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.eObject = eObject;
+		this.diagram = diagram;
+	}
+
+	/**
+	 * @generated
+	 */
+	public static ConsiderIgnoreFragmentCreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		return new ConsiderIgnoreFragmentCreateCommand(req, eObject, diagram);
+	}
+
+	/**
+	 * @generated
+	 */
+	public ConsiderIgnoreFragmentCreateCommand(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		if (container != null) {
+			return container;
+		}
+		return eObject;
+	}
+
+	/**
+	 * The creation command can only be executed if the elementToEdit (i.e the container) is an Interaction or an InteractionOperand
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getConsiderIgnoreFragment());
+		return data.isPermitted();
+	}
+
+	/**
+	 * Handle creation on InteractionOperand
+	 *
+	 * @generated
+	 */
+	@Override
+	@SuppressWarnings("unchecked")
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		ConsiderIgnoreFragment newElement = UMLFactory.eINSTANCE.createConsiderIgnoreFragment();
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+				Interaction qualifiedTarget = (Interaction) target;
+				qualifiedTarget.getFragments().add(newElement);
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+		ElementInitializers.getInstance().init_ConsiderIgnoreFragment_Shape(newElement);
+		doConfigure(newElement, monitor, info);
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(ConsiderIgnoreFragment newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/ConstraintCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/ConstraintCreateCommand.java
index 9d5bce04d81..cb5b3ee0c9e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/ConstraintCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/ConstraintCreateCommand.java
@@ -1,141 +1,141 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA

- *

- *

- * 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:

- *   Atos Origin - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Constraint;

-import org.eclipse.uml2.uml.Namespace;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ConstraintCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	private EObject eObject = null;

-

-	/**

-	 * @generated

-	 */

-	public ConstraintCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.eObject = eObject;

-		this.diagram = diagram;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static ConstraintCreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		return new ConstraintCreateCommand(req, eObject, diagram);

-	}

-

-	/**

-	 * @generated

-	 */

-	public ConstraintCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		if (container != null) {

-			return container;

-		}

-		return eObject;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getConstraint());

-		return data.isPermitted();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		Constraint newElement = UMLFactory.eINSTANCE.createConstraint();

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-				Namespace qualifiedTarget = (Namespace) target;

-				qualifiedTarget.getOwnedRules().add(newElement);

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-		ElementInitializers.getInstance().init_Constraint_Shape(newElement);

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Constraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA
+ *
+ *
+ * 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:
+ *   Atos Origin - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;
+import org.eclipse.uml2.uml.Constraint;
+import org.eclipse.uml2.uml.Namespace;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class ConstraintCreateCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	private EObject eObject = null;
+
+	/**
+	 * @generated
+	 */
+	public ConstraintCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.eObject = eObject;
+		this.diagram = diagram;
+	}
+
+	/**
+	 * @generated
+	 */
+	public static ConstraintCreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		return new ConstraintCreateCommand(req, eObject, diagram);
+	}
+
+	/**
+	 * @generated
+	 */
+	public ConstraintCreateCommand(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		if (container != null) {
+			return container;
+		}
+		return eObject;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getConstraint());
+		return data.isPermitted();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		Constraint newElement = UMLFactory.eINSTANCE.createConstraint();
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+				Namespace qualifiedTarget = (Namespace) target;
+				qualifiedTarget.getOwnedRules().add(newElement);
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+		ElementInitializers.getInstance().init_Constraint_Shape(newElement);
+		doConfigure(newElement, monitor, info);
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(Constraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/ContinuationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/ContinuationCreateCommand.java
index 60cee3f4707..4053962cd72 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/ContinuationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/ContinuationCreateCommand.java
@@ -1,143 +1,143 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA

- *

- *

- * 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:

- *   Atos Origin - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Continuation;

-import org.eclipse.uml2.uml.InteractionOperand;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class ContinuationCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	private EObject eObject = null;

-

-	/**

-	 * @generated

-	 */

-	public ContinuationCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.eObject = eObject;

-		this.diagram = diagram;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static ContinuationCreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		return new ContinuationCreateCommand(req, eObject, diagram);

-	}

-

-	/**

-	 * @generated

-	 */

-	public ContinuationCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		if (container != null) {

-			return container;

-		}

-		return eObject;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getContinuation());

-		return data.isPermitted();

-	}

-

-	/**

-	 * Generated not to handle the constraint on covered lifelines.

-	 *

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		Continuation newElement = UMLFactory.eINSTANCE.createContinuation();

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-				InteractionOperand qualifiedTarget = (InteractionOperand) target;

-				qualifiedTarget.getFragments().add(newElement);

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-		ElementInitializers.getInstance().init_Continuation_Shape(newElement);

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Continuation newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA
+ *
+ *
+ * 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:
+ *   Atos Origin - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;
+import org.eclipse.uml2.uml.Continuation;
+import org.eclipse.uml2.uml.InteractionOperand;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class ContinuationCreateCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	private EObject eObject = null;
+
+	/**
+	 * @generated
+	 */
+	public ContinuationCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.eObject = eObject;
+		this.diagram = diagram;
+	}
+
+	/**
+	 * @generated
+	 */
+	public static ContinuationCreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		return new ContinuationCreateCommand(req, eObject, diagram);
+	}
+
+	/**
+	 * @generated
+	 */
+	public ContinuationCreateCommand(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		if (container != null) {
+			return container;
+		}
+		return eObject;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getContinuation());
+		return data.isPermitted();
+	}
+
+	/**
+	 * Generated not to handle the constraint on covered lifelines.
+	 *
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		Continuation newElement = UMLFactory.eINSTANCE.createContinuation();
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+				InteractionOperand qualifiedTarget = (InteractionOperand) target;
+				qualifiedTarget.getFragments().add(newElement);
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+		ElementInitializers.getInstance().init_Continuation_Shape(newElement);
+		doConfigure(newElement, monitor, info);
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(Continuation newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/DestructionOccurrenceSpecificationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/DestructionOccurrenceSpecificationCreateCommand.java
index 6020044a1ba..1a4c9fbe0ff 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/DestructionOccurrenceSpecificationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/DestructionOccurrenceSpecificationCreateCommand.java
@@ -1,130 +1,130 @@
-package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

-import org.eclipse.uml2.uml.DestructionOccurrenceSpecification;

-import org.eclipse.uml2.uml.Interaction;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class DestructionOccurrenceSpecificationCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	private EObject eObject = null;

-

-	/**

-	 * @generated

-	 */

-	public DestructionOccurrenceSpecificationCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.eObject = eObject;

-		this.diagram = diagram;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static DestructionOccurrenceSpecificationCreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		return new DestructionOccurrenceSpecificationCreateCommand(req, eObject, diagram);

-	}

-

-	/**

-	 * @generated

-	 */

-	public DestructionOccurrenceSpecificationCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		if (container != null) {

-			return container;

-		}

-		return eObject;

-	}

-

-	/**

-	 * A DestructionEvent on a lifeline can only be created if it doesn't exist yet a destructionEvent on that lifeline.

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDestructionOccurrenceSpecification());

-		return data.isPermitted();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		DestructionOccurrenceSpecification newElement = UMLFactory.eINSTANCE.createDestructionOccurrenceSpecification();

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-				Interaction qualifiedTarget = (Interaction) target;

-				qualifiedTarget.getFragments().add(newElement);

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-		ElementInitializers.getInstance().init_DestructionOccurrenceSpecification_Shape(newElement);

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(DestructionOccurrenceSpecification newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;
+import org.eclipse.uml2.uml.DestructionOccurrenceSpecification;
+import org.eclipse.uml2.uml.Interaction;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class DestructionOccurrenceSpecificationCreateCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	private EObject eObject = null;
+
+	/**
+	 * @generated
+	 */
+	public DestructionOccurrenceSpecificationCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.eObject = eObject;
+		this.diagram = diagram;
+	}
+
+	/**
+	 * @generated
+	 */
+	public static DestructionOccurrenceSpecificationCreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		return new DestructionOccurrenceSpecificationCreateCommand(req, eObject, diagram);
+	}
+
+	/**
+	 * @generated
+	 */
+	public DestructionOccurrenceSpecificationCreateCommand(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		if (container != null) {
+			return container;
+		}
+		return eObject;
+	}
+
+	/**
+	 * A DestructionEvent on a lifeline can only be created if it doesn't exist yet a destructionEvent on that lifeline.
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDestructionOccurrenceSpecification());
+		return data.isPermitted();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		DestructionOccurrenceSpecification newElement = UMLFactory.eINSTANCE.createDestructionOccurrenceSpecification();
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+				Interaction qualifiedTarget = (Interaction) target;
+				qualifiedTarget.getFragments().add(newElement);
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+		ElementInitializers.getInstance().init_DestructionOccurrenceSpecification_Shape(newElement);
+		doConfigure(newElement, monitor, info);
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(DestructionOccurrenceSpecification newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/DurationConstraintCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/DurationConstraintCreateCommand.java
index a3f0eac504a..b390b7e9512 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/DurationConstraintCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/DurationConstraintCreateCommand.java
@@ -1,141 +1,141 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA

- *

- *

- * 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:

- *   Atos Origin - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

-import org.eclipse.uml2.uml.DurationConstraint;

-import org.eclipse.uml2.uml.Namespace;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class DurationConstraintCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	private EObject eObject = null;

-

-	/**

-	 * @generated

-	 */

-	public DurationConstraintCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.eObject = eObject;

-		this.diagram = diagram;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static DurationConstraintCreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		return new DurationConstraintCreateCommand(req, eObject, diagram);

-	}

-

-	/**

-	 * @generated

-	 */

-	public DurationConstraintCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		if (container != null) {

-			return container;

-		}

-		return eObject;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDurationConstraint());

-		return data.isPermitted();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		DurationConstraint newElement = UMLFactory.eINSTANCE.createDurationConstraint();

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-				Namespace qualifiedTarget = (Namespace) target;

-				qualifiedTarget.getOwnedRules().add(newElement);

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-		ElementInitializers.getInstance().init_DurationConstraint_Shape(newElement);

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(DurationConstraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA
+ *
+ *
+ * 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:
+ *   Atos Origin - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;
+import org.eclipse.uml2.uml.DurationConstraint;
+import org.eclipse.uml2.uml.Namespace;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class DurationConstraintCreateCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	private EObject eObject = null;
+
+	/**
+	 * @generated
+	 */
+	public DurationConstraintCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.eObject = eObject;
+		this.diagram = diagram;
+	}
+
+	/**
+	 * @generated
+	 */
+	public static DurationConstraintCreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		return new DurationConstraintCreateCommand(req, eObject, diagram);
+	}
+
+	/**
+	 * @generated
+	 */
+	public DurationConstraintCreateCommand(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		if (container != null) {
+			return container;
+		}
+		return eObject;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDurationConstraint());
+		return data.isPermitted();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		DurationConstraint newElement = UMLFactory.eINSTANCE.createDurationConstraint();
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+				Namespace qualifiedTarget = (Namespace) target;
+				qualifiedTarget.getOwnedRules().add(newElement);
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+		ElementInitializers.getInstance().init_DurationConstraint_Shape(newElement);
+		doConfigure(newElement, monitor, info);
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(DurationConstraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/DurationConstraintInMessageCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/DurationConstraintInMessageCreateCommand.java
index 2211e50d0c3..fe025f99ee7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/DurationConstraintInMessageCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/DurationConstraintInMessageCreateCommand.java
@@ -1,141 +1,141 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA

- *

- *

- * 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:

- *   Atos Origin - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

-import org.eclipse.uml2.uml.DurationConstraint;

-import org.eclipse.uml2.uml.Namespace;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class DurationConstraintInMessageCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	private EObject eObject = null;

-

-	/**

-	 * @generated

-	 */

-	public DurationConstraintInMessageCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.eObject = eObject;

-		this.diagram = diagram;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static DurationConstraintInMessageCreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		return new DurationConstraintInMessageCreateCommand(req, eObject, diagram);

-	}

-

-	/**

-	 * @generated

-	 */

-	public DurationConstraintInMessageCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		if (container != null) {

-			return container;

-		}

-		return eObject;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDurationConstraint());

-		return data.isPermitted();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		DurationConstraint newElement = UMLFactory.eINSTANCE.createDurationConstraint();

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-				Namespace qualifiedTarget = (Namespace) target;

-				qualifiedTarget.getOwnedRules().add(newElement);

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-		ElementInitializers.getInstance().init_DurationConstraint_Shape_CN(newElement);

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(DurationConstraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA
+ *
+ *
+ * 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:
+ *   Atos Origin - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;
+import org.eclipse.uml2.uml.DurationConstraint;
+import org.eclipse.uml2.uml.Namespace;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class DurationConstraintInMessageCreateCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	private EObject eObject = null;
+
+	/**
+	 * @generated
+	 */
+	public DurationConstraintInMessageCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.eObject = eObject;
+		this.diagram = diagram;
+	}
+
+	/**
+	 * @generated
+	 */
+	public static DurationConstraintInMessageCreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		return new DurationConstraintInMessageCreateCommand(req, eObject, diagram);
+	}
+
+	/**
+	 * @generated
+	 */
+	public DurationConstraintInMessageCreateCommand(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		if (container != null) {
+			return container;
+		}
+		return eObject;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDurationConstraint());
+		return data.isPermitted();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		DurationConstraint newElement = UMLFactory.eINSTANCE.createDurationConstraint();
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+				Namespace qualifiedTarget = (Namespace) target;
+				qualifiedTarget.getOwnedRules().add(newElement);
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+		ElementInitializers.getInstance().init_DurationConstraint_Shape_CN(newElement);
+		doConfigure(newElement, monitor, info);
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(DurationConstraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/DurationObservationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/DurationObservationCreateCommand.java
index 242cb05d010..57393a8f312 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/DurationObservationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/DurationObservationCreateCommand.java
@@ -1,141 +1,141 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA

- *

- *

- * 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:

- *   Atos Origin - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

-import org.eclipse.uml2.uml.DurationObservation;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class DurationObservationCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	private EObject eObject = null;

-

-	/**

-	 * @generated

-	 */

-	public DurationObservationCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.eObject = eObject;

-		this.diagram = diagram;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static DurationObservationCreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		return new DurationObservationCreateCommand(req, eObject, diagram);

-	}

-

-	/**

-	 * @generated

-	 */

-	public DurationObservationCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		if (container != null) {

-			return container;

-		}

-		return eObject;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDurationObservation());

-		return data.isPermitted();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		DurationObservation newElement = UMLFactory.eINSTANCE.createDurationObservation();

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-		ElementInitializers.getInstance().init_DurationObservation_Shape(newElement);

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(DurationObservation newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA
+ *
+ *
+ * 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:
+ *   Atos Origin - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;
+import org.eclipse.uml2.uml.DurationObservation;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class DurationObservationCreateCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	private EObject eObject = null;
+
+	/**
+	 * @generated
+	 */
+	public DurationObservationCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.eObject = eObject;
+		this.diagram = diagram;
+	}
+
+	/**
+	 * @generated
+	 */
+	public static DurationObservationCreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		return new DurationObservationCreateCommand(req, eObject, diagram);
+	}
+
+	/**
+	 * @generated
+	 */
+	public DurationObservationCreateCommand(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		if (container != null) {
+			return container;
+		}
+		return eObject;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDurationObservation());
+		return data.isPermitted();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		DurationObservation newElement = UMLFactory.eINSTANCE.createDurationObservation();
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+				Package qualifiedTarget = (Package) target;
+				qualifiedTarget.getPackagedElements().add(newElement);
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+		ElementInitializers.getInstance().init_DurationObservation_Shape(newElement);
+		doConfigure(newElement, monitor, info);
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(DurationObservation newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/InteractionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/InteractionCreateCommand.java
index 664aea72e32..2b4c7fa455b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/InteractionCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/InteractionCreateCommand.java
@@ -1,141 +1,141 @@
-/*****************************************************************************

- * Copyright (c) 2009 Atos Origin.

- *

- *

- * 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:

- *   Atos Origin - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Interaction;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class InteractionCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	private EObject eObject = null;

-

-	/**

-	 * @generated

-	 */

-	public InteractionCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.eObject = eObject;

-		this.diagram = diagram;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static InteractionCreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		return new InteractionCreateCommand(req, eObject, diagram);

-	}

-

-	/**

-	 * @generated

-	 */

-	public InteractionCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		if (container != null) {

-			return container;

-		}

-		return eObject;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInteraction());

-		return data.isPermitted();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		Interaction newElement = UMLFactory.eINSTANCE.createInteraction();

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-		ElementInitializers.getInstance().init_Interaction_Shape(newElement);

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Interaction newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2009 Atos Origin.
+ *
+ *
+ * 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:
+ *   Atos Origin - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;
+import org.eclipse.uml2.uml.Interaction;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class InteractionCreateCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	private EObject eObject = null;
+
+	/**
+	 * @generated
+	 */
+	public InteractionCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.eObject = eObject;
+		this.diagram = diagram;
+	}
+
+	/**
+	 * @generated
+	 */
+	public static InteractionCreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		return new InteractionCreateCommand(req, eObject, diagram);
+	}
+
+	/**
+	 * @generated
+	 */
+	public InteractionCreateCommand(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		if (container != null) {
+			return container;
+		}
+		return eObject;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInteraction());
+		return data.isPermitted();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		Interaction newElement = UMLFactory.eINSTANCE.createInteraction();
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+				Package qualifiedTarget = (Package) target;
+				qualifiedTarget.getPackagedElements().add(newElement);
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+		ElementInitializers.getInstance().init_Interaction_Shape(newElement);
+		doConfigure(newElement, monitor, info);
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(Interaction newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/InteractionOperandCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/InteractionOperandCreateCommand.java
index 1d89779f94e..5d6785f41da 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/InteractionOperandCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/InteractionOperandCreateCommand.java
@@ -1,142 +1,142 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA

- *

- *

- * 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:

- *   Atos Origin - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.uml2.uml.CombinedFragment;

-import org.eclipse.uml2.uml.InteractionOperand;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class InteractionOperandCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	private EObject eObject = null;

-

-	/**

-	 * @generated

-	 */

-	public InteractionOperandCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.eObject = eObject;

-		this.diagram = diagram;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static InteractionOperandCreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		return new InteractionOperandCreateCommand(req, eObject, diagram);

-	}

-

-	/**

-	 * @generated

-	 */

-	public InteractionOperandCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		if (container != null) {

-			return container;

-		}

-		return eObject;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInteractionOperand());

-		return data.isPermitted();

-	}

-

-	/**

-	 * Generated not for add combined fragment's covered lifelines on interaction operand

-	 *

-	 * @generated

-	 */

-	@Override

-	@SuppressWarnings({ "unchecked" })

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		InteractionOperand newElement = UMLFactory.eINSTANCE.createInteractionOperand();

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-				CombinedFragment qualifiedTarget = (CombinedFragment) target;

-				qualifiedTarget.getOperands().add(newElement);

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(InteractionOperand newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA
+ *
+ *
+ * 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:
+ *   Atos Origin - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.uml2.uml.CombinedFragment;
+import org.eclipse.uml2.uml.InteractionOperand;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class InteractionOperandCreateCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	private EObject eObject = null;
+
+	/**
+	 * @generated
+	 */
+	public InteractionOperandCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.eObject = eObject;
+		this.diagram = diagram;
+	}
+
+	/**
+	 * @generated
+	 */
+	public static InteractionOperandCreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		return new InteractionOperandCreateCommand(req, eObject, diagram);
+	}
+
+	/**
+	 * @generated
+	 */
+	public InteractionOperandCreateCommand(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		if (container != null) {
+			return container;
+		}
+		return eObject;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInteractionOperand());
+		return data.isPermitted();
+	}
+
+	/**
+	 * Generated not for add combined fragment's covered lifelines on interaction operand
+	 *
+	 * @generated
+	 */
+	@Override
+	@SuppressWarnings({ "unchecked" })
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		InteractionOperand newElement = UMLFactory.eINSTANCE.createInteractionOperand();
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+				CombinedFragment qualifiedTarget = (CombinedFragment) target;
+				qualifiedTarget.getOperands().add(newElement);
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+		doConfigure(newElement, monitor, info);
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(InteractionOperand newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/InteractionUseCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/InteractionUseCreateCommand.java
index f7a3e979b60..cac5d8b2d00 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/InteractionUseCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/InteractionUseCreateCommand.java
@@ -1,145 +1,145 @@
-/*****************************************************************************

- * Copyright (c) 2009 Atos Origin.

- *

- *

- * 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:

- *   Atos Origin - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Interaction;

-import org.eclipse.uml2.uml.InteractionUse;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class InteractionUseCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	private EObject eObject = null;

-

-	/**

-	 * @generated

-	 */

-	public InteractionUseCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.eObject = eObject;

-		this.diagram = diagram;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static InteractionUseCreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		return new InteractionUseCreateCommand(req, eObject, diagram);

-	}

-

-	/**

-	 * @generated

-	 */

-	public InteractionUseCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		if (container != null) {

-			return container;

-		}

-		return eObject;

-	}

-

-	/**

-	 * The creation command can only be executed if the elementToEdit (i.e the container) is an Interaction or an InteractionOperand

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInteractionUse());

-		return data.isPermitted();

-	}

-

-	/**

-	 * Handle creation on InteractionOperand

-	 *

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		InteractionUse newElement = UMLFactory.eINSTANCE.createInteractionUse();

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-				Interaction qualifiedTarget = (Interaction) target;

-				qualifiedTarget.getFragments().add(newElement);

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-		ElementInitializers.getInstance().init_InteractionUse_Shape(newElement);

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(InteractionUse newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2009 Atos Origin.
+ *
+ *
+ * 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:
+ *   Atos Origin - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;
+import org.eclipse.uml2.uml.Interaction;
+import org.eclipse.uml2.uml.InteractionUse;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class InteractionUseCreateCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	private EObject eObject = null;
+
+	/**
+	 * @generated
+	 */
+	public InteractionUseCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.eObject = eObject;
+		this.diagram = diagram;
+	}
+
+	/**
+	 * @generated
+	 */
+	public static InteractionUseCreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		return new InteractionUseCreateCommand(req, eObject, diagram);
+	}
+
+	/**
+	 * @generated
+	 */
+	public InteractionUseCreateCommand(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		if (container != null) {
+			return container;
+		}
+		return eObject;
+	}
+
+	/**
+	 * The creation command can only be executed if the elementToEdit (i.e the container) is an Interaction or an InteractionOperand
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInteractionUse());
+		return data.isPermitted();
+	}
+
+	/**
+	 * Handle creation on InteractionOperand
+	 *
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		InteractionUse newElement = UMLFactory.eINSTANCE.createInteractionUse();
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+				Interaction qualifiedTarget = (Interaction) target;
+				qualifiedTarget.getFragments().add(newElement);
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+		ElementInitializers.getInstance().init_InteractionUse_Shape(newElement);
+		doConfigure(newElement, monitor, info);
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(InteractionUse newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/LifelineCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/LifelineCreateCommand.java
index 4036574d088..f7323008a42 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/LifelineCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/LifelineCreateCommand.java
@@ -1,145 +1,145 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA

- *

- *

- * 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:

- *   Atos Origin - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Interaction;

-import org.eclipse.uml2.uml.Lifeline;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class LifelineCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	private EObject eObject = null;

-

-	/**

-	 * @generated

-	 */

-	public LifelineCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.eObject = eObject;

-		this.diagram = diagram;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static LifelineCreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		return new LifelineCreateCommand(req, eObject, diagram);

-	}

-

-	/**

-	 * @generated

-	 */

-	public LifelineCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		if (container != null) {

-			return container;

-		}

-		return eObject;

-	}

-

-	/**

-	 * Add generated NOT to constrain the creation of a lifeline

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getLifeline());

-		return data.isPermitted();

-	}

-

-	/**

-	 * Generated not for add lifelines on lifeline

-	 *

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		Lifeline newElement = UMLFactory.eINSTANCE.createLifeline();

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-				Interaction qualifiedTarget = (Interaction) target;

-				qualifiedTarget.getLifelines().add(newElement);

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-		ElementInitializers.getInstance().init_Lifeline_Shape(newElement);

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Lifeline newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA
+ *
+ *
+ * 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:
+ *   Atos Origin - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;
+import org.eclipse.uml2.uml.Interaction;
+import org.eclipse.uml2.uml.Lifeline;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class LifelineCreateCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	private EObject eObject = null;
+
+	/**
+	 * @generated
+	 */
+	public LifelineCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.eObject = eObject;
+		this.diagram = diagram;
+	}
+
+	/**
+	 * @generated
+	 */
+	public static LifelineCreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		return new LifelineCreateCommand(req, eObject, diagram);
+	}
+
+	/**
+	 * @generated
+	 */
+	public LifelineCreateCommand(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		if (container != null) {
+			return container;
+		}
+		return eObject;
+	}
+
+	/**
+	 * Add generated NOT to constrain the creation of a lifeline
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getLifeline());
+		return data.isPermitted();
+	}
+
+	/**
+	 * Generated not for add lifelines on lifeline
+	 *
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		Lifeline newElement = UMLFactory.eINSTANCE.createLifeline();
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+				Interaction qualifiedTarget = (Interaction) target;
+				qualifiedTarget.getLifelines().add(newElement);
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+		ElementInitializers.getInstance().init_Lifeline_Shape(newElement);
+		doConfigure(newElement, monitor, info);
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(Lifeline newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/StateInvariantCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/StateInvariantCreateCommand.java
index b68dc1fb0d8..ff05ad2b6ed 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/StateInvariantCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/StateInvariantCreateCommand.java
@@ -1,143 +1,143 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA

- *

- *

- * 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:

- *   Atos Origin - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Interaction;

-import org.eclipse.uml2.uml.StateInvariant;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class StateInvariantCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	private EObject eObject = null;

-

-	/**

-	 * @generated

-	 */

-	public StateInvariantCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.eObject = eObject;

-		this.diagram = diagram;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static StateInvariantCreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		return new StateInvariantCreateCommand(req, eObject, diagram);

-	}

-

-	/**

-	 * @generated

-	 */

-	public StateInvariantCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		if (container != null) {

-			return container;

-		}

-		return eObject;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getStateInvariant());

-		return data.isPermitted();

-	}

-

-	/**

-	 * The StateInvariant is created on the lifeline and not on its container

-	 *

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		StateInvariant newElement = UMLFactory.eINSTANCE.createStateInvariant();

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-				Interaction qualifiedTarget = (Interaction) target;

-				qualifiedTarget.getFragments().add(newElement);

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-		ElementInitializers.getInstance().init_StateInvariant_Shape(newElement);

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(StateInvariant newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA
+ *
+ *
+ * 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:
+ *   Atos Origin - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;
+import org.eclipse.uml2.uml.Interaction;
+import org.eclipse.uml2.uml.StateInvariant;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class StateInvariantCreateCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	private EObject eObject = null;
+
+	/**
+	 * @generated
+	 */
+	public StateInvariantCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.eObject = eObject;
+		this.diagram = diagram;
+	}
+
+	/**
+	 * @generated
+	 */
+	public static StateInvariantCreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		return new StateInvariantCreateCommand(req, eObject, diagram);
+	}
+
+	/**
+	 * @generated
+	 */
+	public StateInvariantCreateCommand(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		if (container != null) {
+			return container;
+		}
+		return eObject;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getStateInvariant());
+		return data.isPermitted();
+	}
+
+	/**
+	 * The StateInvariant is created on the lifeline and not on its container
+	 *
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		StateInvariant newElement = UMLFactory.eINSTANCE.createStateInvariant();
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+				Interaction qualifiedTarget = (Interaction) target;
+				qualifiedTarget.getFragments().add(newElement);
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+		ElementInitializers.getInstance().init_StateInvariant_Shape(newElement);
+		doConfigure(newElement, monitor, info);
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(StateInvariant newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/TimeConstraintCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/TimeConstraintCreateCommand.java
index ee614b29441..e0fb7510bcf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/TimeConstraintCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/TimeConstraintCreateCommand.java
@@ -1,141 +1,141 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA

- *

- *

- * 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:

- *   Atos Origin - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Namespace;

-import org.eclipse.uml2.uml.TimeConstraint;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class TimeConstraintCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	private EObject eObject = null;

-

-	/**

-	 * @generated

-	 */

-	public TimeConstraintCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.eObject = eObject;

-		this.diagram = diagram;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static TimeConstraintCreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		return new TimeConstraintCreateCommand(req, eObject, diagram);

-	}

-

-	/**

-	 * @generated

-	 */

-	public TimeConstraintCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		if (container != null) {

-			return container;

-		}

-		return eObject;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getTimeConstraint());

-		return data.isPermitted();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		TimeConstraint newElement = UMLFactory.eINSTANCE.createTimeConstraint();

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-				Namespace qualifiedTarget = (Namespace) target;

-				qualifiedTarget.getOwnedRules().add(newElement);

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-		ElementInitializers.getInstance().init_TimeConstraint_Shape(newElement);

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(TimeConstraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA
+ *
+ *
+ * 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:
+ *   Atos Origin - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;
+import org.eclipse.uml2.uml.Namespace;
+import org.eclipse.uml2.uml.TimeConstraint;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class TimeConstraintCreateCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	private EObject eObject = null;
+
+	/**
+	 * @generated
+	 */
+	public TimeConstraintCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.eObject = eObject;
+		this.diagram = diagram;
+	}
+
+	/**
+	 * @generated
+	 */
+	public static TimeConstraintCreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		return new TimeConstraintCreateCommand(req, eObject, diagram);
+	}
+
+	/**
+	 * @generated
+	 */
+	public TimeConstraintCreateCommand(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		if (container != null) {
+			return container;
+		}
+		return eObject;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getTimeConstraint());
+		return data.isPermitted();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		TimeConstraint newElement = UMLFactory.eINSTANCE.createTimeConstraint();
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+				Namespace qualifiedTarget = (Namespace) target;
+				qualifiedTarget.getOwnedRules().add(newElement);
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+		ElementInitializers.getInstance().init_TimeConstraint_Shape(newElement);
+		doConfigure(newElement, monitor, info);
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(TimeConstraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/TimeObservationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/TimeObservationCreateCommand.java
index a653b6911a3..a377a6ccf29 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/TimeObservationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/commands/TimeObservationCreateCommand.java
@@ -1,141 +1,141 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA

- *

- *

- * 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:

- *   Atos Origin - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.TimeObservation;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class TimeObservationCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	private EObject eObject = null;

-

-	/**

-	 * @generated

-	 */

-	public TimeObservationCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.eObject = eObject;

-		this.diagram = diagram;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static TimeObservationCreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {

-		return new TimeObservationCreateCommand(req, eObject, diagram);

-	}

-

-	/**

-	 * @generated

-	 */

-	public TimeObservationCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		if (container != null) {

-			return container;

-		}

-		return eObject;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getTimeObservation());

-		return data.isPermitted();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		TimeObservation newElement = UMLFactory.eINSTANCE.createTimeObservation();

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-		ElementInitializers.getInstance().init_TimeObservation_Shape(newElement);

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(TimeObservation newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA
+ *
+ *
+ * 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:
+ *   Atos Origin - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.sequence.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.TimeObservation;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class TimeObservationCreateCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	private EObject eObject = null;
+
+	/**
+	 * @generated
+	 */
+	public TimeObservationCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.eObject = eObject;
+		this.diagram = diagram;
+	}
+
+	/**
+	 * @generated
+	 */
+	public static TimeObservationCreateCommand create(CreateElementRequest req, EObject eObject, Diagram diagram) {
+		return new TimeObservationCreateCommand(req, eObject, diagram);
+	}
+
+	/**
+	 * @generated
+	 */
+	public TimeObservationCreateCommand(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		if (container != null) {
+			return container;
+		}
+		return eObject;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getTimeObservation());
+		return data.isPermitted();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		TimeObservation newElement = UMLFactory.eINSTANCE.createTimeObservation();
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+				Package qualifiedTarget = (Package) target;
+				qualifiedTarget.getPackagedElements().add(newElement);
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+		ElementInitializers.getInstance().init_TimeObservation_Shape(newElement);
+		doConfigure(newElement, monitor, info);
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(TimeObservation newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/CreateStateMachineDiagramCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/CreateStateMachineDiagramCommand.java
index 689ddf4e220..8c7ae73eb84 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/CreateStateMachineDiagramCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/CreateStateMachineDiagramCommand.java
@@ -27,8 +27,8 @@ import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.NotationFactory;
 import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramPrototype;
 import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
 import org.eclipse.papyrus.uml.diagram.common.commands.CreateBehavioredClassifierDiagramCommand;
 import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
 import org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.Zone;
@@ -104,7 +104,7 @@ public class CreateStateMachineDiagramCommand extends CreateBehavioredClassifier
 	 * @return
 	 */
 	@Override
-	protected Diagram doCreateDiagram(Resource diagramResource, EObject owner, EObject element, ViewPrototype prototype, String name) {
+	protected Diagram doCreateDiagram(Resource diagramResource, EObject owner, EObject element, DiagramPrototype prototype, String name) {
 		Diagram diagram = super.doCreateDiagram(diagramResource, owner, element, prototype, name);
 		if (diagram == null) {
 			if (element instanceof State) {
@@ -115,9 +115,7 @@ public class CreateStateMachineDiagramCommand extends CreateBehavioredClassifier
 				setName(name);
 				diagram.setElement(element);
 				DiagramUtils.setOwner(diagram, owner);
-				if (!prototype.isNatural()) {
-					DiagramUtils.setPrototype(diagram, prototype);
-				}
+				DiagramUtils.setPrototype(diagram, prototype);
 				initializeModel(element);
 				initializeDiagram(diagram);
 				diagramResource.getContents().add(diagram);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/migration/StateMachineReconcilerForCompartment.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/migration/StateMachineReconcilerForCompartment_1_2_0.java
index 3b8a294c8e4..eccfa0c3846 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/migration/StateMachineReconcilerForCompartment.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/migration/StateMachineReconcilerForCompartment_1_2_0.java
@@ -21,7 +21,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.ReconcilerForCompartm
 /**
  * Diagram Reconciler for compartment from 1.1.0 to 1.2.0
  */
-public class StateMachineReconcilerForCompartment extends ReconcilerForCompartment {
+public class StateMachineReconcilerForCompartment_1_2_0 extends ReconcilerForCompartment {
 
 	private static final String RegionCompartmentEditPart_VISUAL_ID = "3002";
 	private static final String StateMachineCompartmentEditPart_VISUAL_ID = "2002";
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram.configuration b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram.configuration
deleted file mode 100644
index 66dd0dbe7cd..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram.configuration
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration:PapyrusConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmi:id="_ko07IErbEeSdQKzSRatBjg">
-  <viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="_xogdoErbEeSdQKzSRatBjg" name="Default Papyrus Viewpoint">
-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_PwD0cHDvEeWh-MssWmCB_A" implementationID="PapyrusUMLStateMachineDiagram">
-      <modelRules xmi:id="_PwD0cXDvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//StateMachine"/>
-      </modelRules>
-      <modelRules xmi:id="_H-oCgB0UEea_bcpknMJ7-w">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//State"/>
-      </modelRules>
-      <owningRules xmi:id="_PwD0cnDvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//StateMachine"/>
-      </owningRules>
-      <owningRules xmi:id="_PwD0c3DvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
-        <newModelPath xmi:id="_PwD0dHDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.StateMachine">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
-        </newModelPath>
-      </owningRules>
-      <owningRules xmi:id="_PwD0dXDvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
-        <newModelPath xmi:id="_PwD0dnDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.StateMachine">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
-        </newModelPath>
-      </owningRules>
-      <owningRules xmi:id="_PwD0d3DvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        <newModelPath xmi:id="_PwD0eHDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.StateMachine">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
-        </newModelPath>
-      </owningRules>
-      <owningRules xmi:id="_PwD0eXDvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>
-        <newModelPath xmi:id="_PwD0enDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.ProtocolStateMachine">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface/protocol"/>
-        </newModelPath>
-      </owningRules>
-      <owningRules xmi:id="_5kmMcB0UEea_bcpknMJ7-w">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//State"/>
-      </owningRules>
-      <categories href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb4txhEeOqHvRyiN87hA"/>
-      <childRules xmi:id="_PwD0e3DvEeWh-MssWmCB_A"/>
-    </modelKinds>
-  </viewpoints>
-  <defaultStakeholder href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmkdxhEeOqHvRyiN87hA"/>
-  <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
-</configuration:PapyrusConfiguration>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/plugin.xml
index 7307cc90b99..3ab6cfa9503 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/plugin.xml
@@ -15,14 +15,6 @@
    
 -->
 <plugin>
-   <extension
-         point="org.eclipse.papyrus.infra.viewpoints.policy.custom">
-      <contribution
-            file="model/stateMachineDiagram.configuration"
-            original="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration">
-      </contribution>
-   </extension>
-      
    <extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">
 				      <?gmfgen generated="true"?>
 				      <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLMarkerNavigationProvider">
@@ -792,13 +784,6 @@
 
 
     <extension
-      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
-   <elementTypeSet
-   clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
-         path="model/stateMachineDiagram.elementtypesconfigurations">
-   </elementTypeSet>
-</extension>
-<extension
       point="org.eclipse.gmf.runtime.common.ui.services.parserProviders">
    <ParserProvider
          class="org.eclipse.papyrus.uml.diagram.statemachine.custom.providers.CustomUMLParserProvider">
@@ -811,15 +796,15 @@
       point="org.eclipse.papyrus.infra.gmfdiag.common.diagramReconciler">
    <diagramReconciler
          diagramType="PapyrusUMLStateMachineDiagram"
-         reconcilerClass="org.eclipse.papyrus.uml.diagram.statemachine.custom.migration.StateMachineReconcilerForCompartment"
-         source="undefined"
-         target="1.2.0">
+         reconcilerClass="org.eclipse.papyrus.uml.diagram.statemachine.custom.migration.StateMachineReconcilerForCompartment_1_2_0"
+         source="1.1.0"
+         target="1.3.0">
    </diagramReconciler>
    <diagramReconciler
          diagramType="PapyrusUMLStateMachineDiagram"
          reconcilerClass="org.eclipse.papyrus.uml.diagram.statemachine.custom.migration.StateMachineReconciler_1_2_0"
          source="1.1.0"
-         target="1.2.0">
+         target="1.3.0">
    </diagramReconciler>
 </extension>
    <extension point="org.eclipse.papyrus.infra.gmfdiag.common.visualTypeProviders">
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/plugin.xml
index 6230fb968ea..d4e504812d3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/plugin.xml
@@ -25,12 +25,4 @@
 	   </editpartProvider>
    </extension>
    
-      <extension
-            point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
-         <elementTypeSet
-               clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
-               path="model/stereotype-edit.elementtypesconfigurations">
-      </elementTypeSet>
-   </extension>
-   
 </plugin>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/src/org/eclipse/papyrus/uml/diagram/stereotype/edition/provider/StereotypeDisplayMigrationEditPolicyProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/src/org/eclipse/papyrus/uml/diagram/stereotype/edition/provider/StereotypeDisplayMigrationEditPolicyProvider.java
index cb8b8aba4fc..0582b316b8e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/src/org/eclipse/papyrus/uml/diagram/stereotype/edition/provider/StereotypeDisplayMigrationEditPolicyProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/src/org/eclipse/papyrus/uml/diagram/stereotype/edition/provider/StereotypeDisplayMigrationEditPolicyProvider.java
@@ -26,7 +26,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart;
 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.stereotype.migration.StereotypeDisplayDiagramReconciler;
+import org.eclipse.papyrus.uml.diagram.common.stereotype.migration.StereotypeDisplayDiagramReconciler_1_2_0;
 import org.eclipse.papyrus.uml.diagram.common.stereotype.migration.StereotypeMigrationHelper;
 import org.eclipse.papyrus.uml.diagram.common.stereotype.migration.editpolicies.StereotypeEAnnotationLabelMigrationEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.stereotype.migration.editpolicies.StereotypeEAnnotationNestedMigrationEditPolicy;
@@ -36,7 +36,7 @@ import org.eclipse.papyrus.uml.tools.utils.UMLUtil;
 /**
  * @author Céline JANSSENS
  *
- * @deprecated Replaced by {@link StereotypeDisplayDiagramReconciler}
+ * @deprecated Replaced by {@link StereotypeDisplayDiagramReconciler_1_2_0}
  */
 @Deprecated
 public class StereotypeDisplayMigrationEditPolicyProvider extends AbstractProvider implements IEditPolicyProvider {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/migration/TimingReconcilerForCompartment.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/migration/TimingReconcilerForCompartment_1_2_0.java
index 82caf7b5141..031fa565d6d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/migration/TimingReconcilerForCompartment.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/migration/TimingReconcilerForCompartment_1_2_0.java
@@ -21,7 +21,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.ReconcilerForCompartm
 /**
  * Diagram Reconciler for compartment from 1.1.0 to 1.2.0
  */
-public class TimingReconcilerForCompartment extends ReconcilerForCompartment {
+public class TimingReconcilerForCompartment_1_2_0 extends ReconcilerForCompartment {
 
 	private static final String InteractionCompartmentEditPartTN_VISUAL_ID = "5";
 	private static final String FullLifelineStateDefinitionCompartmentEditPartCN_VISUAL_ID = "7";
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/model/timingdiagram.configuration b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/model/timingdiagram.configuration
deleted file mode 100644
index b4dabe5abf1..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/model/timingdiagram.configuration
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<configuration:PapyrusConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmi:id="_ko07IErbEeSdQKzSRatBjg">

-  <viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="_xogdoErbEeSdQKzSRatBjg" name="Default Papyrus Viewpoint">

-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_LzyMIHDvEeWh-MssWmCB_A" implementationID="PapyrusUMLTimingDiagram">

-      <modelRules xmi:id="_LzyMIXDvEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </modelRules>

-      <owningRules xmi:id="_LzyMInDvEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </owningRules>

-      <categories href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb4txhEeOqHvRyiN87hA"/>

-      <childRules xmi:id="_LzyMI3DvEeWh-MssWmCB_A"/>

-    </modelKinds>

-  </viewpoints>

-  <defaultStakeholder href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmkdxhEeOqHvRyiN87hA"/>

-  <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>

-</configuration:PapyrusConfiguration>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/plugin.xml
index 6a222b06415..f025d9981f5 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/plugin.xml
@@ -14,14 +14,6 @@
    
 -->
 <plugin>
-   <extension
-         point="org.eclipse.papyrus.infra.viewpoints.policy.custom">
-      <contribution
-            file="model/timingdiagram.configuration"
-            original="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration">
-      </contribution>
-   </extension>
-   
    <extension point="org.eclipse.ui.contexts" id="ui-context">
 				      <?gmfgen generated="true"?>
 				      <context
@@ -873,15 +865,15 @@
       point="org.eclipse.papyrus.infra.gmfdiag.common.diagramReconciler">
    <diagramReconciler
          diagramType="PapyrusUMLTimingDiagram"
-         reconcilerClass="org.eclipse.papyrus.uml.diagram.timing.custom.migration.TimingReconcilerForCompartment"
-         source="undefined"
-         target="1.2.0">
+         reconcilerClass="org.eclipse.papyrus.uml.diagram.timing.custom.migration.TimingReconcilerForCompartment_1_2_0"
+         source="1.1.0"
+         target="1.3.0">
    </diagramReconciler>
    <diagramReconciler
          diagramType="PapyrusUMLTimingDiagram"
          reconcilerClass="org.eclipse.papyrus.uml.diagram.timing.custom.migration.TimingReconciler_1_2_0"
          source="1.1.0"
-         target="1.2.0">
+         target="1.3.0">
    </diagramReconciler>
 </extension>
    <extension point="org.eclipse.papyrus.infra.gmfdiag.common.visualTypeProviders">
@@ -891,17 +883,5 @@
             diagramType="PapyrusUMLTimingDiagram">
          </visualTypeProvider>
    </extension>
-   <extension
-         point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
-      <elementTypeSet
-            clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
-            path="model/timingdiagram-uml.elementtypesconfigurations">
-      </elementTypeSet>
-   </extension>
-
-
-
-
-
  
 </plugin>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/CompactLifelineCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/CompactLifelineCreateCommandCN.java
index bb06d49336f..33739b9e7f3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/CompactLifelineCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/CompactLifelineCreateCommandCN.java
@@ -1,125 +1,125 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.timing.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.uml2.uml.Interaction;

-import org.eclipse.uml2.uml.Lifeline;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class CompactLifelineCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public CompactLifelineCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getLifeline());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Lifeline newElement = UMLFactory.eINSTANCE.createLifeline();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Interaction qualifiedTarget = (Interaction) target;

-				qualifiedTarget.getLifelines()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Lifeline newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.timing.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.uml2.uml.Interaction;
+import org.eclipse.uml2.uml.Lifeline;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class CompactLifelineCreateCommandCN extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	public CompactLifelineCreateCommandCN(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		return container;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getLifeline());
+		return data.isPermitted();
+
+
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+
+		Lifeline newElement = UMLFactory.eINSTANCE.createLifeline();
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+
+				Interaction qualifiedTarget = (Interaction) target;
+				qualifiedTarget.getLifelines()
+						.add(newElement);
+
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+
+
+
+		doConfigure(newElement, monitor, info);
+
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(Lifeline newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/CompactStateInvariantCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/CompactStateInvariantCreateCommandCN.java
index 6984313d4dc..36a055ff6f4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/CompactStateInvariantCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/CompactStateInvariantCreateCommandCN.java
@@ -1,125 +1,125 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.timing.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.uml2.uml.Interaction;

-import org.eclipse.uml2.uml.StateInvariant;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class CompactStateInvariantCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public CompactStateInvariantCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getStateInvariant());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		StateInvariant newElement = UMLFactory.eINSTANCE.createStateInvariant();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Interaction qualifiedTarget = (Interaction) target;

-				qualifiedTarget.getFragments()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(StateInvariant newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.timing.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.uml2.uml.Interaction;
+import org.eclipse.uml2.uml.StateInvariant;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class CompactStateInvariantCreateCommandCN extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	public CompactStateInvariantCreateCommandCN(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		return container;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getStateInvariant());
+		return data.isPermitted();
+
+
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+
+		StateInvariant newElement = UMLFactory.eINSTANCE.createStateInvariant();
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+
+				Interaction qualifiedTarget = (Interaction) target;
+				qualifiedTarget.getFragments()
+						.add(newElement);
+
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+
+
+
+		doConfigure(newElement, monitor, info);
+
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(StateInvariant newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/DestructionOccurrenceSpecificationCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/DestructionOccurrenceSpecificationCreateCommandCN.java
index 68f53be70d1..a9275903518 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/DestructionOccurrenceSpecificationCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/DestructionOccurrenceSpecificationCreateCommandCN.java
@@ -1,125 +1,125 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.timing.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.uml2.uml.DestructionOccurrenceSpecification;

-import org.eclipse.uml2.uml.Lifeline;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class DestructionOccurrenceSpecificationCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public DestructionOccurrenceSpecificationCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDestructionOccurrenceSpecification());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		DestructionOccurrenceSpecification newElement = UMLFactory.eINSTANCE.createDestructionOccurrenceSpecification();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Lifeline qualifiedTarget = (Lifeline) target;

-				qualifiedTarget.getCoveredBys()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(DestructionOccurrenceSpecification newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.timing.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.uml2.uml.DestructionOccurrenceSpecification;
+import org.eclipse.uml2.uml.Lifeline;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class DestructionOccurrenceSpecificationCreateCommandCN extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	public DestructionOccurrenceSpecificationCreateCommandCN(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		return container;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDestructionOccurrenceSpecification());
+		return data.isPermitted();
+
+
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+
+		DestructionOccurrenceSpecification newElement = UMLFactory.eINSTANCE.createDestructionOccurrenceSpecification();
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+
+				Lifeline qualifiedTarget = (Lifeline) target;
+				qualifiedTarget.getCoveredBys()
+						.add(newElement);
+
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+
+
+
+		doConfigure(newElement, monitor, info);
+
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(DestructionOccurrenceSpecification newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/DurationConstraintCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/DurationConstraintCreateCommandCN.java
index e72b810cfa6..bbcdfa45b79 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/DurationConstraintCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/DurationConstraintCreateCommandCN.java
@@ -1,125 +1,125 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.timing.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.uml2.uml.DurationConstraint;

-import org.eclipse.uml2.uml.Namespace;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class DurationConstraintCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public DurationConstraintCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDurationConstraint());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		DurationConstraint newElement = UMLFactory.eINSTANCE.createDurationConstraint();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Namespace qualifiedTarget = (Namespace) target;

-				qualifiedTarget.getOwnedRules()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(DurationConstraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.timing.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.uml2.uml.DurationConstraint;
+import org.eclipse.uml2.uml.Namespace;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class DurationConstraintCreateCommandCN extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	public DurationConstraintCreateCommandCN(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		return container;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDurationConstraint());
+		return data.isPermitted();
+
+
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+
+		DurationConstraint newElement = UMLFactory.eINSTANCE.createDurationConstraint();
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+
+				Namespace qualifiedTarget = (Namespace) target;
+				qualifiedTarget.getOwnedRules()
+						.add(newElement);
+
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+
+
+
+		doConfigure(newElement, monitor, info);
+
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(DurationConstraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/DurationObservationCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/DurationObservationCreateCommandCN.java
index 5854ac184aa..c2fe44a0e4c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/DurationObservationCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/DurationObservationCreateCommandCN.java
@@ -1,125 +1,125 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.timing.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.uml2.uml.DurationObservation;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class DurationObservationCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public DurationObservationCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDurationObservation());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		DurationObservation newElement = UMLFactory.eINSTANCE.createDurationObservation();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(DurationObservation newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.timing.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.uml2.uml.DurationObservation;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class DurationObservationCreateCommandCN extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	public DurationObservationCreateCommandCN(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		return container;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDurationObservation());
+		return data.isPermitted();
+
+
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+
+		DurationObservation newElement = UMLFactory.eINSTANCE.createDurationObservation();
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+
+				Package qualifiedTarget = (Package) target;
+				qualifiedTarget.getPackagedElements()
+						.add(newElement);
+
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+
+
+
+		doConfigure(newElement, monitor, info);
+
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(DurationObservation newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/FullLifelineCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/FullLifelineCreateCommandCN.java
index e6ad389e55e..95e6091d7c0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/FullLifelineCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/FullLifelineCreateCommandCN.java
@@ -1,125 +1,125 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.timing.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.uml2.uml.Interaction;

-import org.eclipse.uml2.uml.Lifeline;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class FullLifelineCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public FullLifelineCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getLifeline());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Lifeline newElement = UMLFactory.eINSTANCE.createLifeline();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Interaction qualifiedTarget = (Interaction) target;

-				qualifiedTarget.getLifelines()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Lifeline newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.timing.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.uml2.uml.Interaction;
+import org.eclipse.uml2.uml.Lifeline;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class FullLifelineCreateCommandCN extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	public FullLifelineCreateCommandCN(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		return container;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getLifeline());
+		return data.isPermitted();
+
+
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+
+		Lifeline newElement = UMLFactory.eINSTANCE.createLifeline();
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+
+				Interaction qualifiedTarget = (Interaction) target;
+				qualifiedTarget.getLifelines()
+						.add(newElement);
+
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+
+
+
+		doConfigure(newElement, monitor, info);
+
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(Lifeline newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/FullStateInvariantCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/FullStateInvariantCreateCommandCN.java
index 5fb4188b2ed..f0936287fde 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/FullStateInvariantCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/FullStateInvariantCreateCommandCN.java
@@ -1,125 +1,125 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.timing.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.uml2.uml.Lifeline;

-import org.eclipse.uml2.uml.StateInvariant;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class FullStateInvariantCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public FullStateInvariantCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getStateInvariant());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		StateInvariant newElement = UMLFactory.eINSTANCE.createStateInvariant();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Lifeline qualifiedTarget = (Lifeline) target;

-				qualifiedTarget.getCoveredBys()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(StateInvariant newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.timing.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.uml2.uml.Lifeline;
+import org.eclipse.uml2.uml.StateInvariant;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class FullStateInvariantCreateCommandCN extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	public FullStateInvariantCreateCommandCN(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		return container;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getStateInvariant());
+		return data.isPermitted();
+
+
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+
+		StateInvariant newElement = UMLFactory.eINSTANCE.createStateInvariant();
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+
+				Lifeline qualifiedTarget = (Lifeline) target;
+				qualifiedTarget.getCoveredBys()
+						.add(newElement);
+
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+
+
+
+		doConfigure(newElement, monitor, info);
+
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(StateInvariant newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/GateCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/GateCreateCommand.java
index e2c32bf5148..c505ac08372 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/GateCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/GateCreateCommand.java
@@ -1,125 +1,125 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.timing.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.uml2.uml.Gate;

-import org.eclipse.uml2.uml.Interaction;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class GateCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public GateCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getGate());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Gate newElement = UMLFactory.eINSTANCE.createGate();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Interaction qualifiedTarget = (Interaction) target;

-				qualifiedTarget.getFormalGates()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Gate newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.timing.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.uml2.uml.Gate;
+import org.eclipse.uml2.uml.Interaction;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class GateCreateCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	public GateCreateCommand(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		return container;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getGate());
+		return data.isPermitted();
+
+
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+
+		Gate newElement = UMLFactory.eINSTANCE.createGate();
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+
+				Interaction qualifiedTarget = (Interaction) target;
+				qualifiedTarget.getFormalGates()
+						.add(newElement);
+
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+
+
+
+		doConfigure(newElement, monitor, info);
+
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(Gate newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/GeneralOrderingCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/GeneralOrderingCreateCommand.java
index 96a94dc36b1..4657bcaf4b4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/GeneralOrderingCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/GeneralOrderingCreateCommand.java
@@ -1,125 +1,125 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.timing.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.uml2.uml.GeneralOrdering;

-import org.eclipse.uml2.uml.InteractionFragment;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class GeneralOrderingCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public GeneralOrderingCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getGeneralOrdering());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		GeneralOrdering newElement = UMLFactory.eINSTANCE.createGeneralOrdering();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				InteractionFragment qualifiedTarget = (InteractionFragment) target;

-				qualifiedTarget.getGeneralOrderings()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(GeneralOrdering newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.timing.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.uml2.uml.GeneralOrdering;
+import org.eclipse.uml2.uml.InteractionFragment;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class GeneralOrderingCreateCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	public GeneralOrderingCreateCommand(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		return container;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getGeneralOrdering());
+		return data.isPermitted();
+
+
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+
+		GeneralOrdering newElement = UMLFactory.eINSTANCE.createGeneralOrdering();
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+
+				InteractionFragment qualifiedTarget = (InteractionFragment) target;
+				qualifiedTarget.getGeneralOrderings()
+						.add(newElement);
+
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+
+
+
+		doConfigure(newElement, monitor, info);
+
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(GeneralOrdering newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/InteractionCreateCommandTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/InteractionCreateCommandTN.java
index bfbf2701915..1e1a90fb477 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/InteractionCreateCommandTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/InteractionCreateCommandTN.java
@@ -1,125 +1,125 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.timing.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.uml2.uml.Interaction;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class InteractionCreateCommandTN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public InteractionCreateCommandTN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInteraction());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Interaction newElement = UMLFactory.eINSTANCE.createInteraction();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Interaction newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.timing.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.uml2.uml.Interaction;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class InteractionCreateCommandTN extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	public InteractionCreateCommandTN(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		return container;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInteraction());
+		return data.isPermitted();
+
+
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+
+		Interaction newElement = UMLFactory.eINSTANCE.createInteraction();
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+
+				Package qualifiedTarget = (Package) target;
+				qualifiedTarget.getPackagedElements()
+						.add(newElement);
+
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+
+
+
+		doConfigure(newElement, monitor, info);
+
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(Interaction newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/LifelineCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/LifelineCreateCommand.java
index fbf09853ae3..98072166ca3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/LifelineCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/LifelineCreateCommand.java
@@ -1,125 +1,125 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.timing.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.uml2.uml.Interaction;

-import org.eclipse.uml2.uml.Lifeline;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class LifelineCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public LifelineCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getLifeline());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		Lifeline newElement = UMLFactory.eINSTANCE.createLifeline();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Interaction qualifiedTarget = (Interaction) target;

-				qualifiedTarget.getLifelines()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Lifeline newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.timing.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.uml2.uml.Interaction;
+import org.eclipse.uml2.uml.Lifeline;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class LifelineCreateCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	public LifelineCreateCommand(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		return container;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getLifeline());
+		return data.isPermitted();
+
+
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+
+		Lifeline newElement = UMLFactory.eINSTANCE.createLifeline();
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+
+				Interaction qualifiedTarget = (Interaction) target;
+				qualifiedTarget.getLifelines()
+						.add(newElement);
+
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+
+
+
+		doConfigure(newElement, monitor, info);
+
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(Lifeline newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/MessageOccurrenceSpecificationCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/MessageOccurrenceSpecificationCreateCommandCN.java
index 1540e22abec..7f37aed43b9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/MessageOccurrenceSpecificationCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/MessageOccurrenceSpecificationCreateCommandCN.java
@@ -1,125 +1,125 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.timing.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.uml2.uml.Lifeline;

-import org.eclipse.uml2.uml.MessageOccurrenceSpecification;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class MessageOccurrenceSpecificationCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public MessageOccurrenceSpecificationCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getMessageOccurrenceSpecification());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		MessageOccurrenceSpecification newElement = UMLFactory.eINSTANCE.createMessageOccurrenceSpecification();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Lifeline qualifiedTarget = (Lifeline) target;

-				qualifiedTarget.getCoveredBys()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(MessageOccurrenceSpecification newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.timing.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.uml2.uml.Lifeline;
+import org.eclipse.uml2.uml.MessageOccurrenceSpecification;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class MessageOccurrenceSpecificationCreateCommandCN extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	public MessageOccurrenceSpecificationCreateCommandCN(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		return container;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getMessageOccurrenceSpecification());
+		return data.isPermitted();
+
+
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+
+		MessageOccurrenceSpecification newElement = UMLFactory.eINSTANCE.createMessageOccurrenceSpecification();
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+
+				Lifeline qualifiedTarget = (Lifeline) target;
+				qualifiedTarget.getCoveredBys()
+						.add(newElement);
+
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+
+
+
+		doConfigure(newElement, monitor, info);
+
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(MessageOccurrenceSpecification newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/OccurrenceSpecificationCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/OccurrenceSpecificationCreateCommandCN.java
index 8bc81fb77cb..9af557ae975 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/OccurrenceSpecificationCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/OccurrenceSpecificationCreateCommandCN.java
@@ -1,125 +1,125 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.timing.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.uml2.uml.Lifeline;

-import org.eclipse.uml2.uml.OccurrenceSpecification;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class OccurrenceSpecificationCreateCommandCN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public OccurrenceSpecificationCreateCommandCN(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getOccurrenceSpecification());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		OccurrenceSpecification newElement = UMLFactory.eINSTANCE.createOccurrenceSpecification();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Lifeline qualifiedTarget = (Lifeline) target;

-				qualifiedTarget.getCoveredBys()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(OccurrenceSpecification newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.timing.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.uml2.uml.Lifeline;
+import org.eclipse.uml2.uml.OccurrenceSpecification;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class OccurrenceSpecificationCreateCommandCN extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	public OccurrenceSpecificationCreateCommandCN(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		return container;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getOccurrenceSpecification());
+		return data.isPermitted();
+
+
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+
+		OccurrenceSpecification newElement = UMLFactory.eINSTANCE.createOccurrenceSpecification();
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+
+				Lifeline qualifiedTarget = (Lifeline) target;
+				qualifiedTarget.getCoveredBys()
+						.add(newElement);
+
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+
+
+
+		doConfigure(newElement, monitor, info);
+
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(OccurrenceSpecification newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/TimeConstraintCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/TimeConstraintCreateCommand.java
index e99323b8a28..991d6737c27 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/TimeConstraintCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/TimeConstraintCreateCommand.java
@@ -1,125 +1,125 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.timing.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.uml2.uml.Namespace;

-import org.eclipse.uml2.uml.TimeConstraint;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class TimeConstraintCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public TimeConstraintCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getTimeConstraint());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		TimeConstraint newElement = UMLFactory.eINSTANCE.createTimeConstraint();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Namespace qualifiedTarget = (Namespace) target;

-				qualifiedTarget.getOwnedRules()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(TimeConstraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.timing.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.uml2.uml.Namespace;
+import org.eclipse.uml2.uml.TimeConstraint;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class TimeConstraintCreateCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	public TimeConstraintCreateCommand(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		return container;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getTimeConstraint());
+		return data.isPermitted();
+
+
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+
+		TimeConstraint newElement = UMLFactory.eINSTANCE.createTimeConstraint();
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+
+				Namespace qualifiedTarget = (Namespace) target;
+				qualifiedTarget.getOwnedRules()
+						.add(newElement);
+
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+
+
+
+		doConfigure(newElement, monitor, info);
+
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(TimeConstraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/TimeObservationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/TimeObservationCreateCommand.java
index 6eb9212623c..b99a310761a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/TimeObservationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/commands/TimeObservationCreateCommand.java
@@ -1,125 +1,125 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.timing.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-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.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.TimeObservation;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * @generated

- */

-public class TimeObservationCreateCommand extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private Diagram diagram = null;

-

-	/**

-	 * @generated

-	 */

-	public TimeObservationCreateCommand(CreateElementRequest req, Diagram diagram) {

-		super(req.getLabel(), null, req);

-		this.diagram = diagram;

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest) getRequest()).getContainer();

-		if (container instanceof View) {

-			container = ((View) container).getElement();

-		}

-		return container;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean canExecute() {

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getTimeObservation());

-		return data.isPermitted();

-

-

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-		TimeObservation newElement = UMLFactory.eINSTANCE.createTimeObservation();

-

-		EObject target = getElementToEdit();

-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

-		if (data.isPermitted()) {

-			if (data.isPathDefined()) {

-				if (!data.execute(target, newElement)) {

-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

-				}

-			} else {

-

-				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements()

-						.add(newElement);

-

-			}

-		} else {

-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

-		}

-

-

-

-		doConfigure(newElement, monitor, info);

-

-		((CreateElementRequest) getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(TimeObservation newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if (configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.timing.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+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.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.TimeObservation;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * @generated
+ */
+public class TimeObservationCreateCommand extends EditElementCommand {
+
+	/**
+	 * @generated
+	 */
+	private Diagram diagram = null;
+
+	/**
+	 * @generated
+	 */
+	public TimeObservationCreateCommand(CreateElementRequest req, Diagram diagram) {
+		super(req.getLabel(), null, req);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * FIXME: replace with setElementToEdit()
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EObject getElementToEdit() {
+		EObject container = ((CreateElementRequest) getRequest()).getContainer();
+		if (container instanceof View) {
+			container = ((View) container).getElement();
+		}
+		return container;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public boolean canExecute() {
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getTimeObservation());
+		return data.isPermitted();
+
+
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+
+		TimeObservation newElement = UMLFactory.eINSTANCE.createTimeObservation();
+
+		EObject target = getElementToEdit();
+		ModelAddData data = PolicyChecker.getFor(target).getChildAddData(diagram, target, newElement);
+		if (data.isPermitted()) {
+			if (data.isPathDefined()) {
+				if (!data.execute(target, newElement)) {
+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
+				}
+			} else {
+
+				Package qualifiedTarget = (Package) target;
+				qualifiedTarget.getPackagedElements()
+						.add(newElement);
+
+			}
+		} else {
+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
+		}
+
+
+
+		doConfigure(newElement, monitor, info);
+
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void doConfigure(TimeObservation newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if (configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/custom/migration/UseCaseReconcilerForCompartment.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/custom/migration/UseCaseReconcilerForCompartment_1_2_0.java
index 2128c85a26d..07dff370c6b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/custom/migration/UseCaseReconcilerForCompartment.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/custom/migration/UseCaseReconcilerForCompartment_1_2_0.java
@@ -21,7 +21,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.ReconcilerForCompartm
 /**
  * Diagram Reconciler for compartment from 1.1.0 to 1.2.0
  */
-public class UseCaseReconcilerForCompartment extends ReconcilerForCompartment {
+public class UseCaseReconcilerForCompartment_1_2_0 extends ReconcilerForCompartment {
 
 	private static final String UseCasePointsEditPartTN_VISUAL_ID = "7009";
 	private static final String UseCasePointsInRectangleEditPart_VISUAL_ID = "7010";
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/custom/migration/UseCaseReconciler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/custom/migration/UseCaseReconciler_1_1_0.java
index 9079884be2f..e5b8dab2c7b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/custom/migration/UseCaseReconciler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/custom/migration/UseCaseReconciler_1_1_0.java
@@ -1,76 +1,76 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2015 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.usecase.custom.migration;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.papyrus.infra.gmfdiag.common.commands.InsertFloatingLabelFromMapCommand;

-import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler;

-

-/**

- * UseCase Diagram Reconciler from 1.0.0 to 1.1.0

- */

-public class UseCaseReconciler extends DiagramReconciler {

-

-	private final static String ActorEditPartTN_VISUAL_ID = "2011";

-	private final static String ActorFloatingLabelEditPartTN_VISUAL_ID = "6048";

-	private final static String ActorInComponentEditPart_VISUAL_ID = "3018";

-	private final static String ActorInComponentFloatingLabelEditPart_VISUAL_ID = "6050";

-	private final static String ActorInPackageEditPart_VISUAL_ID = "3011";

-	private final static String ActorInPackageFloatingLabelEditPart_VISUAL_ID = "6049";

-	private final static String ComponentInPackageEditPart_VISUAL_ID = "3013";

-	private final static String ComponentInPackageFloatingLabelEditPart_VISUAL_ID = "6051";

-	private final static String SubjectClassifierEditPartTN_VISUAL_ID = "2015";

-	private final static String SubjectClassifierFloatingLabelEditPartTN_VISUAL_ID = "6047";

-	private final static String UseCaseEditPartTN_VISUAL_ID = "2013";

-	private final static String UseCaseFloatingLabelEditPartTN_VISUAL_ID = "6038";

-	private final static String UseCaseInComponentEditPart_VISUAL_ID = "3009";

-	private final static String UseCaseInComponentFloatingLabelEditPart_VISUAL_ID = "6045";

-	private final static String UseCaseInPackageEditPart_VISUAL_ID = "3012";

-	private final static String UseCaseInPackageFloatingLabelEditPart_VISUAL_ID = "6046";

-

-	/**

-	 * Gets the reconcile command.

-	 *

-	 * @param diagram

-	 *            the diagram

-	 * @return the reconcile command

-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler#getReconcileCommand(org.eclipse.gmf.runtime.notation.Diagram)

-	 */

-	@Override

-	public ICommand getReconcileCommand(Diagram diagram) {

-		return new InsertFloatingLabelFromMapCommand(diagram, getFloatingLabelMap());

-	}

-

-	/**

-	 * Gets the floating label map to add.

-	 *

-	 * @return the floating label map

-	 */

-	private Map<String, String> getFloatingLabelMap() {

-		Map<String, String> map = new HashMap<String, String>();

-		map.put(ActorEditPartTN_VISUAL_ID, ActorFloatingLabelEditPartTN_VISUAL_ID);

-		map.put(ActorInComponentEditPart_VISUAL_ID, ActorInComponentFloatingLabelEditPart_VISUAL_ID);

-		map.put(ActorInPackageEditPart_VISUAL_ID, ActorInPackageFloatingLabelEditPart_VISUAL_ID);

-		map.put(ComponentInPackageEditPart_VISUAL_ID, ComponentInPackageFloatingLabelEditPart_VISUAL_ID);

-		map.put(SubjectClassifierEditPartTN_VISUAL_ID, SubjectClassifierFloatingLabelEditPartTN_VISUAL_ID);

-		map.put(UseCaseEditPartTN_VISUAL_ID, UseCaseFloatingLabelEditPartTN_VISUAL_ID);

-		map.put(UseCaseInComponentEditPart_VISUAL_ID, UseCaseInComponentFloatingLabelEditPart_VISUAL_ID);

-		map.put(UseCaseInPackageEditPart_VISUAL_ID, UseCaseInPackageFloatingLabelEditPart_VISUAL_ID);

-

-		return map;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.usecase.custom.migration;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.infra.gmfdiag.common.commands.InsertFloatingLabelFromMapCommand;
+import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler;
+
+/**
+ * UseCase Diagram Reconciler from 1.0.0 to 1.1.0
+ */
+public class UseCaseReconciler_1_1_0 extends DiagramReconciler {
+
+	private final static String ActorEditPartTN_VISUAL_ID = "2011";
+	private final static String ActorFloatingLabelEditPartTN_VISUAL_ID = "6048";
+	private final static String ActorInComponentEditPart_VISUAL_ID = "3018";
+	private final static String ActorInComponentFloatingLabelEditPart_VISUAL_ID = "6050";
+	private final static String ActorInPackageEditPart_VISUAL_ID = "3011";
+	private final static String ActorInPackageFloatingLabelEditPart_VISUAL_ID = "6049";
+	private final static String ComponentInPackageEditPart_VISUAL_ID = "3013";
+	private final static String ComponentInPackageFloatingLabelEditPart_VISUAL_ID = "6051";
+	private final static String SubjectClassifierEditPartTN_VISUAL_ID = "2015";
+	private final static String SubjectClassifierFloatingLabelEditPartTN_VISUAL_ID = "6047";
+	private final static String UseCaseEditPartTN_VISUAL_ID = "2013";
+	private final static String UseCaseFloatingLabelEditPartTN_VISUAL_ID = "6038";
+	private final static String UseCaseInComponentEditPart_VISUAL_ID = "3009";
+	private final static String UseCaseInComponentFloatingLabelEditPart_VISUAL_ID = "6045";
+	private final static String UseCaseInPackageEditPart_VISUAL_ID = "3012";
+	private final static String UseCaseInPackageFloatingLabelEditPart_VISUAL_ID = "6046";
+
+	/**
+	 * Gets the reconcile command.
+	 *
+	 * @param diagram
+	 *            the diagram
+	 * @return the reconcile command
+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler#getReconcileCommand(org.eclipse.gmf.runtime.notation.Diagram)
+	 */
+	@Override
+	public ICommand getReconcileCommand(Diagram diagram) {
+		return new InsertFloatingLabelFromMapCommand(diagram, getFloatingLabelMap());
+	}
+
+	/**
+	 * Gets the floating label map to add.
+	 *
+	 * @return the floating label map
+	 */
+	private Map<String, String> getFloatingLabelMap() {
+		Map<String, String> map = new HashMap<String, String>();
+		map.put(ActorEditPartTN_VISUAL_ID, ActorFloatingLabelEditPartTN_VISUAL_ID);
+		map.put(ActorInComponentEditPart_VISUAL_ID, ActorInComponentFloatingLabelEditPart_VISUAL_ID);
+		map.put(ActorInPackageEditPart_VISUAL_ID, ActorInPackageFloatingLabelEditPart_VISUAL_ID);
+		map.put(ComponentInPackageEditPart_VISUAL_ID, ComponentInPackageFloatingLabelEditPart_VISUAL_ID);
+		map.put(SubjectClassifierEditPartTN_VISUAL_ID, SubjectClassifierFloatingLabelEditPartTN_VISUAL_ID);
+		map.put(UseCaseEditPartTN_VISUAL_ID, UseCaseFloatingLabelEditPartTN_VISUAL_ID);
+		map.put(UseCaseInComponentEditPart_VISUAL_ID, UseCaseInComponentFloatingLabelEditPart_VISUAL_ID);
+		map.put(UseCaseInPackageEditPart_VISUAL_ID, UseCaseInPackageFloatingLabelEditPart_VISUAL_ID);
+
+		return map;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.configuration b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.configuration
deleted file mode 100644
index 4cbb4a6544e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.configuration
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<configuration:PapyrusConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmi:id="_ko07IErbEeSdQKzSRatBjg">

-  <viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="_xogdoErbEeSdQKzSRatBjg" name="Default Papyrus Viewpoint">

-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_yeY0sHDvEeWh-MssWmCB_A" implementationID="UseCase" customStyle="platform:/plugin/org.eclipse.papyrus.uml.diagram.usecase/models/usecase.css">

-      <modelRules xmi:id="_yeY0sXDvEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </modelRules>

-      <modelRules xmi:id="_yeY0snDvEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-      </modelRules>

-      <owningRules xmi:id="_yeY0s3DvEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </owningRules>

-      <owningRules xmi:id="_yeY0tHDvEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-      </owningRules>

-      <categories href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb4txhEeOqHvRyiN87hA"/>

-      <childRules xmi:id="_yeY0tXDvEeWh-MssWmCB_A"/>

-    </modelKinds>

-  </viewpoints>

-  <defaultStakeholder href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmkdxhEeOqHvRyiN87hA"/>

-  <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>

-</configuration:PapyrusConfiguration>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.xml
index 43559c557ae..74bc8a9e953 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.xml
@@ -15,14 +15,6 @@
    
 -->
 <plugin>
-   <extension
-         point="org.eclipse.papyrus.infra.viewpoints.policy.custom">
-      <contribution
-            file="models/usecaseDiagram.configuration"
-            original="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration">
-      </contribution>
-   </extension>
-   
    <extension point="org.eclipse.ui.contexts" id="ui-context">
 				      <?gmfgen generated="true"?>
 				      <context
@@ -972,21 +964,21 @@
       point="org.eclipse.papyrus.infra.gmfdiag.common.diagramReconciler">
    <diagramReconciler
          diagramType="UseCase"
-         reconcilerClass="org.eclipse.papyrus.uml.diagram.usecase.custom.migration.UseCaseReconciler"
-         source="undefined"
-         target="1.1.0">
+         reconcilerClass="org.eclipse.papyrus.uml.diagram.usecase.custom.migration.UseCaseReconciler_1_1_0"
+         source="1.0.0"
+         target="1.3.0">
    </diagramReconciler>
    <diagramReconciler
          diagramType="UseCase"
-         reconcilerClass="org.eclipse.papyrus.uml.diagram.usecase.custom.migration.UseCaseReconcilerForCompartment"
-         source="undefined"
-         target="1.2.0">
+         reconcilerClass="org.eclipse.papyrus.uml.diagram.usecase.custom.migration.UseCaseReconcilerForCompartment_1_2_0"
+         source="1.1.0"
+         target="1.3.0">
    </diagramReconciler>
    <diagramReconciler
          diagramType="UseCase"
          reconcilerClass="org.eclipse.papyrus.uml.diagram.usecase.custom.migration.UseCaseReconciler_1_2_0"
          source="1.1.0"
-         target="1.2.0">
+         target="1.3.0">
    </diagramReconciler>
 </extension>
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/.classpath b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/.classpath
index 8a8f1668cdc..eca7bdba8f0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/.classpath
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/.classpath
@@ -1,7 +1,7 @@
-<?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/JavaSE-1.6"/>

-	<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/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/.settings/org.eclipse.jdt.core.prefs
index 09308dbc127..43d10874e2c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/.settings/org.eclipse.jdt.core.prefs
@@ -1,295 +1,295 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6

-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.compliance=1.6

-org.eclipse.jdt.core.compiler.debug.lineNumber=generate

-org.eclipse.jdt.core.compiler.debug.localVariable=generate

-org.eclipse.jdt.core.compiler.debug.sourceFile=generate

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.6

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF
index 108992885c6..ff222ac5588 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF
@@ -1,6 +1,5 @@
 Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.uml.diagram.wizards,
- org.eclipse.papyrus.uml.diagram.wizards.category,
  org.eclipse.papyrus.uml.diagram.wizards.command,
  org.eclipse.papyrus.uml.diagram.wizards.kind,
  org.eclipse.papyrus.uml.diagram.wizards.messages,
@@ -18,7 +17,9 @@ Require-Bundle: org.eclipse.m2m.qvt.oml;bundle-version="[3.6.0,4.0.0)";visibilit
  org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.help;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)"
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.core.architecture;bundle-version="0.1.0",
+ org.eclipse.papyrus.infra.ui.architecture;bundle-version="[1.0.0,2.0.0)"
 Bundle-Vendor: %pluginProvider
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 3.0.0.qualifier
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/category/DiagramCategoryDescriptor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/category/DiagramCategoryDescriptor.java
deleted file mode 100644
index 7a1c1011211..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/category/DiagramCategoryDescriptor.java
+++ /dev/null
@@ -1,179 +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:

- *  Tatiana Fesenko (CEA LIST) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.wizards.category;

-

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.papyrus.infra.core.editor.BackboneException;

-import org.eclipse.papyrus.infra.ui.extension.commands.IModelCreationCommand;

-

-/**

- * The Class DiagramCategoryDescriptor.

- */

-public class DiagramCategoryDescriptor {

-

-	/** The my id. */

-	private String myId;

-

-	/** The my label. */

-	private String myLabel;

-

-	/** The my description. */

-	private String myDescription;

-

-	/** The my file extension. */

-	private String myFileExtension;

-

-	/** The my icon. */

-	private ImageDescriptor myIcon;

-

-	/** The instance. */

-	private IModelCreationCommand instance;

-

-	/** The my creation command class. */

-	protected Class<? extends IModelCreationCommand> myCreationCommandClass;

-

-	/**

-	 * Instantiates a new diagram category descriptor.

-	 *

-	 * @param id

-	 *            the id

-	 * @param label

-	 *            the label

-	 * @param creationCommandClass

-	 *            the creation command class

-	 */

-	public DiagramCategoryDescriptor(String id, String label, Class<? extends IModelCreationCommand> creationCommandClass) {

-		myId = id;

-		myLabel = label;

-		myCreationCommandClass = creationCommandClass;

-	}

-

-	/**

-	 * Gets the id.

-	 *

-	 * @return the id

-	 */

-	public String getId() {

-		return myId;

-	}

-

-	/**

-	 * Gets the label.

-	 *

-	 * @return the label

-	 */

-	public String getLabel() {

-		return myLabel;

-	}

-

-	/**

-	 * constructor.

-	 *

-	 * @return the creation command

-	 * @throws BackboneException

-	 *             the backbone exception

-	 */

-	public IModelCreationCommand getCommand() throws BackboneException {

-		if (instance == null) {

-			instance = createCommand();

-		}

-

-		return instance;

-	}

-

-	/**

-	 * Creates the command.

-	 *

-	 * @return the i model creation command

-	 * @throws BackboneException

-	 *             the backbone exception

-	 */

-	private IModelCreationCommand createCommand() throws BackboneException {

-		try {

-			IModelCreationCommand command = myCreationCommandClass.newInstance();

-			return command;

-		} catch (SecurityException e) {

-			// Lets propagate. This is an implementation problem that should be solved by

-			// programmer.

-			throw new RuntimeException(e);

-		} catch (InstantiationException e) {

-			// Lets propagate. This is an implementation problem that should be solved by

-			// programmer.

-			throw new RuntimeException(e);

-		} catch (IllegalAccessException e) {

-			// Lets propagate. This is an implementation problem that should be solved by

-			// programmer.

-			throw new RuntimeException(e);

-		}

-	}

-

-	/**

-	 * Gets the description.

-	 *

-	 * @return the description

-	 */

-	public String getDescription() {

-		return myDescription;

-	}

-

-	/**

-	 * Gets the icon.

-	 *

-	 * @return the icon

-	 */

-	public ImageDescriptor getIcon() {

-		return myIcon;

-	}

-

-	/**

-	 * Gets the file extension.

-	 *

-	 * @return the file extension

-	 */

-	public String getExtensionPrefix() {

-		return myFileExtension;

-	}

-

-	/**

-	 * Sets the description.

-	 *

-	 * @param description

-	 *            the new description

-	 */

-	public void setDescription(String description) {

-		myDescription = description;

-	}

-

-	/**

-	 * Sets the icon.

-	 *

-	 * @param icon

-	 *            the new icon

-	 */

-	public void setIcon(ImageDescriptor icon) {

-		myIcon = icon;

-	}

-

-	/**

-	 * Sets the file extension.

-	 *

-	 * @param fileExtension

-	 *            the new file extension

-	 */

-	public void setExtensionPrefix(String fileExtension) {

-		myFileExtension = fileExtension;

-	}

-

-

-}
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/category/DiagramCategoryRegistry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/category/DiagramCategoryRegistry.java
deleted file mode 100644
index 328b9a63447..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/category/DiagramCategoryRegistry.java
+++ /dev/null
@@ -1,156 +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:

- *  Tatiana Fesenko (CEA LIST) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.wizards.category;

-

-import static org.eclipse.papyrus.uml.diagram.wizards.Activator.log;

-

-import java.util.ArrayList;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.IExtension;

-import org.eclipse.core.runtime.IExtensionPoint;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.papyrus.infra.core.extension.BadClassNameException;

-import org.eclipse.papyrus.infra.core.extension.ExtensionUtils;

-import org.eclipse.papyrus.infra.ui.extension.commands.IModelCreationCommand;

-import org.eclipse.papyrus.uml.diagram.wizards.messages.Messages;

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-

-/**

- * The Class DiagramCategoryRegistry reads available DiagramCategories from plugin descriptors.

- */

-public class DiagramCategoryRegistry extends ExtensionUtils {

-

-	/** The Constant CATEGORY_EXTENSION_POINT_NAME. */

-	private static final String CATEGORY_EXTENSION_POINT_NAME = "org.eclipse.papyrus.infra.ui.papyrusDiagram"; //$NON-NLS-1$

-

-	/** ID of the editor extension (schema filename). */

-	public static final String CATEGORY_ELEMENT_NAME = "diagramCategory"; //$NON-NLS-1$

-

-	/** The Constant CATEGORY_ID. */

-	private static final String CATEGORY_ID = "id"; //$NON-NLS-1$

-

-	/** The Constant CATEGORY_LABEL. */

-	private static final String CATEGORY_LABEL = "label"; //$NON-NLS-1$

-

-	/** The Constant CATEGORY_DESCRIPTION. */

-	private static final String CATEGORY_DESCRIPTION = "description"; //$NON-NLS-1$

-

-	/** The Constant CATEGORY_ICON. */

-	private static final String CATEGORY_ICON = "icon"; //$NON-NLS-1$

-

-	/** The Constant CATEGORY_CLASS. */

-	private static final String CATEGORY_CLASS = "class"; //$NON-NLS-1$

-

-	/** The Constant CATEGORY_FILE_EXTENSION_PREFIX. */

-	private static final String CATEGORY_FILE_EXTENSION_PREFIX = "extensionPrefix"; //$NON-NLS-1$

-

-	/** The diagram categories. */

-	private static Map<String, DiagramCategoryDescriptor> diagramCategories;

-

-	/** The our instance. */

-	private static DiagramCategoryRegistry ourInstance;

-

-	/**

-	 * Instantiates a new diagram category registry.

-	 */

-	private DiagramCategoryRegistry() {

-	}

-

-	/**

-	 * Gets the single instance of DiagramCategoryRegistry.

-	 *

-	 * @return single instance of DiagramCategoryRegistry

-	 */

-	public static DiagramCategoryRegistry getInstance() {

-		if (ourInstance == null) {

-			ourInstance = new DiagramCategoryRegistry();

-		}

-		return ourInstance;

-	}

-

-	/**

-	 * Gets the diagram categories.

-	 *

-	 * @return the diagram categories

-	 */

-	public List<DiagramCategoryDescriptor> getDiagramCategories() {

-		if (diagramCategories == null) {

-			diagramCategories = buildDiagramCategories();

-		}

-		return new ArrayList<DiagramCategoryDescriptor>(diagramCategories.values());

-	}

-

-	/**

-	 * Gets the diagram category map.

-	 *

-	 * @return the diagram category map

-	 */

-	public Map<String, DiagramCategoryDescriptor> getDiagramCategoryMap() {

-		if (diagramCategories == null) {

-			diagramCategories = buildDiagramCategories();

-		}

-		return diagramCategories;

-	}

-

-	/**

-	 * Builds the diagram categories.

-	 *

-	 * @return the hash map

-	 */

-	public Map<String, DiagramCategoryDescriptor> buildDiagramCategories() {

-		Map<String, DiagramCategoryDescriptor> result = new HashMap<String, DiagramCategoryDescriptor>();

-

-		IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(CATEGORY_EXTENSION_POINT_NAME);

-		for (IExtension extension : extensionPoint.getExtensions()) {

-			for (IConfigurationElement confElement : extension.getConfigurationElements()) {

-				if (CATEGORY_ELEMENT_NAME.equals(confElement.getName())) {

-					DiagramCategoryDescriptor diagramCategoryDescriptor;

-					try {

-						diagramCategoryDescriptor = buildCategoryDescriptor(confElement);

-						result.put(diagramCategoryDescriptor.getId(), diagramCategoryDescriptor);

-					} catch (BadClassNameException e) {

-						log.error(Messages.DiagramCategoryRegistry_bad_class_name_of_category, e);

-					}

-				}

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * Builds the category descriptor.

-	 *

-	 * @param confElement

-	 *            the conf element

-	 * @return the diagram category descriptor

-	 * @throws BadClassNameException

-	 *             the bad class name exception

-	 */

-	protected DiagramCategoryDescriptor buildCategoryDescriptor(IConfigurationElement confElement) throws BadClassNameException {

-		Class<IModelCreationCommand> commandClazz = (Class<IModelCreationCommand>) parseClass(confElement, CATEGORY_CLASS, CATEGORY_ELEMENT_NAME);

-		DiagramCategoryDescriptor diagramCategoryDescriptor = new DiagramCategoryDescriptor(confElement.getAttribute(CATEGORY_ID), confElement.getAttribute(CATEGORY_LABEL), commandClazz);

-		diagramCategoryDescriptor.setDescription(confElement.getAttribute(CATEGORY_DESCRIPTION));

-		diagramCategoryDescriptor.setExtensionPrefix(confElement.getAttribute(CATEGORY_FILE_EXTENSION_PREFIX));

-		String iconPath = confElement.getAttribute(CATEGORY_ICON);

-		if (iconPath != null) {

-			diagramCategoryDescriptor.setIcon(AbstractUIPlugin.imageDescriptorFromPlugin(confElement.getNamespaceIdentifier(), iconPath));

-		}

-		return diagramCategoryDescriptor;

-	}

-

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/command/NewPapyrusModelCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/command/NewPapyrusModelCommand.java
index 98b4ad0a95a..36c6c0ae486 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/command/NewPapyrusModelCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/command/NewPapyrusModelCommand.java
@@ -1,51 +1,55 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tatiana Fesenko (CEA LIST) - Initial API and implementation

- *  Christian W. Damus (CEA) - Support creating models in repositories (CDO)

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.wizards.command;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-

-/**

- * The Command to create a new Papyrus Model.

- */

-public class NewPapyrusModelCommand extends RecordingCommand {

-

-	/** The my model set. */

-	private final ModelSet myModelSet;

-

-	/** The URI of the model to create. */

-	private final URI myURI;

-

-	/**

-	 * Instantiates a new new papyrus model command.

-	 *

-	 * @param modelSet

-	 *        the di resource set

-	 * @param newURI

-	 *        the URI of the new model's principal resource

-	 */

-	public NewPapyrusModelCommand(ModelSet modelSet, URI newURI) {

-		super(modelSet.getTransactionalEditingDomain());

-		myModelSet = modelSet;

-		myURI = newURI;

-	}

-

-	@Override

-	protected void doExecute() {

-		myModelSet.createModels(myURI);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tatiana Fesenko (CEA LIST) - Initial API and implementation
+ *  Christian W. Damus (CEA) - Support creating models in repositories (CDO)
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.wizards.command;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+
+/**
+ * The Command to create a new Papyrus Model.
+ */
+public class NewPapyrusModelCommand extends RecordingCommand {
+
+	/** The my model set. */
+	private final ModelSet myModelSet;
+
+	/** The URI of the model to create. */
+	private final URI myURI;
+
+	/**
+	 * Instantiates a new new papyrus model command.
+	 *
+	 * @param modelSet
+	 *        the di resource set
+	 * @param newURI
+	 *        the URI of the new model's principal resource
+	 * @param contextId
+	 *        the id of the architecture context
+	 * @param viewpointIds
+	 *        the ids of the architecture viewpoints
+	 */
+	public NewPapyrusModelCommand(ModelSet modelSet, URI newURI) {
+		super(modelSet.getTransactionalEditingDomain());
+		myModelSet = modelSet;
+		myURI = newURI;
+	}
+
+	@Override
+	protected void doExecute() {
+		myModelSet.createModels(myURI);
+	}
+
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/kind/DiagramKindContentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/kind/DiagramKindContentProvider.java
deleted file mode 100644
index af93c20da23..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/kind/DiagramKindContentProvider.java
+++ /dev/null
@@ -1,136 +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:

- *  Tatiana Fesenko (CEA LIST) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.wizards.kind;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.jface.viewers.IStructuredContentProvider;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.viewpoints.configuration.Category;

-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

-import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;

-

-/**

- * The ContentProvider for DiagramCategory table.

- * Returns available diagram kinds for the given diagram category(ies).

- */

-public class DiagramKindContentProvider implements IStructuredContentProvider {

-

-	private final Map<String, Collection<ViewPrototype>> prototypes;

-

-	/**

-	 * Instantiates a new diagram kind content provider.

-	 *

-	 */

-	public DiagramKindContentProvider() {

-		Collection<ViewPrototype> vps = PolicyChecker.getCurrent().getAllPrototypes();

-		this.prototypes = new HashMap<String, Collection<ViewPrototype>>();

-		for (ViewPrototype vp : vps) {

-			for (Category category : vp.getCategories()) {

-				cache(category.getName(), vp);

-			}

-		}

-	}

-

-	/**

-	 * Stores the given diagram prototype in the cache

-	 *

-	 * @param prototype

-	 *            The prototype to cache

-	 */

-	private void cache(String category, ViewPrototype prototype) {

-		if (!prototypes.containsKey(category)) {

-			prototypes.put(category, new ArrayList<ViewPrototype>());

-		}

-		prototypes.get(category).add(prototype);

-	}

-

-	/**

-	 * Dispose.

-	 *

-	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()

-	 */

-	public void dispose() {

-		prototypes.clear();

-	}

-

-	/**

-	 * Input changed.

-	 *

-	 * @param viewer

-	 *            the viewer

-	 * @param oldInput

-	 *            the old input

-	 * @param newInput

-	 *            the new input

-	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)

-	 */

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-	}

-

-	/**

-	 * Gets the elements.

-	 *

-	 * @param inputElement

-	 *            the input element

-	 * @return the elements

-	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)

-	 */

-	public Object[] getElements(Object inputElement) {

-		if (inputElement instanceof Object[]) {

-			List<ViewPrototype> result = new ArrayList<ViewPrototype>();

-			for (Object next : (Object[]) inputElement) {

-				if (next instanceof String) {

-					String diagramCategory = (String) next;

-					result.addAll(getPrototypes(diagramCategory));

-				}

-			}

-			Collections.sort(result, new ViewPrototype.Comp());

-			return result.toArray(new Object[result.size()]);

-		}

-		if (inputElement instanceof String) {

-			String diagramCategory = (String) inputElement;

-			List<ViewPrototype> result = getPrototypes(diagramCategory);

-			return result.toArray(new Object[result.size()]);

-		}

-		return null;

-	}

-

-	/**

-	 * Gets the creation commands.

-	 *

-	 * @param diagramCategory

-	 *            the diagram category

-	 * @return the creation commands

-	 */

-	protected List<ViewPrototype> getPrototypes(String diagramCategory) {

-		HashMap<String, ViewPrototype> result = new HashMap<String, ViewPrototype>();

-		if (prototypes.containsKey(diagramCategory)) {

-			// Look for all diagram kind of the category

-			for (ViewPrototype prototype : prototypes.get(diagramCategory)) {

-				String label = prototype.getLabel();

-				// If the diagram is not contains in the result add it

-				if (!result.containsKey(label)) {

-					result.put(label, prototype);

-				}

-			}

-		}

-		return new ArrayList<ViewPrototype>(result.values());

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/kind/DiagramKindComposite.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/kind/RepresentationKindComposite.java
index 537ba3e0d90..729c6feb436 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/kind/DiagramKindComposite.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/kind/RepresentationKindComposite.java
@@ -1,354 +1,382 @@
-/*****************************************************************************

- * Copyright (c) 2014 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:

- * Thibault Le Ouay (Sherpa Engineering) t.leouay@sherpa-eng.com  - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.wizards.kind;

-

-import java.util.ArrayList;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Map;

-import java.util.Map.Entry;

-import java.util.Set;

-

-//import org.eclipse.jface.viewers.ArrayContentProvider;

-import org.eclipse.jface.viewers.CellEditor;

-import org.eclipse.jface.viewers.CheckboxCellEditor;

-import org.eclipse.jface.viewers.ColumnLabelProvider;

-import org.eclipse.jface.viewers.EditingSupport;

-import org.eclipse.jface.viewers.IBaseLabelProvider;

-import org.eclipse.jface.viewers.ICellEditorValidator;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.TableViewer;

-import org.eclipse.jface.viewers.TableViewerColumn;

-import org.eclipse.jface.viewers.TextCellEditor;

-import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;

-import org.eclipse.papyrus.uml.diagram.wizards.messages.Messages;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Table;

-import org.eclipse.swt.widgets.TableColumn;

-

-

-public class DiagramKindComposite extends Composite {

-

-	private static final Image CHECKED = org.eclipse.papyrus.infra.widgets.Activator.getDefault().getImage("org.eclipse.papyrus.uml.diagram.wizards", "icons/checked.gif"); //$NON-NLS-1$ //$NON-NLS-2$

-

-	private static final Image UNCHECKED = org.eclipse.papyrus.infra.widgets.Activator.getDefault().getImage("org.eclipse.papyrus.uml.diagram.wizards", "icons/unchecked.gif"); //$NON-NLS-1$ //$NON-NLS-2$

-

-	private Map<ViewPrototype, String> diagramNames = new HashMap<ViewPrototype, String>();

-

-	List<String> listNames = new ArrayList<String>();

-

-

-	private Map<ViewPrototype, Integer> selectedDiagrams = new HashMap<ViewPrototype, Integer>();

-

-	public TableViewer viewer;

-

-	private GridData gridData;

-

-

-

-

-	public DiagramKindComposite(Composite parent) {

-		super(parent, SWT.NONE);

-		this.setLayout(new GridLayout());

-		this.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

-

-		createTableViewer(this);

-	}

-

-	public void createTableViewer(final Composite container) {

-

-		viewer = new TableViewer(container, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION | SWT.BORDER);

-		gridData = new GridData(SWT.FILL, SWT.FILL, true, true);

-		viewer.getTable().setLayoutData(gridData);

-

-		// viewer.setContentProvider(new ArrayContentProvider());

-		final Table table = viewer.getTable();

-		viewer.setContentProvider(new DiagramKindContentProvider());

-		table.setHeaderVisible(true);

-

-		// The check column

-		TableViewerColumn colCheckbox = createTableViewerColumn("", 20, viewer); //$NON-NLS-1$

-		colCheckbox.setLabelProvider(new ColumnLabelProvider() {

-

-			@Override

-			public String getText(Object element) {

-				return ""; //$NON-NLS-1$

-			}

-

-			@Override

-			public Image getImage(Object element) {

-				if (selectedDiagrams.containsKey(element)) {

-					return CHECKED;

-				} else {

-					return UNCHECKED;

-				}

-			}

-

-		});

-		colCheckbox.setEditingSupport(new EditingSupport(viewer) {

-

-			private CheckboxCellEditor checkboxCellEditor;

-

-			@Override

-			protected void setValue(Object element, Object value) {

-				if (checkboxCellEditor.getValue() == Boolean.TRUE) {

-					selectedDiagrams.put((ViewPrototype) element, 1);

-				} else {

-					selectedDiagrams.remove(element);

-				}

-				viewer.update(element, null);

-			}

-

-			@Override

-			protected Object getValue(Object element) {

-				return selectedDiagrams.containsKey(element);

-			}

-

-			@Override

-			protected CellEditor getCellEditor(Object element) {

-				checkboxCellEditor = new CheckboxCellEditor(container, SWT.CHECK | SWT.READ_ONLY);

-				return checkboxCellEditor;

-			}

-

-			@Override

-			protected boolean canEdit(Object element) {

-				return true;

-			}

-		});

-		// no need to enable the resize on the check box column

-		colCheckbox.getColumn().setResizable(false);

-

-

-		// The Diagram name column

-		TableViewerColumn colDiagramKind = createTableViewerColumn(Messages.DiagramKindComposite_0, 200, viewer);

-		colDiagramKind.setLabelProvider(new ColumnLabelProvider() {

-

-			@Override

-			public String getText(Object element) {

-				if (element instanceof ViewPrototype) {

-					return ((ViewPrototype) element).getLabel();

-				}

-				return ""; //$NON-NLS-1$

-			}

-

-			@Override

-			public Image getImage(Object element) {

-				if (element instanceof ViewPrototype) {

-					return ((ViewPrototype) element).getIcon();

-				}

-				return null;

-			}

-

-

-		});

-

-

-		// the name of the diagram the user can edit it to set his onw name

-		TableViewerColumn colDiagramName = createTableViewerColumn(Messages.DiagramKindComposite_2, 300, viewer);

-		colDiagramName.setEditingSupport(new EditingSupport(viewer) {

-

-			@Override

-			protected void setValue(Object element, Object value) {

-

-				diagramNames.put((ViewPrototype) element, (String) value);

-				viewer.update(element, null);

-

-			}

-

-			@Override

-			protected Object getValue(Object element) {

-

-				if (diagramNames.containsKey(element)) {

-					return diagramNames.get(element);

-				}

-				return ""; //$NON-NLS-1$

-

-			}

-

-			@Override

-			protected CellEditor getCellEditor(Object element) {

-				return new TextCellEditor(viewer.getTable());

-			}

-

-			@Override

-			protected boolean canEdit(Object element) {

-				return true;

-			}

-		});

-		colDiagramName.setLabelProvider(new ColumnLabelProvider() {

-

-			@Override

-			public String getText(Object element) {

-

-				return diagramNames.get(element);

-			}

-		});

-

-

-		// the quantity of the diagram the user would like to create

-		TableViewerColumn colDiagramQuantity = createTableViewerColumn(Messages.DiagramKindComposite_3, 70, viewer);

-		colDiagramQuantity.setEditingSupport(new EditingSupport(viewer) {

-

-			@Override

-			protected void setValue(Object element, Object value) {

-				selectedDiagrams.put((ViewPrototype) element, Integer.parseInt((String) value));

-				viewer.update(element, null);

-			}

-

-			@Override

-			protected Object getValue(Object element) {

-				if (selectedDiagrams.containsKey(element)) {

-					return selectedDiagrams.get(element).toString();

-				}

-				return "0"; //$NON-NLS-1$

-			}

-

-			@Override

-			protected CellEditor getCellEditor(Object element) {

-				TextCellEditor textCellEditor = new TextCellEditor(viewer.getTable());

-				textCellEditor.setValidator(new ICellEditorValidator() {

-

-					@Override

-					public String isValid(Object value) {

-						if (!(value instanceof Integer)) {

-							return null;

-						}

-						return value.toString();

-					}

-				});

-				return textCellEditor;

-			}

-

-			@Override

-			protected boolean canEdit(Object element) {

-				return true;

-			}

-		});

-		colDiagramQuantity.setLabelProvider(new ColumnLabelProvider() {

-

-			@Override

-			public String getText(Object element) {

-				if (selectedDiagrams.containsKey(element)) {

-					return selectedDiagrams.get(element).toString();

-				}

-				// return "0"; //$NON-NLS-1$

-				return ""; //$NON-NLS-1$

-			}

-		});

-

-

-		// TODO - The description of the diagram not yet implemented, should be implemented will generating the diagram

-		// TableViewerColumn colDiagramDescription = createTableViewerColumn("Description", 400, viewer);

-		// colDiagramDescription.setLabelProvider(new ColumnLabelProvider() {

-		//

-		// @Override

-		// public String getText(Object element) {

-		// return null;

-		// }

-		//

-		// });

-		viewer.addSelectionChangedListener(new ISelectionChangedListener() {

-

-			@Override

-			public void selectionChanged(SelectionChangedEvent event) {

-				// if(selectedConfigs.size() > 0) {

-				// setPageComplete(true);

-				// } else {

-				// setPageComplete(false);

-				// }

-			}

-		});

-

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param title

-	 * @param bound

-	 * @param viewer

-	 * @return

-	 */

-	private TableViewerColumn createTableViewerColumn(String title, int bound, TableViewer viewer) {

-		final TableViewerColumn viewerColumn = new TableViewerColumn(viewer, SWT.NONE);

-		final TableColumn column = viewerColumn.getColumn();

-		column.setText(title);

-		column.setWidth(bound);

-		column.setResizable(true);

-		column.setMoveable(false);

-		return viewerColumn;

-	}

-

-

-	/**

-	 * Creates the diagram kind label provider.

-	 *

-	 * @return the i base label provider

-	 */

-	protected IBaseLabelProvider createDiagramKindLabelProvider() {

-		return new DiagramKindLabelProvider();

-	}

-

-

-	public void setInput(Object input) {

-		viewer.setInput(input);

-

-		// Resize the diagram table to minimize the space lost

-		int tableItemHeight = viewer.getTable().getItemHeight();

-		int tableItemCount = ((DiagramKindContentProvider) viewer.getContentProvider()).getElements(input).length;

-		gridData.minimumHeight = tableItemHeight * Math.max(3, Math.round((tableItemCount / 2)));

-		gridData.heightHint = tableItemHeight * Math.max(3, Math.round((tableItemCount / 2)));

-

-		// Notifies the shell that the layout needs to be resized

-		((Composite) viewer.getControl()).layout(true, true);

-	}

-

-	public ArrayList<ViewPrototype> getCheckElement() {

-		ArrayList<ViewPrototype> list = new ArrayList<ViewPrototype>();

-		Set<Entry<ViewPrototype, Integer>> set = selectedDiagrams.entrySet();

-		Iterator<Entry<ViewPrototype, Integer>> ite = set.iterator();

-		while (ite.hasNext()) {

-			Entry<ViewPrototype, Integer> me = ite.next();

-			int nb = me.getValue();

-			String tempname = diagramNames.get(me.getKey());

-			// If the name field was not filled

-			if (tempname == null || tempname.equalsIgnoreCase("")) {

-				tempname = me.getKey().getLabel();

-			}

-

-			for (int i = 0; i < nb; i++) {

-				list.add(me.getKey());

-				if (nb > 1) {

-					listNames.add(tempname + "_" + i); //$NON-NLS-1$

-				} else {

-					listNames.add(tempname);

-				}

-			}

-		}

-		return list;

-	}

-

-

-	/**

-	 * @return

-	 */

-	public List<String> getDiagramName() {

-		return listNames;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 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:
+ * Thibault Le Ouay (Sherpa Engineering) t.leouay@sherpa-eng.com  - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.wizards.kind;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ImageRegistry;
+//import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.CellEditor;
+import org.eclipse.jface.viewers.CheckboxCellEditor;
+import org.eclipse.jface.viewers.ColumnLabelProvider;
+import org.eclipse.jface.viewers.EditingSupport;
+import org.eclipse.jface.viewers.IBaseLabelProvider;
+import org.eclipse.jface.viewers.ICellEditorValidator;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.jface.viewers.TextCellEditor;
+import org.eclipse.papyrus.infra.core.architecture.RepresentationKind;
+import org.eclipse.papyrus.uml.diagram.wizards.Activator;
+import org.eclipse.papyrus.uml.diagram.wizards.messages.Messages;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+
+
+public class RepresentationKindComposite extends Composite {
+
+	private static final Image CHECKED = org.eclipse.papyrus.infra.widgets.Activator.getDefault().getImage("org.eclipse.papyrus.uml.diagram.wizards", "icons/checked.gif"); //$NON-NLS-1$ //$NON-NLS-2$
+
+	private static final Image UNCHECKED = org.eclipse.papyrus.infra.widgets.Activator.getDefault().getImage("org.eclipse.papyrus.uml.diagram.wizards", "icons/unchecked.gif"); //$NON-NLS-1$ //$NON-NLS-2$
+
+	private Map<RepresentationKind, String> representationNames = new HashMap<RepresentationKind, String>();
+
+	List<String> listNames = new ArrayList<String>();
+
+
+	private Map<RepresentationKind, Integer> selectedRepresentations = new HashMap<RepresentationKind, Integer>();
+
+	public TableViewer viewer;
+
+	private GridData gridData;
+
+	private ImageRegistry imageRegistry;
+
+
+	public RepresentationKindComposite(Composite parent) {
+		super(parent, SWT.NONE);
+		this.setLayout(new GridLayout());
+		this.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+		createTableViewer(this);
+		imageRegistry = new ImageRegistry();
+	}
+
+	public void createTableViewer(final Composite container) {
+
+		viewer = new TableViewer(container, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION | SWT.BORDER);
+		gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
+		viewer.getTable().setLayoutData(gridData);
+
+		// viewer.setContentProvider(new ArrayContentProvider());
+		final Table table = viewer.getTable();
+		viewer.setContentProvider(new RepresentationKindContentProvider());
+		table.setHeaderVisible(true);
+
+		// The check column
+		TableViewerColumn colCheckbox = createTableViewerColumn("", 20, viewer); //$NON-NLS-1$
+		colCheckbox.setLabelProvider(new ColumnLabelProvider() {
+
+			@Override
+			public String getText(Object element) {
+				return ""; //$NON-NLS-1$
+			}
+
+			@Override
+			public Image getImage(Object element) {
+				if (selectedRepresentations.containsKey(element)) {
+					return CHECKED;
+				} else {
+					return UNCHECKED;
+				}
+			}
+
+		});
+		colCheckbox.setEditingSupport(new EditingSupport(viewer) {
+
+			private CheckboxCellEditor checkboxCellEditor;
+
+			@Override
+			protected void setValue(Object element, Object value) {
+				if (checkboxCellEditor.getValue() == Boolean.TRUE) {
+					selectedRepresentations.put((RepresentationKind) element, 1);
+				} else {
+					selectedRepresentations.remove(element);
+				}
+				viewer.update(element, null);
+			}
+
+			@Override
+			protected Object getValue(Object element) {
+				return selectedRepresentations.containsKey(element);
+			}
+
+			@Override
+			protected CellEditor getCellEditor(Object element) {
+				checkboxCellEditor = new CheckboxCellEditor(container, SWT.CHECK | SWT.READ_ONLY);
+				return checkboxCellEditor;
+			}
+
+			@Override
+			protected boolean canEdit(Object element) {
+				return true;
+			}
+		});
+		// no need to enable the resize on the check box column
+		colCheckbox.getColumn().setResizable(false);
+
+
+		// The Diagram name column
+		TableViewerColumn colDiagramKind = createTableViewerColumn(Messages.RepresentationKindComposite_0, 200, viewer);
+		colDiagramKind.setLabelProvider(new ColumnLabelProvider() {
+
+			@Override
+			public String getText(Object element) {
+				if (element instanceof RepresentationKind) {
+					return ((RepresentationKind) element).getName();
+				}
+				return ""; //$NON-NLS-1$
+			}
+
+			@Override
+			public Image getImage(Object element) {
+				if (element instanceof RepresentationKind) {
+					return getIcon((RepresentationKind) element);
+				}
+				return null;
+			}
+
+
+		});
+
+
+		// the name of the diagram the user can edit it to set his onw name
+		TableViewerColumn colDiagramName = createTableViewerColumn(Messages.RepresentationKindComposite_2, 300, viewer);
+		colDiagramName.setEditingSupport(new EditingSupport(viewer) {
+
+			@Override
+			protected void setValue(Object element, Object value) {
+
+				representationNames.put((RepresentationKind) element, (String) value);
+				viewer.update(element, null);
+
+			}
+
+			@Override
+			protected Object getValue(Object element) {
+
+				if (representationNames.containsKey(element)) {
+					return representationNames.get(element);
+				}
+				return ""; //$NON-NLS-1$
+
+			}
+
+			@Override
+			protected CellEditor getCellEditor(Object element) {
+				return new TextCellEditor(viewer.getTable());
+			}
+
+			@Override
+			protected boolean canEdit(Object element) {
+				return true;
+			}
+		});
+		colDiagramName.setLabelProvider(new ColumnLabelProvider() {
+
+			@Override
+			public String getText(Object element) {
+
+				return representationNames.get(element);
+			}
+		});
+
+
+		// the quantity of the diagram the user would like to create
+		TableViewerColumn colDiagramQuantity = createTableViewerColumn(Messages.RepresentationKindComposite_3, 70, viewer);
+		colDiagramQuantity.setEditingSupport(new EditingSupport(viewer) {
+
+			@Override
+			protected void setValue(Object element, Object value) {
+				selectedRepresentations.put((RepresentationKind) element, Integer.parseInt((String) value));
+				viewer.update(element, null);
+			}
+
+			@Override
+			protected Object getValue(Object element) {
+				if (selectedRepresentations.containsKey(element)) {
+					return selectedRepresentations.get(element).toString();
+				}
+				return "0"; //$NON-NLS-1$
+			}
+
+			@Override
+			protected CellEditor getCellEditor(Object element) {
+				TextCellEditor textCellEditor = new TextCellEditor(viewer.getTable());
+				textCellEditor.setValidator(new ICellEditorValidator() {
+
+					@Override
+					public String isValid(Object value) {
+						if (!(value instanceof Integer)) {
+							return null;
+						}
+						return value.toString();
+					}
+				});
+				return textCellEditor;
+			}
+
+			@Override
+			protected boolean canEdit(Object element) {
+				return true;
+			}
+		});
+		colDiagramQuantity.setLabelProvider(new ColumnLabelProvider() {
+
+			@Override
+			public String getText(Object element) {
+				if (selectedRepresentations.containsKey(element)) {
+					return selectedRepresentations.get(element).toString();
+				}
+				// return "0"; //$NON-NLS-1$
+				return ""; //$NON-NLS-1$
+			}
+		});
+
+
+		// TODO - The description of the diagram not yet implemented, should be implemented will generating the diagram
+		// TableViewerColumn colDiagramDescription = createTableViewerColumn("Description", 400, viewer);
+		// colDiagramDescription.setLabelProvider(new ColumnLabelProvider() {
+		//
+		// @Override
+		// public String getText(Object element) {
+		// return null;
+		// }
+		//
+		// });
+		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
+
+			@Override
+			public void selectionChanged(SelectionChangedEvent event) {
+				// if(selectedConfigs.size() > 0) {
+				// setPageComplete(true);
+				// } else {
+				// setPageComplete(false);
+				// }
+			}
+		});
+
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param title
+	 * @param bound
+	 * @param viewer
+	 * @return
+	 */
+	private TableViewerColumn createTableViewerColumn(String title, int bound, TableViewer viewer) {
+		final TableViewerColumn viewerColumn = new TableViewerColumn(viewer, SWT.NONE);
+		final TableColumn column = viewerColumn.getColumn();
+		column.setText(title);
+		column.setWidth(bound);
+		column.setResizable(true);
+		column.setMoveable(false);
+		return viewerColumn;
+	}
+
+
+	/**
+	 * Creates the diagram kind label provider.
+	 *
+	 * @return the i base label provider
+	 */
+	protected IBaseLabelProvider createDiagramKindLabelProvider() {
+		return new DiagramKindLabelProvider();
+	}
+
+
+	public void setInput(Object input) {
+		viewer.setInput(input);
+
+		// Resize the diagram table to minimize the space lost
+		int tableItemHeight = viewer.getTable().getItemHeight();
+		int tableItemCount = ((RepresentationKindContentProvider) viewer.getContentProvider()).getElements(input).length;
+		gridData.minimumHeight = tableItemHeight * Math.max(3, Math.round((tableItemCount / 2)));
+		gridData.heightHint = tableItemHeight * Math.max(3, Math.round((tableItemCount / 2)));
+
+		// Notifies the shell that the layout needs to be resized
+		((Composite) viewer.getControl()).layout(true, true);
+	}
+
+	public ArrayList<RepresentationKind> getCheckElement() {
+		ArrayList<RepresentationKind> list = new ArrayList<RepresentationKind>();
+		Set<Entry<RepresentationKind, Integer>> set = selectedRepresentations.entrySet();
+		Iterator<Entry<RepresentationKind, Integer>> ite = set.iterator();
+		while (ite.hasNext()) {
+			Entry<RepresentationKind, Integer> me = ite.next();
+			int nb = me.getValue();
+			String tempname = representationNames.get(me.getKey());
+			// If the name field was not filled
+			if (tempname == null || tempname.equalsIgnoreCase("")) {
+				tempname = me.getKey().getName();
+			}
+
+			for (int i = 0; i < nb; i++) {
+				list.add(me.getKey());
+				if (nb > 1) {
+					listNames.add(tempname + "_" + i); //$NON-NLS-1$
+				} else {
+					listNames.add(tempname);
+				}
+			}
+		}
+		return list;
+	}
+
+
+	/**
+	 * @return
+	 */
+	public List<String> getDiagramName() {
+		return listNames;
+	}
+
+	private Image getIcon(final RepresentationKind kind) {
+		Image image = imageRegistry.get(kind.getIcon());
+		if (image == null) {
+			String uri = kind.getIcon();
+			if (uri != null) {
+				try {
+					ImageDescriptor descriptor = ImageDescriptor.createFromURL(new URL(uri));
+					imageRegistry.put(kind.getIcon(), descriptor);
+					image = imageRegistry.get(kind.getIcon());
+				} catch (MalformedURLException e) {
+					Activator.log.error(e);
+				}
+			}
+		}
+		return image;
+	}
+
+	@Override
+	public void dispose() {
+		super.dispose();
+		imageRegistry.dispose();
+	}
+	
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/kind/RepresentationKindContentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/kind/RepresentationKindContentProvider.java
new file mode 100644
index 00000000000..9771247f34e
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/kind/RepresentationKindContentProvider.java
@@ -0,0 +1,82 @@
+/*****************************************************************************
+ * 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:
+ *  Tatiana Fesenko (CEA LIST) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.wizards.kind;
+
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.core.architecture.RepresentationKind;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureViewpoint;
+import org.eclipse.papyrus.infra.architecture.ArchitectureDomainManager;
+
+/**
+ * The ContentProvider for DiagramCategory table.
+ * Returns available diagram kinds for the given diagram category(ies).
+ */
+public class RepresentationKindContentProvider implements IStructuredContentProvider {
+
+	/**
+	 * Input changed.
+	 *
+	 * @param viewer
+	 *            the viewer
+	 * @param oldInput
+	 *            the old input
+	 * @param newInput
+	 *            the new input
+	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
+	 */
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+	}
+
+	/**
+	 * Gets the elements.
+	 *
+	 * @param inputElement
+	 *            the input element
+	 * @return the elements
+	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
+	 */
+	public Object[] getElements(Object inputElement) {
+		ArchitectureDomainManager manager = ArchitectureDomainManager.getInstance();
+		if (inputElement instanceof Object[]) {
+			Set<RepresentationKind> result = new TreeSet<RepresentationKind>(new Comparator<RepresentationKind>() {
+				@Override
+				public int compare(RepresentationKind o1, RepresentationKind o2) {
+					return o1.getName().compareTo(o2.getName());
+				}
+			});
+			for (Object next : (Object[]) inputElement) {
+				if (next instanceof String) {
+					String viewpointId = (String) next;
+					MergedArchitectureViewpoint viewpoint = manager.getArchitectureViewpointById(viewpointId);
+					result.addAll(viewpoint.getRepresentationKinds());
+				}
+			}
+			return result.toArray(new Object[result.size()]);
+		}
+		if (inputElement instanceof String) {
+			String viewpointId = (String) inputElement;
+			MergedArchitectureViewpoint viewpoint = manager.getArchitectureViewpointById(viewpointId);
+			Collection<RepresentationKind> result = viewpoint.getRepresentationKinds();
+			return result.toArray(new Object[result.size()]);
+		}
+		return null;
+	}
+
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/messages/Messages.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/messages/Messages.java
index e6286d0e35a..08c380636be 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/messages/Messages.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/messages/Messages.java
@@ -60,11 +60,11 @@ public class Messages extends NLS {
 	public static String DiagramCategoryRegistry_bad_class_name_of_category;
 
 
-	public static String DiagramKindComposite_0;
+	public static String RepresentationKindComposite_0;
 
-	public static String DiagramKindComposite_2;
+	public static String RepresentationKindComposite_2;
 
-	public static String DiagramKindComposite_3;
+	public static String RepresentationKindComposite_3;
 
 	/** The Diagram kind label provider_undefined_element. */
 	public static String DiagramKindLabelProvider_undefined_element;
@@ -97,52 +97,47 @@ public class Messages extends NLS {
 
 
 	/** The Select diagram category page_cannot_find_category. */
-	public static String SelectDiagramCategoryPage_cannot_find_category;
+	public static String SelectArchitectureContextPage_cannot_find_category;
 
 	/** The Select diagram category page_diagram_language_group. */
-	public static String SelectDiagramCategoryPage_diagram_language_group;
+	public static String SelectArchitectureContextPage_diagram_language_group;
 
 	/** The Select diagram category page_select_language. */
-	public static String SelectDiagramCategoryPage_select_language;
+	public static String SelectArchitectureContextPage_select_language;
 
 	/** The Select diagram category page_select_one_category. */
-	public static String SelectDiagramCategoryPage_select_one_category;
+	public static String SelectArchitectureContextPage_select_one_category;
 
-	public static String SelectDiagramCategoryPage_umlGroup;
-
-	public static String SelectDiagramCategoryPage_dsmlGroup;
-
-
-	public static String SelectDiagramKindPage_0;
+	public static String SelectRepresentationKindPage_0;
 
 	/** The Select diagram kind page_default_diagram_name. */
-	public static String SelectDiagramKindPage_default_diagram_name;
+	public static String SelectRepresentationKindPage_default_diagram_name;
 
 	/** The Select diagram kind page_diagram_name_group. */
-	public static String SelectDiagramKindPage_diagram_name_group;
+	public static String SelectRepresentationKindPage_diagram_name_group;
 
 	/** The Select diagram kind page_diagram_name_is_empty. */
-	public static String SelectDiagramKindPage_diagram_name_is_empty;
+	public static String SelectRepresentationKindPage_diagram_name_is_empty;
 
 	/** The Select diagram kind page_load_template_group. */
-	public static String SelectDiagramKindPage_load_template_group;
+	public static String SelectRepresentationKindPage_load_template_group;
 
 	/** The Select diagram kind page_page_desc. */
-	public static String SelectDiagramKindPage_page_desc;
+	public static String SelectRepresentationKindPage_page_desc;
 
 	/** The Select diagram kind page_page_title. */
-	public static String SelectDiagramKindPage_page_title;
+	public static String SelectRepresentationKindPage_page_title;
 
 	/** The Select diagram kind page_remember_current_selection_text. */
-	public static String SelectDiagramKindPage_remember_current_selection_text;
+	public static String SelectRepresentationKindPage_remember_current_selection_text;
 
 	/** The Select diagram kind page_remember_current_selection_tooltip. */
-	public static String SelectDiagramKindPage_remember_current_selection_tooltip;
+	public static String SelectRepresentationKindPage_remember_current_selection_tooltip;
 
 	/** The Select diagram kind page_select_kind_group. */
-	public static String SelectDiagramKindPage_select_kind_group;
+	public static String SelectRepresentationKindPage_select_kind_group;
 
-	public static String SelectDiagramKindPage_Set_Root_Name_Error;
+	public static String SelectRepresentationKindPage_Set_Root_Name_Error;
 
 
 	public static String ProfileChooserComposite_RegisteredProfilesDialog;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/messages/messages.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/messages/messages.properties
index ac436090969..6b98d0f0153 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/messages/messages.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/messages/messages.properties
@@ -30,9 +30,9 @@ PapyrusProjectCreationPage_page_null_name_desc=The project's name is undefined,
 
 DiagramCategoryRegistry_bad_class_name_of_category=Could not find implementation for a diagram category
 
-DiagramKindComposite_0=Diagram name
-DiagramKindComposite_2=Name
-DiagramKindComposite_3=Quantity
+RepresentationKindComposite_0=Representation name
+RepresentationKindComposite_2=Name
+RepresentationKindComposite_3=Quantity
 DiagramKindLabelProvider_undefined_element=<undefined>
 FileChooser_0=Browse workspace
 
@@ -46,25 +46,23 @@ NewModelFilePage_page_desc=Create a new {0} model
 NewModelFilePage_page_same_case_desc=There already is a model with this name: 
 NewModelFilePage_set_a_container=Please select a valid container for the new model
 
-SelectDiagramCategoryPage_cannot_find_category=Could not find DiagramCategory for {0}
-SelectDiagramCategoryPage_diagram_language_group=Diagram Language: 
-SelectDiagramCategoryPage_select_language=Select the language of the new diagrams
-SelectDiagramCategoryPage_select_one_category=Please select at least one category
-SelectDiagramCategoryPage_umlGroup=UML core: 
-SelectDiagramCategoryPage_dsmlGroup=DSML: 
+SelectArchitectureContextPage_cannot_find_category=Could not find Architecture Context for {0}
+SelectArchitectureContextPage_diagram_language_group=Architecture Context: 
+SelectArchitectureContextPage_select_language=Select the context of the new representations
+SelectArchitectureContextPage_select_one_category=Please select at least one context
 
 
-SelectDiagramKindPage_0=Choose a profile to apply
-SelectDiagramKindPage_default_diagram_name=RootElement
-SelectDiagramKindPage_diagram_name_group=Root model element name: 
-SelectDiagramKindPage_diagram_name_is_empty=The diagram name should not be empty.
-SelectDiagramKindPage_load_template_group=You can load a template: 
-SelectDiagramKindPage_page_desc=Select root element name and diagram kind 
-SelectDiagramKindPage_page_title=Initialization information
-SelectDiagramKindPage_remember_current_selection_text=Remember current selection
-SelectDiagramKindPage_remember_current_selection_tooltip=The current selection will be used when you open the wizard next time
-SelectDiagramKindPage_select_kind_group=Select a Diagram Kind: 
-SelectDiagramKindPage_Set_Root_Name_Error=The Root model element name cannot be deduced from the current workspace selection
+SelectRepresentationKindPage_0=Choose a profile to apply
+SelectRepresentationKindPage_default_diagram_name=RootElement
+SelectRepresentationKindPage_diagram_name_group=Root model element name: 
+SelectRepresentationKindPage_diagram_name_is_empty=The representation name should not be empty.
+SelectRepresentationKindPage_load_template_group=You can load a template: 
+SelectRepresentationKindPage_page_desc=Select root element name and representation kind 
+SelectRepresentationKindPage_page_title=Initialization information
+SelectRepresentationKindPage_remember_current_selection_text=Remember current selection
+SelectRepresentationKindPage_remember_current_selection_tooltip=The current selection will be used when you open the wizard next time
+SelectRepresentationKindPage_select_kind_group=Select a Representation Kind: 
+SelectRepresentationKindPage_Set_Root_Name_Error=The Root model element name cannot be deduced from the current workspace selection
 
 ProfileChooserComposite_RegisteredProfilesDialog=Registered Profile Selection
 ProfileChooserComposite_WorkspaceSelectionButton=Browse Workspace
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/NewModelFilePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/NewModelFilePage.java
index f06726ac12f..ff2bff0e42a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/NewModelFilePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/NewModelFilePage.java
@@ -110,7 +110,7 @@ public class NewModelFilePage extends WizardNewFileCreationPage {
 	 */
 	public IStatus diagramExtensionChanged(String newExtension) {
 		String currentExtension = getFileExtension();
-		if (!currentExtension.equals(newExtension)) {
+		if (!currentExtension.equals(newExtension) && this.getControl() != null) {
 
 			// String oldFileName = getFileName();
 			String newFileName = NewModelFilePage.getUniqueFileName(getContainerFullPath(), getFileName().replace(currentExtension, ""), newExtension);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/SelectArchitectureContextPage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/SelectArchitectureContextPage.java
new file mode 100644
index 00000000000..7445713c287
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/SelectArchitectureContextPage.java
@@ -0,0 +1,252 @@
+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.wizards.pages;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.dialogs.IMessageProvider;
+import org.eclipse.jface.wizard.IWizard;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureContext;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureViewpoint;
+import org.eclipse.papyrus.infra.architecture.ArchitectureDomainManager;
+import org.eclipse.papyrus.infra.ui.architecture.widgets.ArchitectureContextComposite;
+import org.eclipse.papyrus.uml.diagram.wizards.messages.Messages;
+import org.eclipse.papyrus.uml.diagram.wizards.utils.SettingsHelper;
+import org.eclipse.papyrus.uml.diagram.wizards.wizards.CreateModelWizard;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Layout;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * @author melaasar
+ *
+ */
+public class SelectArchitectureContextPage extends WizardPage {
+
+	/** The Constant PAGE_ID. */
+	public static final String PAGE_ID = "SelectArchitectureContextPage"; //$NON-NLS-1$
+
+	private SettingsHelper settingsHelper;
+	
+	private final boolean allowSeveralContexts;
+
+	private String[] selectedContexts;
+
+	private String[] selectedViewpoints;
+
+	public SelectArchitectureContextPage() {
+		this(false);
+	}
+
+	public SelectArchitectureContextPage(boolean allowSeveralContexts) {
+		super(PAGE_ID);
+		setTitle("Select Architecture Context");
+		setDescription("Select the architecture context(s) and viewpoints to apply to the Papyrus model");
+		this.allowSeveralContexts = allowSeveralContexts;
+	}
+
+	@Override
+	public void setWizard(IWizard newWizard) {
+		super.setWizard(newWizard);
+		settingsHelper = new SettingsHelper(getDialogSettings());
+		
+		List<String> contextIds = asList(settingsHelper.getArchitectureContexts());
+		if (!allowSeveralContexts) {
+			String defaultContextId = ArchitectureDomainManager.getInstance().getDefaultArchitectureContextId();
+			if (defaultContextId != null)
+				contextIds = asList(defaultContextId);
+			else if (!contextIds.isEmpty())
+				contextIds = asList(contextIds.get(0));
+			else
+				contextIds = Collections.emptyList();
+		}
+		
+		List<String> viewpoints = new ArrayList<String>(); 
+		for (Iterator<String> i = contextIds.iterator(); i.hasNext();) {
+			String contextId = i.next();
+			if (isVisibleContext(contextId)) {
+				MergedArchitectureContext context = ArchitectureDomainManager.getInstance().getArchitectureContextById(contextId);
+				for (MergedArchitectureViewpoint viewpoint : context.getViewpoints()) {
+					viewpoints.add(viewpoint.getId());
+				}
+			} else
+				i.remove();
+		}
+
+		selectedContexts = contextIds.toArray(new String[0]);
+		selectedViewpoints = viewpoints.toArray(new String[0]);
+	}
+	
+    private <T> List<T> asList(T... elements) {
+    	List<T> list = new ArrayList<T>();
+    	for (T element : elements)
+    		list.add(element);
+    	return list;
+    }
+
+	private boolean isVisibleContext(String contextId) {
+		for (MergedArchitectureContext context : ArchitectureDomainManager.getInstance().getVisibleArchitectureContexts()) {
+			if (context.getId().equals(contextId))
+				return true;
+		}
+		return false;
+	}
+	
+	/**
+	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
+	 *
+	 * @param parent
+	 */
+	@Override
+	public void createControl(Composite parent) {
+		Composite comp = createComposite(parent, 1, 1, GridData.FILL_BOTH, 0, 0);
+		((GridData) comp.getLayoutData()).widthHint = 350;
+		createVerticalSpacer(comp, 1);
+		setControl(comp);
+
+		ArchitectureDomainManager manager = ArchitectureDomainManager.getInstance();
+		MergedArchitectureContext[] contexts;
+		//if (allowSeveralContexts || manager.getDefaultArchitectureContext() == null)
+			contexts = manager.getVisibleArchitectureContexts().toArray(new MergedArchitectureContext[0]);
+		//else
+			//contexts = new ArchitectureContext[] { manager.getDefaultArchitectureContext() };
+
+		final ArchitectureContextComposite acc = new ArchitectureContextComposite(comp, 1, 1, GridData.FILL_BOTH, 0, 0);
+		acc.setAllowSeveralContexts(allowSeveralContexts);
+		acc.setSelectedContexts(selectedContexts);
+		acc.setSelectedViewpoints(selectedViewpoints);
+		acc.setInput(contexts);
+		acc.setUpdater(new ArchitectureContextComposite.Updater() {
+			@Override
+			public void update() {
+				selectedContexts = acc.getSelectedContexts();
+				selectedViewpoints = acc.getSelectedViewpoints();
+				updateButtons();
+			}
+		});
+		updateButtons();
+	}
+
+	@Override
+	public void performHelp() {
+		PlatformUI.getWorkbench().getHelpSystem().displayHelp("org.eclipse.papyrus.uml.diagram.wizards.Category"); //$NON-NLS-1$
+	}
+    
+	/**
+	 * Gets the selected architecture contexts.
+	 *
+	 * @return the architecture contexts
+	 */
+	public String[] getSelectedContexts() {
+		return selectedContexts;
+	}
+	
+	/**
+	 * Respond to completion of the wizard. Includes saving settings for the next
+	 * invocation of the wizard.
+	 * 
+	 * @since 2.0
+	 */
+	public void performFinish() {
+		settingsHelper.saveArchitectureContexts(selectedContexts);
+	}
+	
+	public String[] getSelectContexts() {
+		return selectedContexts;
+	}
+
+	public String[] getSelectViewpoints() {
+		return selectedViewpoints;
+	}
+
+	private void updateButtons() {
+	    setPageComplete(selectedContexts.length!=0 && validatePage());
+	}
+
+	/**
+	 * Validate page.
+	 *
+	 * @return true, if successful
+	 */
+	protected boolean validatePage() {
+		setMessage(null);
+		setErrorMessage(null);
+		String[] categories = selectedContexts;
+		if (categories == null || categories.length == 0) {
+			setErrorMessage(Messages.SelectArchitectureContextPage_select_one_category);
+			return false;
+		}
+		if (!validateFileExtension(categories)) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Validate file extension.
+	 *
+	 * @param categories
+	 *            the categories
+	 * @return true, if successful
+	 */
+	protected boolean validateFileExtension(String... contexts) {
+		IStatus status = ((CreateModelWizard) getWizard()).architectureContextChanged(contexts);
+		switch (status.getSeverity()) {
+		case Status.WARNING:
+			setMessage(status.getMessage(), IMessageProvider.WARNING);
+			break;
+		case IStatus.INFO:
+			setMessage(status.getMessage(), IMessageProvider.INFORMATION);
+			break;
+		}
+		return true;
+	}
+
+	private static Composite createComposite(Composite parent, int columns, int hspan, int fill, int marginwidth, int marginheight) {
+		Composite g = new Composite(parent, SWT.NONE);
+		GridLayout layout = new GridLayout(columns, false);
+		layout.marginWidth = marginwidth;
+		layout.marginHeight = marginheight;
+		g.setLayout(layout);
+		g.setFont(parent.getFont());
+		GridData gd = new GridData(fill);
+		gd.horizontalSpan = hspan;
+		g.setLayoutData(gd);
+		return g;
+	}
+	
+	private static void createVerticalSpacer(Composite parent, int numlines) {
+		Label lbl = new Label(parent, SWT.NONE);
+		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		Layout layout = parent.getLayout();
+		if (layout instanceof GridLayout) {
+			gd.horizontalSpan = ((GridLayout) parent.getLayout()).numColumns;
+		}
+		gd.heightHint = numlines;
+		lbl.setLayoutData(gd);
+	}
+
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/SelectDiagramCategoryPage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/SelectDiagramCategoryPage.java
deleted file mode 100644
index d63a662ade0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/SelectDiagramCategoryPage.java
+++ /dev/null
@@ -1,471 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tatiana Fesenko (CEA LIST) - Initial API and implementation

- *  Christian W. Damus - bugs 466850, 490936

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.wizards.pages;

-

-import java.text.Collator;

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Comparator;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Map;

-import java.util.SortedSet;

-import java.util.TreeSet;

-

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.jface.dialogs.IMessageProvider;

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.jface.wizard.IWizard;

-import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.papyrus.uml.diagram.wizards.category.DiagramCategoryDescriptor;

-import org.eclipse.papyrus.uml.diagram.wizards.category.DiagramCategoryRegistry;

-import org.eclipse.papyrus.uml.diagram.wizards.messages.Messages;

-import org.eclipse.papyrus.uml.diagram.wizards.utils.SettingsHelper;

-import org.eclipse.papyrus.uml.diagram.wizards.wizards.CreateModelWizard;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.events.SelectionListener;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Button;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Group;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.ui.PlatformUI;

-

-

-/**

- * The Class SelectDiagramCategoryPage.

- */

-public class SelectDiagramCategoryPage extends WizardPage {

-

-	/** The my diagram kind buttons. */

-	final private List<Button> myDiagramKindButtons = new ArrayList<Button>();

-

-	/** The diagram category. */

-	private final List<String> mySelectedDiagramCategoryIds = new LinkedList<String>();

-

-	/** The most recently selected category, even if multiple selection is permitted. */

-	private String lastSelectedCategory;

-

-	/** The Constant PAGE_ID. */

-	public static final String PAGE_ID = "SelectDiagramCategory"; //$NON-NLS-1$

-

-	/** The Constant DEFAULT_EXTENSION. */

-	public static final String DEFAULT_EXTENSION = "uml"; //$NON-NLS-1$

-

-	/** uml core languages label */

-	private static final List<String> umlCore = Arrays.asList("UML", "Profile"); //$NON-NLS-1$ //$NON-NLS-2$

-

-	/** The my allow several categories. */

-	private final boolean myAllowSeveralCategories;

-

-	private SettingsHelper settingsHelper;

-

-	private final Collator collator = Collator.getInstance();

-

-

-	/**

-	 * Instantiates a new select diagram category page.

-	 *

-	 */

-	public SelectDiagramCategoryPage() {

-		this(false);

-	}

-

-	/**

-	 * Instantiates a new select diagram category page.

-	 *

-	 * @param allowSeveralCategories

-	 *            the allow several categories

-	 */

-	public SelectDiagramCategoryPage(boolean allowSeveralCategories) {

-		super(PAGE_ID);

-		myAllowSeveralCategories = allowSeveralCategories;

-		setTitle(Messages.SelectDiagramCategoryPage_select_language);

-	}

-

-	/**

-	 * Sets the wizard.

-	 *

-	 * @param newWizard

-	 *            the new wizard

-	 * @see org.eclipse.jface.wizard.WizardPage#setWizard(org.eclipse.jface.wizard.IWizard)

-	 */

-	@Override

-	public void setWizard(IWizard newWizard) {

-		super.setWizard(newWizard);

-		settingsHelper = new SettingsHelper(getDialogSettings());

-		String[] defaultDiagramCategory = settingsHelper.getDefaultDiagramCategories();

-

-		if (defaultDiagramCategory != null && defaultDiagramCategory.length > 0) {

-			String defaultSelection = Arrays.asList(defaultDiagramCategory).contains(DEFAULT_EXTENSION) ? DEFAULT_EXTENSION : defaultDiagramCategory[0];

-			if (myAllowSeveralCategories) {

-				setDefaultDiagramCategories(defaultDiagramCategory);

-			} else {

-				String previousSelection = settingsHelper.getPreviousSelection();

-				// Retrieves the previous selection or the selects the default behavior

-				if (settingsHelper.rememberCurrentSelection(getDialogSettings()) && previousSelection != null) {

-					setDefaultDiagramCategories(new String[] { previousSelection });

-				} else {

-					setDefaultDiagramCategories(new String[] { defaultSelection });

-				}

-			}

-		}

-	}

-

-	/**

-	 * Creates the control.

-	 *

-	 * @param parent

-	 *            the parent

-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)

-	 */

-	@Override

-	public void createControl(Composite parent) {

-		Composite plate = new Composite(parent, SWT.NONE);

-		plate.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

-		GridLayout gridLayout = new GridLayout();

-		gridLayout.marginWidth = 10;

-		plate.setLayout(gridLayout);

-		setControl(plate);

-		createDiagramCategoryForm(plate);

-

-		// Bug(466850): Do this later because the new-file page's resource group is not yet created

-		plate.getDisplay().asyncExec(new Runnable() {

-

-			@Override

-			public void run() {

-				setPageComplete(validatePage());

-			}

-		});

-	}

-

-	@Override

-	public void setVisible(boolean visible) {

-		super.setVisible(visible);

-

-		// re-validate in case the user changed the file name on previous page

-		setPageComplete(validatePage());

-	}

-

-

-	/**

-	 * Gets the diagram categories.

-	 *

-	 * @return the diagram categories

-	 */

-	public String[] getDiagramCategories() {

-		return mySelectedDiagramCategoryIds.toArray(new String[mySelectedDiagramCategoryIds.size()]);

-	}

-

-	/**

-	 * Sets the default diagram categories.

-	 *

-	 * @param categories

-	 *            the new default diagram categories

-	 */

-	protected final void setDefaultDiagramCategories(String[] categories) {

-		mySelectedDiagramCategoryIds.clear();

-		mySelectedDiagramCategoryIds.addAll(Arrays.asList(categories));

-	}

-

-

-	/**

-	 * Validate page.

-	 *

-	 * @return true, if successful

-	 */

-	protected boolean validatePage() {

-		setMessage(null);

-		setErrorMessage(null);

-		String[] categories = getDiagramCategories();

-		if (categories == null || categories.length == 0) {

-			setErrorMessage(Messages.SelectDiagramCategoryPage_select_one_category);

-			return false;

-		}

-		if (!validateFileExtension(categories)) {

-			return false;

-		}

-

-		return true;

-	}

-

-	/**

-	 * Validate file extension.

-	 *

-	 * @param categories

-	 *            the categories

-	 * @return true, if successful

-	 */

-	protected boolean validateFileExtension(String... categories) {

-		IStatus status = ((CreateModelWizard) getWizard()).diagramCategoryChanged(categories);

-		switch (status.getSeverity()) {

-		// case Status.ERROR:

-		// setErrorMessage(status.getMessage());

-		// return false;

-		case Status.WARNING:

-			setMessage(status.getMessage(), IMessageProvider.WARNING);

-			break;

-		case IStatus.INFO:

-			setMessage(status.getMessage(), IMessageProvider.INFORMATION);

-			break;

-		}

-		return true;

-	}

-

-	/**

-	 * Gets the diagram category map.

-	 *

-	 * @return the diagram category map

-	 */

-	protected Map<String, DiagramCategoryDescriptor> getDiagramCategoryMap() {

-		return DiagramCategoryRegistry.getInstance().getDiagramCategoryMap();

-	}

-

-	/**

-	 * Creates the diagram language form.

-	 *

-	 * @param composite

-	 *            the composite

-	 */

-	private void createDiagramCategoryForm(Composite composite) {

-		Group group = createGroup(composite, Messages.SelectDiagramCategoryPage_diagram_language_group);

-

-		// To sort the different languages by name

-		collator.setStrength(Collator.SECONDARY);

-		Comparator<DiagramCategoryDescriptor> setComparator = new Comparator<DiagramCategoryDescriptor>() {

-

-			@Override

-			public int compare(DiagramCategoryDescriptor descriptor1, DiagramCategoryDescriptor descriptor2) {

-				String button1Data = descriptor1.getLabel();

-				String button2Data = descriptor2.getLabel();

-				// Special consideration for the UML language as it should always be on top

-				if (button2Data.equalsIgnoreCase(DEFAULT_EXTENSION)) {

-					return 1;

-				} else if (button1Data.equalsIgnoreCase(DEFAULT_EXTENSION)) {

-					return -1;

-				} else {

-					// This if the usual sorting method

-					return collator.compare(button1Data, button2Data);

-				}

-			}

-

-		};

-		// To store the different languages and display them

-		SortedSet<DiagramCategoryDescriptor> descriptorUMLSet = new TreeSet<DiagramCategoryDescriptor>(setComparator);

-		SortedSet<DiagramCategoryDescriptor> descriptorDSMLSet = new TreeSet<DiagramCategoryDescriptor>(setComparator);

-

-		SelectionListener listener = new SelectionListener() {

-

-			private SelectionEvent prevEvent;

-

-			@Override

-			public void widgetSelected(SelectionEvent e) {

-				if (e == prevEvent) {

-					return;

-				}

-				Button selected = ((Button) e.widget);

-				diagramCategorySelected((String) selected.getData(), selected.getSelection());

-				setPageComplete(validatePage());

-				prevEvent = e;

-			}

-

-			@Override

-			public void widgetDefaultSelected(SelectionEvent e) {

-			}

-		};

-

-		for (DiagramCategoryDescriptor diagramCategoryDescriptor : getDiagramCategoryMap().values()) {

-			String descriptorLabel = diagramCategoryDescriptor.getLabel();

-			if (umlCore.contains(descriptorLabel)) {

-				descriptorUMLSet.add(diagramCategoryDescriptor);

-			} else {

-				descriptorDSMLSet.add(diagramCategoryDescriptor);

-			}

-		}

-

-		if (!descriptorUMLSet.isEmpty()) {

-			Label coreLabel = new Label(group, SWT.NONE);

-			coreLabel.setText(Messages.SelectDiagramCategoryPage_umlGroup);

-			for (DiagramCategoryDescriptor diagramCategoryDescriptor : descriptorUMLSet) {

-				Button button = createCategoryButton(diagramCategoryDescriptor, group);

-				button.addSelectionListener(listener);

-				myDiagramKindButtons.add(button);

-			}

-		}

-

-		if (!descriptorDSMLSet.isEmpty()) {

-			Label dsmlLabel = new Label(group, SWT.NONE);

-			dsmlLabel.setText(Messages.SelectDiagramCategoryPage_dsmlGroup);

-			for (DiagramCategoryDescriptor diagramCategoryDescriptor : descriptorDSMLSet) {

-				Button button = createCategoryButton(diagramCategoryDescriptor, group);

-				button.addSelectionListener(listener);

-				myDiagramKindButtons.add(button);

-			}

-		}

-

-		checkDiagramCategoryButtons();

-		// Initialize the first selection upon opening the wizard

-		setDefaultSelection(DEFAULT_EXTENSION);

-	}

-

-	/**

-	 * Sets the default language selection based on the DEFAULT_EXTENSION parameter

-	 * 

-	 * @param defaultExtension

-	 */

-	private void setDefaultSelection(String defaultExtension) {

-		String previousSelection = settingsHelper.getPreviousSelection();

-		String defaultSelection = previousSelection != null ? previousSelection : defaultExtension;

-

-		for (Button button : myDiagramKindButtons) {

-			if (defaultSelection.equalsIgnoreCase((String) button.getData())) {

-				button.setSelection(true);

-				diagramCategorySelected(defaultSelection, button.getSelection());

-			}

-		}

-	}

-

-	/**

-	 * Diagram category selected.

-	 *

-	 * @param category

-	 *            the category

-	 * @param checked

-	 *            the checked

-	 */

-	protected void diagramCategorySelected(String category, boolean checked) {

-		if (checked) {

-			if (!mySelectedDiagramCategoryIds.contains(category)) {

-				if (!myAllowSeveralCategories) {

-					// Can only have one selection

-					mySelectedDiagramCategoryIds.clear();

-				}

-				mySelectedDiagramCategoryIds.add(category);

-			}

-			lastSelectedCategory = category;

-		} else {

-			mySelectedDiagramCategoryIds.remove(category);

-			lastSelectedCategory = mySelectedDiagramCategoryIds.isEmpty()

-					? null

-					: mySelectedDiagramCategoryIds.get(mySelectedDiagramCategoryIds.size() - 1);

-		}

-

-	}

-

-	/**

-	 * Check diagram category buttons.

-	 */

-	protected void checkDiagramCategoryButtons() {

-		checkButtonsFor(mySelectedDiagramCategoryIds.toArray(new String[mySelectedDiagramCategoryIds.size()]));

-	}

-

-	/**

-	 * Check buttons for.

-	 *

-	 * @param diagramCategories

-	 *            the diagram categories

-	 */

-	protected void checkButtonsFor(String... diagramCategories) {

-		for (Button button : myDiagramKindButtons) {

-			button.setSelection(false);

-		}

-		for (Button button : myDiagramKindButtons) {

-			for (String diagramCategory : diagramCategories) {

-				if (diagramCategory.equalsIgnoreCase((String) button.getData())) {

-					button.setSelection(true);

-				}

-			}

-		}

-	}

-

-	/**

-	 * Creates the category button.

-	 *

-	 * @param diagramCategoryDescriptor

-	 *            the diagram category descriptor

-	 * @param group

-	 *            the group

-	 * @return the button

-	 */

-	private Button createCategoryButton(DiagramCategoryDescriptor diagramCategoryDescriptor, Group group) {

-		Button button = new Button(group, myAllowSeveralCategories ? SWT.CHECK : SWT.RADIO);

-		button.setText(diagramCategoryDescriptor.getLabel());

-		button.setData(diagramCategoryDescriptor.getId());

-		Image image = getImage(diagramCategoryDescriptor.getIcon());

-		if (image != null) {

-			button.setImage(image);

-		}

-		button.setToolTipText(diagramCategoryDescriptor.getDescription());

-		return button;

-	}

-

-	/**

-	 * Gets the image.

-	 *

-	 * @param imageDescriptor

-	 *            the image descriptor

-	 * @return the image

-	 */

-	private static Image getImage(ImageDescriptor imageDescriptor) {

-		if (imageDescriptor != null) {

-			return new Image(null, imageDescriptor.getImageData());

-		}

-		return null;

-	}

-

-	/**

-	 * Creates the group.

-	 *

-	 * @param parent

-	 *            the parent

-	 * @param name

-	 *            the name

-	 * @return the group

-	 */

-	private static Group createGroup(Composite parent, String name) {

-		Group group = new Group(parent, SWT.NONE);

-		group.setText(name);

-		GridLayout layout = new GridLayout(1, false);

-		layout.marginHeight = 5;

-		layout.marginWidth = 5;

-		group.setLayout(layout);

-		GridData data = new GridData(SWT.FILL, SWT.FILL, true, false);

-		group.setLayoutData(data);

-		return group;

-	}

-

-	@Override

-	public void performHelp() {

-		PlatformUI.getWorkbench().getHelpSystem().displayHelp("org.eclipse.papyrus.uml.diagram.wizards.Category"); //$NON-NLS-1$

-

-	}

-

-	/**

-	 * Respond to completion of the wizard. Includes saving settings for the next

-	 * invocation of the wizard.

-	 * 

-	 * @since 2.0

-	 */

-	public void performFinish() {

-		// Notifies the settings file that the selection has been set and to what

-		settingsHelper.setCurrentSelection(lastSelectedCategory);

-		settingsHelper.saveRememberCurrentSelection(true);

-

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/SelectDiagramKindPage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/SelectRepresentationKindPage.java
index 90f48ab2ee9..24f81732563 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/SelectDiagramKindPage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/SelectRepresentationKindPage.java
@@ -13,7 +13,9 @@
 package org.eclipse.papyrus.uml.diagram.wizards.pages;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.IAdaptable;
@@ -29,11 +31,13 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.papyrus.commands.CreationCommandRegistry;
 import org.eclipse.papyrus.commands.ICreationCommandRegistry;
-import org.eclipse.papyrus.infra.viewpoints.configuration.Category;
-import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
+import org.eclipse.papyrus.infra.core.architecture.RepresentationKind;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureContext;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureViewpoint;
+import org.eclipse.papyrus.infra.architecture.ArchitectureDomainManager;
 import org.eclipse.papyrus.uml.diagram.wizards.Activator;
-import org.eclipse.papyrus.uml.diagram.wizards.kind.DiagramKindComposite;
 import org.eclipse.papyrus.uml.diagram.wizards.kind.DiagramKindLabelProvider;
+import org.eclipse.papyrus.uml.diagram.wizards.kind.RepresentationKindComposite;
 import org.eclipse.papyrus.uml.diagram.wizards.messages.Messages;
 import org.eclipse.papyrus.uml.diagram.wizards.profile.ProfileChooserComposite;
 import org.eclipse.papyrus.uml.diagram.wizards.template.ModelTemplateDescription;
@@ -57,7 +61,7 @@ import org.eclipse.uml2.uml.NamedElement;
  * @author <a href="mailto:jerome.benois@obeo.fr">Jerome Benois</a>
  * @author Tatiana Fesenko
  */
-public class SelectDiagramKindPage extends WizardPage {
+public class SelectRepresentationKindPage extends WizardPage {
 
 	/** The Constant PAGE_ID. */
 	public static final String PAGE_ID = "SelectDiagramKind"; //$NON-NLS-1$
@@ -69,12 +73,12 @@ public class SelectDiagramKindPage extends WizardPage {
 	private SelectModelTemplateComposite selectTemplateComposite;
 
 	/** the select diagram Kind composite */
-	private DiagramKindComposite diagramKindComposite;
+	private RepresentationKindComposite representationKindComposite;
 
 	private ProfileChooserComposite profileChooserComposite;
 
 	/** The my category provider. */
-	private final CategoryProvider myCategoryProvider;
+	private final ViewpointProvider myViewpointProvider;
 
 	/** The allow templates. */
 	private final boolean allowTemplates;
@@ -90,11 +94,11 @@ public class SelectDiagramKindPage extends WizardPage {
 	/**
 	 * Instantiates a new select diagram kind page.
 	 *
-	 * @param categoryProvider
+	 * @param viewpointProvider
 	 *            the category provider
 	 */
-	public SelectDiagramKindPage(CategoryProvider categoryProvider) {
-		this(true, categoryProvider, DEFAULT_CREATION_COMMAND_REGISTRY);
+	public SelectRepresentationKindPage(ViewpointProvider viewpointProvider) {
+		this(true, viewpointProvider, DEFAULT_CREATION_COMMAND_REGISTRY);
 	}
 
 	/**
@@ -102,17 +106,17 @@ public class SelectDiagramKindPage extends WizardPage {
 	 *
 	 * @param allowTemplates
 	 *            the allow templates
-	 * @param categoryProvider
+	 * @param viewpointProvider
 	 *            the category provider
 	 * @param creationCommandRegistry
 	 *            the creation command registry
 	 */
-	public SelectDiagramKindPage(boolean allowTemplates, CategoryProvider categoryProvider, ICreationCommandRegistry creationCommandRegistry) {
+	public SelectRepresentationKindPage(boolean allowTemplates, ViewpointProvider viewpointProvider, ICreationCommandRegistry creationCommandRegistry) {
 		super(PAGE_ID);
-		setTitle(Messages.SelectDiagramKindPage_page_title);
-		setDescription(Messages.SelectDiagramKindPage_page_desc);
+		setTitle(Messages.SelectRepresentationKindPage_page_title);
+		setDescription(Messages.SelectRepresentationKindPage_page_desc);
 		this.allowTemplates = allowTemplates;
-		myCategoryProvider = categoryProvider;
+		myViewpointProvider = viewpointProvider;
 		myCreationCommandRegistry = creationCommandRegistry;
 	}
 
@@ -127,24 +131,24 @@ public class SelectDiagramKindPage extends WizardPage {
 		Composite pageComposite = new Composite(parent, SWT.NONE);
 		pageComposite.setLayout(new GridLayout());
 		pageComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		String[] categories = getDiagramCategories();
+		String[] viewpoints = getViewpoints();
 
 		Composite nameFormComposite = new Composite(pageComposite, SWT.NONE);
 		nameFormComposite.setLayout(new GridLayout());
 		nameFormComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
 		createNameForm(nameFormComposite);
 
-		Composite diagramKindComposite = new Composite(pageComposite, SWT.NONE);
-		diagramKindComposite.setLayout(new GridLayout());
-		diagramKindComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		createDiagramKindForm(diagramKindComposite);
-		this.diagramKindComposite.setInput(categories);
+		Composite representationKindComposite = new Composite(pageComposite, SWT.NONE);
+		representationKindComposite.setLayout(new GridLayout());
+		representationKindComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+		createPresentationKindForm(representationKindComposite);
+		this.representationKindComposite.setInput(viewpoints);
 
 		Composite modelTemplateComposite = new Composite(pageComposite, SWT.NONE);
 		modelTemplateComposite.setLayout(new GridLayout());
 		modelTemplateComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
 		createModelTemplateComposite(modelTemplateComposite);
-		fillInTables(categories);
+		fillInTables(viewpoints);
 
 		Composite profileChooserComposite = new Composite(pageComposite, SWT.NONE);
 		profileChooserComposite.setLayout(new GridLayout());
@@ -160,7 +164,7 @@ public class SelectDiagramKindPage extends WizardPage {
 	 * @param parent
 	 */
 	private void createProfileFileChooser(Composite parent) {
-		Group group = createGroup(parent, Messages.SelectDiagramKindPage_0);
+		Group group = createGroup(parent, Messages.SelectRepresentationKindPage_0);
 		profileChooserComposite = new ProfileChooserComposite(group);
 		profileChooserComposite.getTextField().addModifyListener(new ModifyListener() {
 
@@ -197,7 +201,7 @@ public class SelectDiagramKindPage extends WizardPage {
 	public void setVisible(boolean visible) {
 		super.setVisible(visible);
 		if (visible) {
-			fillInTables(getDiagramCategories());
+			fillInTables(getViewpoints());
 			validatePage();
 			// Deactivates the viewer if its contained list is empty
 			Combo templateCombo = selectTemplateComposite.getTemplateCombo();
@@ -216,15 +220,15 @@ public class SelectDiagramKindPage extends WizardPage {
 	/**
 	 * Fill in tables.
 	 *
-	 * @param categories
-	 *            the categories
+	 * @param viewpoints
+	 *            the viewpoints
 	 */
-	private void fillInTables(String[] categories) {
-		if (categories == null || categories.length == 0) {
+	private void fillInTables(String[] viewpoints) {
+		if (viewpoints == null || viewpoints.length == 0) {
 			return;
 		}
-		diagramKindComposite.setInput(categories);
-		selectTemplateComposite.setInput(categories);
+		representationKindComposite.setInput(viewpoints);
+		selectTemplateComposite.setInput(viewpoints);
 
 		getShell().pack(true);
 	}
@@ -267,12 +271,12 @@ public class SelectDiagramKindPage extends WizardPage {
 	}
 
 	/**
-	 * Gets the diagram category.
+	 * Gets the viewpoints.
 	 *
-	 * @return the diagram category
+	 * @return the viewpoint
 	 */
-	private String[] getDiagramCategories() {
-		return myCategoryProvider.getCurrentCategories();
+	private String[] getViewpoints() {
+		return myViewpointProvider.getCurrentViewpoints();
 	}
 
 
@@ -282,7 +286,7 @@ public class SelectDiagramKindPage extends WizardPage {
 	 * @return the new diagram name
 	 */
 	public List<String> getDiagramName() {
-		return diagramKindComposite.getDiagramName();
+		return representationKindComposite.getDiagramName();
 	}
 
 	public String getRootElementName() {
@@ -299,24 +303,23 @@ public class SelectDiagramKindPage extends WizardPage {
 	}
 
 	/**
-	 * Gets the selected command descriptors.
+	 * Gets the selected representation kinds for a given viewpoint
 	 *
-	 * @param categoryId
-	 *            the category id
-	 * @return the selected command descriptors
+	 * @param contextId
+	 *            the architecture context id
+	 * @return the selected repersentation kinds
 	 */
-	public List<ViewPrototype> getSelectedPrototypes(String categoryId) {
-		ViewPrototype[] selected = getSelectedPrototypes();
-		List<ViewPrototype> commands = new ArrayList<ViewPrototype>();
-		for (int i = 0; i < selected.length; i++) {
-			for (Category category : selected[i].getCategories()) {
-				if (category.getName().equals(categoryId)) {
-					commands.add(selected[i]);
-					break;
-				}
-			}
+	public List<RepresentationKind> getSelectedRepresentationKinds(String contextId) {
+		MergedArchitectureContext context = ArchitectureDomainManager.getInstance().getArchitectureContextById(contextId);
+		Set<RepresentationKind> allowedKinds = new HashSet<RepresentationKind>();
+		for (MergedArchitectureViewpoint viewpoint : context.getViewpoints())
+			allowedKinds.addAll(viewpoint.getRepresentationKinds());
+		List<RepresentationKind> selectedKinds = new ArrayList<RepresentationKind>();
+		for (RepresentationKind kind : getSelectedRepresentationKinds()) { 	
+			if (allowedKinds.contains(kind))
+				selectedKinds.add(kind);
 		}
-		return commands;
+		return selectedKinds;
 	}
 
 	/**
@@ -326,7 +329,7 @@ public class SelectDiagramKindPage extends WizardPage {
 	 *            the composite
 	 */
 	private void createModelTemplateComposite(Composite composite) {
-		Group group = createGroup(composite, Messages.SelectDiagramKindPage_load_template_group);
+		Group group = createGroup(composite, Messages.SelectRepresentationKindPage_load_template_group);
 		selectTemplateComposite = new SelectModelTemplateComposite(group);
 	}
 
@@ -336,9 +339,9 @@ public class SelectDiagramKindPage extends WizardPage {
 	 * @param composite
 	 *            the composite
 	 */
-	private void createDiagramKindForm(Composite composite) {
-		Group group = createGroup(composite, Messages.SelectDiagramKindPage_select_kind_group);
-		diagramKindComposite = new DiagramKindComposite(group);
+	private void createPresentationKindForm(Composite composite) {
+		Group group = createGroup(composite, Messages.SelectRepresentationKindPage_select_kind_group);
+		representationKindComposite = new RepresentationKindComposite(group);
 	}
 
 	/**
@@ -379,10 +382,10 @@ public class SelectDiagramKindPage extends WizardPage {
 	 *            the composite
 	 */
 	private void createNameForm(Composite composite) {
-		Group group = createGroup(composite, Messages.SelectDiagramKindPage_diagram_name_group);
+		Group group = createGroup(composite, Messages.SelectRepresentationKindPage_diagram_name_group);
 		nameText = new Text(group, SWT.BORDER);
 		nameText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-		nameText.setText(Messages.SelectDiagramKindPage_default_diagram_name);
+		nameText.setText(Messages.SelectRepresentationKindPage_default_diagram_name);
 
 		ISelection selection = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection();
 		if (selection instanceof IStructuredSelection && ((IStructuredSelection) selection).size() > 0) {
@@ -407,7 +410,7 @@ public class SelectDiagramKindPage extends WizardPage {
 							}
 						}
 					} catch (Exception e) {
-						this.setErrorMessage(Messages.SelectDiagramKindPage_Set_Root_Name_Error);
+						this.setErrorMessage(Messages.SelectRepresentationKindPage_Set_Root_Name_Error);
 						Activator.log.error(e);
 					}
 				}
@@ -440,7 +443,7 @@ public class SelectDiagramKindPage extends WizardPage {
 		} else {
 			// Resets the displayed message
 			this.setErrorMessage(null);
-			this.setMessage(Messages.SelectDiagramKindPage_page_desc);
+			this.setMessage(Messages.SelectRepresentationKindPage_page_desc);
 		}
 		return true;
 	}
@@ -461,9 +464,9 @@ public class SelectDiagramKindPage extends WizardPage {
 	 *
 	 * @return the selected diagram kind descriptors
 	 */
-	protected ViewPrototype[] getSelectedPrototypes() {
-		List<ViewPrototype> checked = diagramKindComposite.getCheckElement();
-		ViewPrototype[] result = checked.toArray(new ViewPrototype[checked.size()]);
+	protected RepresentationKind[] getSelectedRepresentationKinds() {
+		List<RepresentationKind> checked = representationKindComposite.getCheckElement();
+		RepresentationKind[] result = checked.toArray(new RepresentationKind[checked.size()]);
 		return result;
 	}
 
@@ -478,16 +481,16 @@ public class SelectDiagramKindPage extends WizardPage {
 	}
 
 	/**
-	 * The Interface CategoryProvider.
+	 * The Interface ViewpointProvider.
 	 */
-	public static interface CategoryProvider {
+	public static interface ViewpointProvider {
 
 		/**
 		 * Gets the current categories.
 		 *
 		 * @return the current categories
 		 */
-		String[] getCurrentCategories();
+		String[] getCurrentViewpoints();
 	}
 
 	public List<ModelTemplateDescription> getTemplateTransfo() {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/providers/AbstractNewModelStorageProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/providers/AbstractNewModelStorageProvider.java
index 57b6f267488..9bb947845ee 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/providers/AbstractNewModelStorageProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/providers/AbstractNewModelStorageProvider.java
@@ -18,7 +18,7 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.emf.common.ui.URIEditorInput;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramCategoryPage;
+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectArchitectureContextPage;
 import org.eclipse.papyrus.uml.diagram.wizards.wizards.CreateModelWizard;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IFileEditorInput;
@@ -33,7 +33,7 @@ public abstract class AbstractNewModelStorageProvider implements INewModelStorag
 		// pass
 	}
 
-	public IStatus validateDiagramCategories(String... newCategories) {
+	public IStatus validateArchitectureContexts(String... newContexts) {
 		return Status.OK_STATUS;
 	}
 
@@ -52,7 +52,7 @@ public abstract class AbstractNewModelStorageProvider implements INewModelStorag
 		return null;
 	}
 
-	public SelectDiagramCategoryPage getDiagramCategoryPage() {
+	public SelectArchitectureContextPage getArchitectureContextPage() {
 		return null;
 	}
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/providers/INewModelStorageProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/providers/INewModelStorageProvider.java
index 8d9c93a1475..860356a8cf0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/providers/INewModelStorageProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/providers/INewModelStorageProvider.java
@@ -17,7 +17,7 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramCategoryPage;
+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectArchitectureContextPage;
 import org.eclipse.papyrus.uml.diagram.wizards.wizards.CreateModelWizard;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -48,7 +48,7 @@ public interface INewModelStorageProvider {
 
 	List<? extends IWizardPage> createPages();
 
-	IStatus validateDiagramCategories(String... newCategories);
+	IStatus validateArchitectureContexts(String... newContexts);
 
 	/**
 	 * Create the URI identifying a new model, as indicated by my wizard page
@@ -85,7 +85,7 @@ public interface INewModelStorageProvider {
 	 */
 	ISelectProviderPart createSelectProviderPart();
 
-	SelectDiagramCategoryPage getDiagramCategoryPage();
+	SelectArchitectureContextPage getArchitectureContextPage();
 
 	//
 	// Nested types
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/providers/NewModelStorageProviderRegistry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/providers/NewModelStorageProviderRegistry.java
index 3e0402f268f..b9dacc1501d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/providers/NewModelStorageProviderRegistry.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/providers/NewModelStorageProviderRegistry.java
@@ -30,7 +30,7 @@ import org.eclipse.emf.common.util.URI;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.IWizardPage;
 import org.eclipse.papyrus.uml.diagram.wizards.Activator;
-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramCategoryPage;
+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectArchitectureContextPage;
 import org.eclipse.papyrus.uml.diagram.wizards.wizards.CreateModelWizard;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.services.IEvaluationService;
@@ -181,8 +181,8 @@ public class NewModelStorageProviderRegistry implements Iterable<NewModelStorage
 			return getInstance().createEditorInput(uri);
 		}
 
-		public IStatus validateDiagramCategories(String... newCategories) {
-			return getInstance().validateDiagramCategories(newCategories);
+		public IStatus validateArchitectureContexts(String... newContexts) {
+			return getInstance().validateArchitectureContexts(newContexts);
 		}
 
 		public ISelectProviderPart createSelectProviderPart() {
@@ -200,10 +200,10 @@ public class NewModelStorageProviderRegistry implements Iterable<NewModelStorage
 			}
 		}
 
-		public SelectDiagramCategoryPage getDiagramCategoryPage() {
-			return getInstance().getDiagramCategoryPage();
+		public SelectArchitectureContextPage getArchitectureContextPage() {
+			return getInstance().getArchitectureContextPage();
 		}
-	}
+}
 
 	private static final class NullProvider extends AbstractNewModelStorageProvider {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/providers/WorkspaceNewModelStorageProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/providers/WorkspaceNewModelStorageProvider.java
index f0c46d56cfd..0594ca88dd4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/providers/WorkspaceNewModelStorageProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/providers/WorkspaceNewModelStorageProvider.java
@@ -28,7 +28,7 @@ import org.eclipse.jface.wizard.IWizardPage;
 import org.eclipse.papyrus.commands.Activator;
 import org.eclipse.papyrus.uml.diagram.wizards.pages.NewDiagramForExistingModelPage;
 import org.eclipse.papyrus.uml.diagram.wizards.pages.NewModelFilePage;
-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramCategoryPage;
+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectArchitectureContextPage;
 import org.eclipse.papyrus.uml.diagram.wizards.utils.WizardsHelper;
 import org.eclipse.papyrus.uml.diagram.wizards.wizards.CreateModelWizard;
 import org.eclipse.papyrus.uml.diagram.wizards.wizards.InitModelWizard;
@@ -43,7 +43,7 @@ public class WorkspaceNewModelStorageProvider extends AbstractNewModelStoragePro
 	/** New model file page for the file. */
 	private NewModelFilePage newModelFilePage;
 
-	private SelectDiagramCategoryPage newDiagramCategoryPage;
+	private SelectArchitectureContextPage newSelectArchitectureContextPage;
 
 	public WorkspaceNewModelStorageProvider() {
 		super();
@@ -69,33 +69,33 @@ public class WorkspaceNewModelStorageProvider extends AbstractNewModelStoragePro
 
 		this.wizard = wizard;
 		newModelFilePage = createNewModelFilePage(selection);
-		newDiagramCategoryPage = createNewDiagramCategoryPage(selection);
+		newSelectArchitectureContextPage = createNewArchitectureContextPage(selection);
 	}
 
 
 
 	@Override
 	public List<? extends IWizardPage> createPages() {
-		if (newModelFilePage == null && newDiagramCategoryPage == null) {
+		if (newModelFilePage == null && newSelectArchitectureContextPage == null) {
 			return Collections.emptyList();
 		}
 
-		return Arrays.asList(newDiagramCategoryPage, newModelFilePage);
+		return Arrays.asList(newSelectArchitectureContextPage, newModelFilePage);
 	}
 
 	@Override
-	public IStatus validateDiagramCategories(String... newCategories) {
+	public IStatus validateArchitectureContexts(String... newContexts) {
 		if (newModelFilePage != null) {
-			String firstCategory = newCategories.length > 0 ? newCategories[0] : null;
-			if (newCategories.length > 0) {
+			String firstContext = newContexts.length > 0 ? newContexts[0] : null;
+			if (newContexts.length > 0) {
 				// 316943 - [Wizard] Wrong suffix for file name when creating a
 				// profile model
-				return newModelFilePage.diagramExtensionChanged(wizard.getDiagramFileExtension(firstCategory));
+				return newModelFilePage.diagramExtensionChanged(wizard.getDiagramFileExtension(firstContext));
 			}
 
 		}
 
-		return super.validateDiagramCategories(newCategories);
+		return super.validateArchitectureContexts(newContexts);
 	}
 
 	/**
@@ -152,18 +152,16 @@ public class WorkspaceNewModelStorageProvider extends AbstractNewModelStoragePro
 		// return (newFile == null) ? null :
 	}
 
-	private SelectDiagramCategoryPage createNewDiagramCategoryPage(IStructuredSelection selection) {
+	private SelectArchitectureContextPage createNewArchitectureContextPage(IStructuredSelection selection) {
 		if (wizard.isCreateProjectWizard() || wizard.isCreateMultipleModelsWizard() || !wizard.isPapyrusRootWizard()) {
-
 			return null;
 		}
-		return new SelectDiagramCategoryPage();
+		return new SelectArchitectureContextPage();
 	}
 
 	@Override
-	public SelectDiagramCategoryPage getDiagramCategoryPage() {
-		return this.newDiagramCategoryPage;
+	public SelectArchitectureContextPage getArchitectureContextPage() {
+		return this.newSelectArchitectureContextPage;
 	}
 
-
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/utils/SettingsHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/utils/SettingsHelper.java
index 1f28d479a92..c0784feb83a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/utils/SettingsHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/utils/SettingsHelper.java
@@ -1,216 +1,56 @@
-/*****************************************************************************

- * Copyright (c) 2014 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:

- * Thibault Le Ouay (Sherpa Engineering) t.leouay@sherpa-eng.com  - Initial API and implementation

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.diagram.wizards.utils;

-

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.List;

-import java.util.StringTokenizer;

-

-import org.eclipse.jface.dialogs.IDialogSettings;

-

-

-public class SettingsHelper {

-

-	/** The Constant DIAGRAM_KIND_SEPARATOR. */

-	private static final String DIAGRAM_KIND_SEPARATOR = ","; //$NON-NLS-1$

-

-	/** The Constant TEMPLATE_SEPARATOR. */

-	private static final String TEMPLATE_SEPARATOR = ","; //$NON-NLS-1$

-

-	/** The Constant SETTINGS_KEY_REMEMBER_CURRENT_SELECTION. */

-	private static final String SETTINGS_KEY_REMEMBER_CURRENT_SELECTION = "RememberCurrentSelection"; //$NON-NLS-1$

-

-	/** The Constant SETTINGS_KEY_DIAGRAM_KINDS. */

-	private static final String SETTINGS_KEY_DIAGRAM_KINDS = "DiagramKindsFor_"; //$NON-NLS-1$

-

-	/** The Constant SETTINGS_KEY_DIAGRAM_TEMPLATES. */

-	private static final String SETTINGS_KEY_DIAGRAM_TEMPLATES = "DiagramTemplatesFor_"; //$NON-NLS-1$

-

-	/** The Constant LAST_SELECTED_CATEGORY. */

-	private static final String DIAGRAM_CATEGORIES = "diagramCategory"; //$NON-NLS-1$

-

-	/** The Constant used to access the last selected category */

-	private static final String SETTINGS_KEY_DIAGRAM_CATEGORY = "lastSelectedCategory"; //$NON-NLS-1$

-

-	/** The my settings. */

-	private final IDialogSettings mySettings;

-

-	/**

-	 * Instantiates a new settings utils.

-	 *

-	 * @param settings

-	 *            the settings

-	 */

-	public SettingsHelper(IDialogSettings settings) {

-		mySettings = settings;

-	}

-

-	/**

-	 * Gets the default diagram category.

-	 *

-	 * @return the default diagram category

-	 */

-	public String[] getDefaultDiagramCategories() {

-		return mySettings.getArray(DIAGRAM_CATEGORIES);

-	}

-

-	/**

-	 * Save default diagram category.

-	 *

-	 * @param categories

-	 *            the categories

-	 */

-	public void saveDefaultDiagramCategory(String[] categories) {

-		mySettings.put(DIAGRAM_CATEGORIES, categories);

-	}

-

-	/**

-	 * Gets the default diagram kinds.

-	 *

-	 * @param category

-	 *            the category

-	 * @return the default diagram kinds

-	 */

-	public List<String> getDefaultDiagramKinds(String category) {

-		String csl = mySettings.get(getKeyForDiagramKind(category));

-		if (csl == null || csl.equals("")) { //$NON-NLS-1$

-			return Collections.emptyList();

-		}

-		List<String> result = new ArrayList<String>();

-		StringTokenizer tokenizer = new StringTokenizer(csl, DIAGRAM_KIND_SEPARATOR);

-		while (tokenizer.hasMoreTokens()) {

-			result.add(tokenizer.nextToken().trim());

-		}

-		return result;

-	}

-

-	/**

-	 * Save default diagram kinds.

-	 *

-	 * @param category

-	 *            the category

-	 * @param kinds

-	 *            the kinds

-	 */

-	public void saveDefaultDiagramKinds(String category, List<String> kinds) {

-		String value = ""; //$NON-NLS-1$

-		for (String kind : kinds) {

-			value += kind;

-			value += DIAGRAM_KIND_SEPARATOR;

-		}

-		mySettings.put(getKeyForDiagramKind(category), value);

-	}

-

-	/**

-	 * Gets the default templates.

-	 *

-	 * @param category

-	 *            the category

-	 * @return the default templates

-	 */

-	public List<String> getDefaultTemplates(String category) {

-		String csl = mySettings.get(getKeyForTemplate(category));

-		if (csl == null || csl.equals("")) { //$NON-NLS-1$

-			return Collections.emptyList();

-		}

-		List<String> result = new ArrayList<String>();

-		StringTokenizer tokenizer = new StringTokenizer(csl, TEMPLATE_SEPARATOR);

-		while (tokenizer.hasMoreTokens()) {

-			result.add(tokenizer.nextToken().trim());

-		}

-		return result;

-	}

-

-	/**

-	 * Save default templates.

-	 *

-	 * @param category

-	 *            the category

-	 * @param templates

-	 *            the templates

-	 */

-	public void saveDefaultTemplates(String category, List<String> templates) {

-		String value = ""; //$NON-NLS-1$

-		for (String template : templates) {

-			value += template;

-			value += TEMPLATE_SEPARATOR;

-		}

-		mySettings.put(getKeyForTemplate(category), value);

-	}

-

-	/**

-	 * Save remember current selection.

-	 *

-	 * @param remember

-	 *            the remember

-	 */

-	public void saveRememberCurrentSelection(boolean remember) {

-		mySettings.put(SETTINGS_KEY_REMEMBER_CURRENT_SELECTION, remember);

-	}

-

-	/**

-	 * Remember current selection.

-	 *

-	 * @param settings

-	 *            the settings

-	 * @return true, if successful

-	 */

-	public boolean rememberCurrentSelection(IDialogSettings settings) {

-		return mySettings.getBoolean(SETTINGS_KEY_REMEMBER_CURRENT_SELECTION);

-	}

-

-	/**

-	 * Puts the most recently selected category tag in the settings to retrieve it on the next execution

-	 * 

-	 * @param category

-	 *            The language tag

-	 */

-	public void setCurrentSelection(String category) {

-		mySettings.put(SETTINGS_KEY_DIAGRAM_CATEGORY, category);

-	}

-

-	/**

-	 * Retrieves the most recently selected category tag from the settings

-	 * 

-	 * @return

-	 * 		The category tag

-	 */

-	public String getPreviousSelection() {

-		return mySettings.get(SETTINGS_KEY_DIAGRAM_CATEGORY);

-	}

-

-

-	/**

-	 * Gets the key for diagram kind.

-	 *

-	 * @param category

-	 *            the category

-	 * @return the key for diagram kind

-	 */

-	private String getKeyForDiagramKind(String category) {

-		return SETTINGS_KEY_DIAGRAM_KINDS + category;

-	}

-

-	/**

-	 * Gets the key for template.

-	 *

-	 * @param category

-	 *            the category

-	 * @return the key for template

-	 */

-	private String getKeyForTemplate(String category) {

-		return SETTINGS_KEY_DIAGRAM_TEMPLATES + category;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 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:
+ * Thibault Le Ouay (Sherpa Engineering) t.leouay@sherpa-eng.com  - Initial API and implementation
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.wizards.utils;
+
+import org.eclipse.jface.dialogs.IDialogSettings;
+
+
+public class SettingsHelper {
+
+	/** The Constant ARCHITECTURE_CONTEXTS. */
+	private static final String ARCHITECTURE_CONTEXTS = "architectureContexts"; //$NON-NLS-1$
+
+	/** The my settings. */
+	private final IDialogSettings mySettings;
+
+	/**
+	 * Instantiates a new settings utils.
+	 *
+	 * @param settings
+	 *            the settings
+	 */
+	public SettingsHelper(IDialogSettings settings) {
+		mySettings = settings;
+	}
+
+	/**
+	 * Gets the saved architecture contexts.
+	 *
+	 * @return the saved architecture contexts
+	 */
+	public String[] getArchitectureContexts() {
+		String[] contexts = mySettings.getArray(ARCHITECTURE_CONTEXTS);
+		return (contexts != null) ? contexts : new String[0];
+	}
+
+	/**
+	 * Save the given architecture contexts.
+	 *
+	 * @param contexts
+	 *            the architecture contexts
+	 */
+	public void saveArchitectureContexts(String[] contexts) {
+		mySettings.put(ARCHITECTURE_CONTEXTS, contexts);
+	}
+
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/CreateModelWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/CreateModelWizard.java
index e58e8608847..fb9c9c50299 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/CreateModelWizard.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/CreateModelWizard.java
@@ -1,966 +1,1001 @@
-/*******************************************************************************

- * Copyright (c) 2008, 2016 Obeo, CEA LIST, Christian W. Damus, and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     Obeo - initial API and implementation

- *     Tatiana Fesenko(CEA) - [313179] Refactor CreateModelWizard

- *     Saadia Dhouib (CEA LIST) - Implementation of loading diagrams from template files  (.uml, .di , .notation)

- *     Christian W. Damus (CEA) - create models by URI, not IFile (CDO)

- *     Christian W. Damus (CEA) - Support creating models in repositories (CDO)

- *     Christian W. Damus - bug 490936

- *

- *******************************************************************************/

-package org.eclipse.papyrus.uml.diagram.wizards.wizards;

-

-import static org.eclipse.papyrus.uml.diagram.wizards.Activator.log;

-

-import java.io.IOException;

-import java.util.Arrays;

-import java.util.Collections;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.IExtension;

-import org.eclipse.core.runtime.IExtensionRegistry;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.emf.common.command.CommandStack;

-import org.eclipse.emf.common.ui.URIEditorInput;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.jface.dialogs.IDialogSettings;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.wizard.IWizardPage;

-import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.papyrus.infra.core.editor.BackboneException;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModelUtils;

-import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;

-import org.eclipse.papyrus.infra.core.services.ExtensionServicesRegistry;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.ui.extension.commands.IModelCreationCommand;

-import org.eclipse.papyrus.infra.ui.util.EditorUtils;

-import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;

-import org.eclipse.papyrus.uml.diagram.wizards.Activator;

-import org.eclipse.papyrus.uml.diagram.wizards.category.DiagramCategoryDescriptor;

-import org.eclipse.papyrus.uml.diagram.wizards.category.DiagramCategoryRegistry;

-import org.eclipse.papyrus.uml.diagram.wizards.command.InitFromTemplateCommand;

-import org.eclipse.papyrus.uml.diagram.wizards.command.NewPapyrusModelCommand;

-import org.eclipse.papyrus.uml.diagram.wizards.messages.Messages;

-import org.eclipse.papyrus.uml.diagram.wizards.pages.NewModelFilePage;

-import org.eclipse.papyrus.uml.diagram.wizards.pages.PapyrusProjectCreationPage;

-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramCategoryPage;

-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramKindPage;

-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramKindPage.CategoryProvider;

-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectStorageProviderPage;

-import org.eclipse.papyrus.uml.diagram.wizards.providers.INewModelStorageProvider;

-import org.eclipse.papyrus.uml.diagram.wizards.providers.NewModelStorageProviderRegistry;

-import org.eclipse.papyrus.uml.diagram.wizards.providers.WorkspaceNewModelStorageProvider;

-import org.eclipse.papyrus.uml.diagram.wizards.template.ModelTemplateDescription;

-import org.eclipse.papyrus.uml.diagram.wizards.transformation.IGenerator;

-import org.eclipse.papyrus.uml.tools.commands.ApplyProfileCommand;

-import org.eclipse.papyrus.uml.tools.commands.RenameElementCommand;

-import org.eclipse.papyrus.uml.tools.model.UmlModel;

-import org.eclipse.papyrus.uml.tools.model.UmlUtils;

-import org.eclipse.ui.IEditorDescriptor;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IFileEditorInput;

-import org.eclipse.ui.INewWizard;

-import org.eclipse.ui.IURIEditorInput;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.ide.IDE;

-import org.eclipse.ui.services.IEvaluationService;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Profile;

-

-/**

- * Create new model file and initialize a selected diagram. This wizard create

- * several files :

- * <li>*.di : the DI file to store Di diagrams and references all external diagrams like GMF diagrams.</li>

- * <li>*.notation : the file to store pure GMF diagrams</li>

- * <li>*.uml : the standard UML file to store UML semantics elements. (Model,

- * Package, Class,...)</li>

- *

- * Those files can be used with the PapyrusEditor (see plugin.xml).

- */

-public class CreateModelWizard extends Wizard implements INewWizard {

-

-	/** The Constant WIZARD_ID. */

-	public static final String WIZARD_ID = "org.eclipse.papyrus.uml.diagram.wizards.createmodel"; //$NON-NLS-1$

-

-	/** The Constant NEW_MODEL_SETTINGS. */

-	public static final String NEW_MODEL_SETTINGS = "NewModelWizard"; //$NON-NLS-1$

-

-	private SelectStorageProviderPage selectStorageProviderPage;

-

-	/** Select kind of new diagram the wizard must create. */

-	private SelectDiagramKindPage selectDiagramKindPage;

-

-	/** The select diagram category page. */

-	protected SelectDiagramCategoryPage selectDiagramCategoryPage;

-

-	/** Current workbench. */

-	private IWorkbench workbench;

-

-	private NewModelStorageProviderRegistry storageProviderRegistry;

-

-	private INewModelStorageProvider selectedStorageProvider;

-

-	private Map<INewModelStorageProvider, List<IWizardPage>> providerPages = new java.util.HashMap<INewModelStorageProvider, List<IWizardPage>>();

-

-	private Map<IWizardPage, INewModelStorageProvider> providersByPage = new java.util.HashMap<IWizardPage, INewModelStorageProvider>();

-

-	private int startProviderPageIndex; // index of last page before provider pages

-

-	private int endProviderPageIndex; // index of first page after provider pages

-

-	protected IWizardPage newProjectPage;

-

-	protected static final String EXTENSION_POINT_ID = "org.eclipse.papyrus.uml.diagram.wizards.templates"; //$NON-NLS-1$

-

-	/**

-	 * Instantiates a new creates the model wizard.

-	 */

-	public CreateModelWizard() {

-		super();

-		setWindowTitle(Messages.CreateModelWizard_new_papyrus_model_title);

-		setDefaultPageImageDescriptor(Activator.imageDescriptorFromPlugin(Activator.PLUGIN_ID, "icons/papyrus/PapyrusWizban_75x66.gif")); //$NON-NLS-1$

-		// setHelpAvailable(true);

-

-	}

-

-	/**

-	 * Adds the pages.

-	 *

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void addPages() {

-		// ModelCreation: the selectDiagramCategoryPage exists

-		if (selectedStorageProvider.getDiagramCategoryPage() == null) {

-			addPageIfNotNull(selectDiagramCategoryPage);

-		} else {

-			addPageIfNotNull(selectedStorageProvider.getDiagramCategoryPage());

-		}

-

-		// The selectStorageProviderPage is only set if a model is created, cf initStorageProvider(IWorkbench, IStructuredSelection)

-		// The storage page for a project, newProjectPage, is handled by the PapyrusProjectCreationPage

-		addPageIfNotNull(selectStorageProviderPage);

-		addPageIfNotNull(newProjectPage);

-

-		startProviderPageIndex = getPageCount() - 1;

-		for (INewModelStorageProvider next : getStorageProviders()) {

-			List<IWizardPage> pageList = new java.util.ArrayList<IWizardPage>(3);

-			for (IWizardPage page : next.createPages()) {

-				if (page != null) {

-					pageList.add(page);

-					providersByPage.put(page, next);

-					if (!page.equals(selectedStorageProvider.getDiagramCategoryPage())) {

-						addPage(page);

-					}

-				}

-			}

-			providerPages.put(next, pageList);

-		}

-		endProviderPageIndex = getPageCount();

-

-		addPageIfNotNull(selectDiagramKindPage);

-	}

-

-	protected void setNewProjectPage(IWizardPage page) {

-		this.newProjectPage = page;

-	}

-

-	/**

-	 * Adds the page if not null.

-	 *

-	 * @param page

-	 *            the page

-	 */

-	protected final void addPageIfNotNull(IWizardPage page) {

-		if (page != null) {

-			addPage(page);

-		}

-	}

-

-	public boolean isInitModelWizard() {

-		return false;

-	}

-

-	public boolean isCreateProjectWizard() {

-		return false;

-	}

-

-	public boolean isCreateMultipleModelsWizard() {

-		return false;

-	}

-

-	/**

-	 * Inits the.

-	 *

-	 * @param workbench

-	 *            the workbench

-	 * @param selection

-	 *            the selection {@inheritDoc}

-	 */

-	@Override

-	public void init(IWorkbench workbench, IStructuredSelection selection) {

-		this.workbench = workbench;

-

-		initStorageProvider(workbench, selection);

-

-		IDialogSettings workbenchSettings = Activator.getDefault().getDialogSettings();

-		IDialogSettings section = workbenchSettings.getSection(NEW_MODEL_SETTINGS);

-		if (section == null) {

-			section = workbenchSettings.addNewSection(NEW_MODEL_SETTINGS);

-		}

-		setDialogSettings(section);

-

-		selectStorageProviderPage = createSelectStorageProviderPage();

-

-		for (INewModelStorageProvider next : getStorageProviders()) {

-			next.init(this, selection);

-		}

-

-		selectDiagramKindPage = createSelectDiagramKindPage();

-	}

-

-	/**

-	 * Perform finish.

-	 *

-	 * @return true, if successful {@inheritDoc}

-	 */

-	@Override

-	public boolean performFinish() {

-		String[] diagramCategoryIds = getDiagramCategoryIds();

-		if (diagramCategoryIds.length == 0) {

-			return false;

-		}

-

-		SelectDiagramCategoryPage selectDiagramCategoryPage = getSelectDiagramCategoryPage();

-		if (selectDiagramCategoryPage != null) {

-			selectDiagramCategoryPage.performFinish();

-		}

-

-		String diagramCategoryId = diagramCategoryIds[0];

-		final URI newURI = createNewModelURI(diagramCategoryId);

-

-		createAndOpenPapyrusModel(newURI, diagramCategoryId);

-

-		return true;

-	}

-

-	protected URI createNewModelURI(String diagramCategoryID) {

-		return getSelectedStorageProvider().createNewModelURI(diagramCategoryID);

-	}

-

-	/**

-	 * Creates the and open papyrus model.

-	 *

-	 * @param modelSet

-	 *            the di resource set

-	 * @param newURI

-	 *            the URI of the new model's principal resource

-	 * @param diagramCategoryId

-	 *            the diagram category id

-	 * @return true, if successful

-	 */

-	protected boolean createAndOpenPapyrusModel(URI newURI, String diagramCategoryId) {

-

-		if (newURI == null) {

-			return false;

-		}

-

-		ServicesRegistry registry = createServicesRegistry();

-		if (registry == null) {

-			return false;

-		}

-

-		try {

-			// have to create the model set and populate it with the DI model

-			// before initializing other services that actually need the DI

-			// model, such as the SashModel Manager service

-			ModelSet modelSet = registry.getService(ModelSet.class);

-

-			createPapyrusModels(modelSet, newURI);

-

-			initServicesRegistry(registry);

-

-			initDomainModel(modelSet, newURI, diagramCategoryId);

-

-			initDiagramModel(modelSet, diagramCategoryId);

-

-			initProfile(modelSet);

-

-			initTemplate(modelSet);

-

-			saveDiagram(modelSet);

-

-			openDiagram(newURI);

-

-		} catch (ServiceException e) {

-			Activator.log.error(e);

-			this.selectDiagramKindPage.setErrorMessage(e.getMessage());

-			return false;

-

-		} finally {

-			try {

-				registry.disposeRegistry();

-			} catch (ServiceException ex) {

-				// Ignore

-			}

-		}

-

-		return true;

-	}

-

-	private void initProfile(ModelSet modelSet) {

-		boolean isToApplyProfile = selectDiagramKindPage.getProfileURI() != null;

-		boolean isProfileDefined = selectDiagramKindPage.getProfileDefinitionStatus().isOK();

-		if (isToApplyProfile & isProfileDefined) {

-			applyProfile(modelSet);

-		}

-	}

-

-	private void initTemplate(ModelSet modelSet) {

-		boolean isToInitFromTemplateTransfo = selectDiagramKindPage.getTemplateTransfo().size() > 0;

-		if (isToInitFromTemplateTransfo) {

-			applyTemplateTransfo(modelSet);

-		}

-	}

-

-	protected ServicesRegistry createServicesRegistry() {

-		ServicesRegistry result = null;

-

-		try {

-			result = new ExtensionServicesRegistry(org.eclipse.papyrus.infra.core.Activator.PLUGIN_ID);

-		} catch (ServiceException e) {

-			// couldn't create the registry? Fatal problem

-			Activator.log.error(e);

-		}

-

-		try {

-			// have to create the model set and populate it with the DI model

-			// before initializing other services that actually need the DI

-			// model, such as the SashModel Manager service

-			result.startServicesByClassKeys(ModelSet.class);

-		} catch (ServiceException ex) {

-			// Ignore this exception: some services may not have been loaded,

-			// which is probably normal at this point

-		}

-

-		return result;

-	}

-

-	protected void initServicesRegistry(ServicesRegistry registry) throws ServiceException {

-		try {

-			registry.startRegistry();

-		} catch (ServiceException ex) {

-			// Ignore this exception: some services may not have been loaded,

-			// which is probably normal at this point

-		}

-

-		registry.getService(IPageManager.class);

-	}

-

-	/**

-	 * Gets the diagram category ids.

-	 *

-	 * @return the diagram category ids

-	 */

-	protected String[] getDiagramCategoryIds() {

-		SelectDiagramCategoryPage page = getSelectDiagramCategoryPage();

-		if (page != null) {

-			return page.getDiagramCategories();

-		}

-		return null;

-	}

-

-	private SelectDiagramCategoryPage getSelectDiagramCategoryPage() {

-		return (selectDiagramCategoryPage != null)

-				? selectDiagramCategoryPage

-				: (selectedStorageProvider != null)

-						? selectedStorageProvider.getDiagramCategoryPage()

-						: null;

-	}

-

-	/**

-	 * Gets the diagram file extension.

-	 *

-	 * @param diagramCategoryId

-	 *            the diagram category id

-	 * @return the diagram file extension

-	 */

-	public String getDiagramFileExtension(String diagramCategoryId) {

-		return getDiagramFileExtension(diagramCategoryId, NewModelFilePage.DEFAULT_DIAGRAM_EXTENSION);

-	}

-

-	/**

-	 * Gets the diagram file extension.

-	 *

-	 * @param categoryId

-	 *            the category id

-	 * @param defaultExtension

-	 *            the default extension

-	 * @return the diagram file extension

-	 */

-	public String getDiagramFileExtension(String categoryId, String defaultExtension) {

-		DiagramCategoryDescriptor diagramCategory = getDiagramCategoryMap().get(categoryId);

-		String extensionPrefix = diagramCategory != null ? diagramCategory.getExtensionPrefix() : null;

-		return (extensionPrefix != null) ? extensionPrefix + "." + defaultExtension : defaultExtension; //$NON-NLS-1$

-	}

-

-	/**

-	 * Creates the select diagram category page.

-	 *

-	 * @return the select diagram category page

-	 */

-	protected SelectDiagramCategoryPage createSelectDiagramCategoryPage() {

-		return new SelectDiagramCategoryPage();

-	}

-

-	/**

-	 * Creates the select diagram kind page.

-	 *

-	 * @return the select diagram kind page

-	 */

-	protected SelectDiagramKindPage createSelectDiagramKindPage() {

-		return new SelectDiagramKindPage(new CategoryProvider() {

-

-			@Override

-			public String[] getCurrentCategories() {

-				return getDiagramCategoryIds();

-			}

-

-		});

-	}

-

-	/**

-	 * Inits the domain model.

-	 *

-	 * @param modelSet

-	 *            the di resource set

-	 * @param newURI

-	 *            the URI of the new model's principal resource

-	 * @param diagramCategoryId

-	 *            the diagram category id

-	 */

-	protected void initDomainModel(ModelSet modelSet, final URI newURI, String diagramCategoryId) {

-

-		boolean isToInitFromTemplate = selectDiagramKindPage.getTemplatePath() != null;

-		if (isToInitFromTemplate) {

-			initDomainModelFromTemplate(modelSet);

-		} else {

-			createEmptyDomainModel(modelSet, diagramCategoryId);

-		}

-	}

-

-	protected void applyProfile(ModelSet modelSet) {

-		String profilePath = selectDiagramKindPage.getProfileURI();

-		Resource resource = modelSet.getResource(URI.createURI(profilePath), true);

-		Profile profileToApply = (Profile) resource.getContents().get(0);

-

-		Resource myModelUMLResource = UmlUtils.getUmlResource(modelSet);

-		org.eclipse.uml2.uml.Package manipulatedModel = (org.eclipse.uml2.uml.Package) myModelUMLResource.getContents().get(0);

-

-		RecordingCommand applyProfileCommand = new ApplyProfileCommand(manipulatedModel, profileToApply, modelSet.getTransactionalEditingDomain());

-		getCommandStack(modelSet).execute(applyProfileCommand);

-	}

-

-	protected void applyTemplateTransfo(ModelSet modelSet) {

-		List<ModelTemplateDescription> templateList = selectDiagramKindPage.getTemplateTransfo();

-		// // This is an example of the use of QVT Transformations

-		// QVToGenerator generator = new QVToGenerator();

-		//

-		// for (final ModelTemplateDescription currentTemplate : templateList) {

-		// // fetches the tranformation URI encoded in the extension point, if it has that attribute

-		// // generator.setTransformationURI(URI.createPlatformPluginURI("org.eclipse.papyrus.uml.diagram.wizards/transforms/UMLCopyTemplateTransfo.qvto", true));//$NON-NLS-1$

-		// generator.setTransformationURI(URI.createPlatformPluginURI(currentTemplate.getTransfoURI(), true));

-		// generator.setModelSet(modelSet);

-		// generator.setTemplateModel(currentTemplate.getUml_path());

-		// generator.setPluginId(currentTemplate.getPluginId());

-		// generator.execute();

-		// }

-

-		// This is an example of transformations without using the QVToGenerator

-		// TODO make it prettier

-		IExtensionRegistry registry = Platform.getExtensionRegistry();

-		// get all the extensions configured into the extension point corresponding to the 'templates' Point ID from the 'org.eclipse.papyrus.uml.diagram.wizards' plugin

-		IExtension[] extensions = registry.getExtensionPoint(EXTENSION_POINT_ID).getExtensions();

-

-		for (IExtension extension : extensions) {

-			for (IConfigurationElement configElement : extension.getConfigurationElements()) {

-				if ("template".equals(configElement.getName())) { //$NON-NLS-1$

-					// not handled here

-				} else if ("transformation".equals(configElement.getName())) { //$NON-NLS-1$

-					for (ModelTemplateDescription currentTemplate : templateList) {

-						if (currentTemplate.getName().equals(configElement.getAttribute("name"))) { //$NON-NLS-1$

-							IGenerator iGenerator;

-							try {

-								iGenerator = (IGenerator) configElement.createExecutableExtension("Transformation"); //$NON-NLS-1$

-								iGenerator.setModelSet(modelSet);

-								iGenerator.execute();

-							} catch (CoreException e) {

-								Activator.log.error(e);

-							}

-						}

-					}

-

-				}

-			}

-		}

-

-	}

-

-	/**

-	 * Inits the domain model from template.

-	 *

-	 * @param modelSet

-	 *            the di resource set

-	 */

-	protected void initDomainModelFromTemplate(ModelSet modelSet) {

-		getCommandStack(modelSet).execute(

-				new InitFromTemplateCommand(modelSet.getTransactionalEditingDomain(), modelSet, selectDiagramKindPage.getTemplatePluginId(), selectDiagramKindPage.getTemplatePath(), selectDiagramKindPage.getNotationTemplatePath(), selectDiagramKindPage

-						.getDiTemplatePath()));

-	}

-

-	/**

-	 * Creates the empty domain model.

-	 *

-	 * @param modelSet

-	 *            the di resource set

-	 * @param diagramCategoryId

-	 *            the diagram category id

-	 */

-	protected void createEmptyDomainModel(ModelSet modelSet, String diagramCategoryId) {

-		try {

-			IModelCreationCommand creationCommand = getDiagramCategoryMap().get(diagramCategoryId).getCommand();

-			creationCommand.createModel(modelSet);

-		} catch (BackboneException e) {

-			log.error(e);

-		}

-	}

-

-	/**

-	 * Creates the papyrus models.

-	 *

-	 * @param modelSet

-	 *            the di resource set

-	 * @param newURI

-	 *            the URI of the new model's principal resource

-	 */

-	protected void createPapyrusModels(ModelSet modelSet, URI newURI) {

-		RecordingCommand command = new NewPapyrusModelCommand(modelSet, newURI);

-		getCommandStack(modelSet).execute(command);

-	}

-

-

-	/**

-	 * Open diagram.

-	 *

-	 * @param newURI

-	 *            the URI of the new model's principal resource

-	 */

-	protected void openDiagram(final URI newURI) {

-		IWorkbenchPage page = workbench.getActiveWorkbenchWindow().getActivePage();

-		if (page != null) {

-			try {

-				IEditorInput editorInput = createEditorInput(newURI);

-				IDE.openEditor(page, editorInput, getPreferredEditorID(editorInput), true);

-			} catch (PartInitException e) {

-				log.error(e);

-			}

-		}

-	}

-

-	protected IEditorInput createEditorInput(URI uri) {

-		return getSelectedStorageProvider().createEditorInput(uri);

-	}

-

-	protected String getPreferredEditorID(IEditorInput input) throws PartInitException {

-		IEditorDescriptor desc;

-

-		if (input instanceof IFileEditorInput) {

-			desc = IDE.getEditorDescriptor(((IFileEditorInput) input).getFile());

-		} else {

-			// try to get a URI

-			URI uri = null;

-			if (input instanceof IURIEditorInput) {

-				uri = URI.createURI(((IURIEditorInput) input).getURI().toString(), true);

-			} else if (input instanceof URIEditorInput) {

-				uri = ((URIEditorInput) input).getURI();

-			}

-

-			if (uri != null) {

-				desc = IDE.getEditorDescriptor(uri.lastSegment());

-			} else {

-				// hope that the input name is the file name

-				desc = IDE.getEditorDescriptor(input.getName());

-			}

-		}

-

-		return (desc == null) ? "org.eclipse.papyrus.infra.core.papyrusEditor" : desc.getId(); //$NON-NLS-1$

-	}

-

-	/**

-	 * Inits the diagram model.

-	 *

-	 * @param modelSet

-	 *            the di resource set

-	 * @param categoryId

-	 *            the category id

-	 */

-	protected void initDiagramModel(ModelSet modelSet, String categoryId) {

-		initDiagrams(modelSet, categoryId);

-	}

-

-

-	/**

-	 * Save diagram.

-	 *

-	 * @param modelSet

-	 *            the di resource set

-	 */

-	private void saveDiagram(ModelSet modelSet) {

-		// TODO verify that there are no conflicts with the existing files and the newly created one

-		try {

-			modelSet.save(new NullProgressMonitor());

-		} catch (IOException e) {

-			log.error(e);

-		}

-	}

-

-	/**

-	 * Inits the diagrams.

-	 *

-	 * @param modelSet

-	 *            the di resource set

-	 * @param categoryId

-	 *            the category id

-	 */

-	protected void initDiagrams(ModelSet modelSet, String categoryId) {

-		initDiagrams(modelSet, null, categoryId);

-	}

-

-	/**

-	 * Inits the diagrams.

-	 *

-	 * @param resourceSet

-	 *            the resource set

-	 * @param root

-	 *            the root

-	 * @param categoryId

-	 *            the category id

-	 */

-	protected void initDiagrams(ModelSet resourceSet, EObject root, String categoryId) {

-		UmlModel model = (UmlModel) resourceSet.getModel(UmlModel.MODEL_ID);

-		EList<EObject> roots = model.getResource().getContents();

-		if (!roots.isEmpty()) {

-			root = roots.get(0);

-			if (root instanceof NamedElement) {

-				getCommandStack(resourceSet).execute(new RenameElementCommand(resourceSet.getTransactionalEditingDomain(), (NamedElement) root, getRootElementName()));

-

-			}

-

-		}

-		List<ViewPrototype> creationCommands = getPrototypesFor(categoryId);

-		List<String> diagramName = selectDiagramKindPage.getDiagramName();

-		if (creationCommands.isEmpty()) {

-			createEmptyDiagramEditor(resourceSet);

-		} else {

-			for (int i = 0; i < creationCommands.size(); i++) {

-				creationCommands.get(i).instantiateOn(root, diagramName.get(i));

-			}

-		}

-	}

-

-	/**

-	 * Gets the diagram kinds for.

-	 *

-	 * @param categoryId

-	 *            the category id

-	 * @return the diagram kinds for

-	 */

-	protected List<ViewPrototype> getPrototypesFor(String categoryId) {

-		return selectDiagramKindPage.getSelectedPrototypes(categoryId);

-	}

-

-

-	protected List<String> getDiagramNames() {

-		return selectDiagramKindPage.getDiagramName();

-	}

-

-	protected String getRootElementName() {

-		return selectDiagramKindPage.getRootElementName();

-	}

-

-	/**

-	 * Creates the empty diagram editor.

-	 *

-	 * @param modelSet

-	 *            the model set

-	 */

-	private void createEmptyDiagramEditor(ModelSet modelSet) {

-		// Create an empty editor (no diagrams opened)

-		// Geting an IPageMngr is enough to initialize the

-		// SashSystem.

-		EditorUtils.getIPageMngr(DiModelUtils.getDiResource(modelSet));

-	}

-

-	/**

-	 * Gets the command stack.

-	 *

-	 * @param modelSet

-	 *            the model set

-	 * @return the command stack

-	 */

-	protected final CommandStack getCommandStack(ModelSet modelSet) {

-		return modelSet.getTransactionalEditingDomain().getCommandStack();

-	}

-

-	/**

-	 * Gets the diagram category map.

-	 *

-	 * @return the diagram category map

-	 */

-	protected Map<String, DiagramCategoryDescriptor> getDiagramCategoryMap() {

-		return DiagramCategoryRegistry.getInstance().getDiagramCategoryMap();

-	}

-

-	/**

-	 * Diagram category changed.

-	 *

-	 * @param newCategories

-	 *            the new categories

-	 * @return the i status

-	 */

-	public IStatus diagramCategoryChanged(String... newCategories) {

-		return getSelectedStorageProvider().validateDiagramCategories(newCategories);

-	}

-

-	protected void initStorageProvider(IWorkbench workbench, IStructuredSelection selection) {

-

-		NewModelStorageProviderRegistry registry = new NewModelStorageProviderRegistry(workbench.getService(IEvaluationService.class));

-

-		// if we are creating a project, then it is in the workspace

-		if (isCreateProjectWizard()) {

-			this.selectedStorageProvider = new WorkspaceNewModelStorageProvider();

-		} else {

-			// look for a pre-determined selection

-			INewModelStorageProvider firstProvider = null;

-			for (INewModelStorageProvider next : registry) {

-				if (firstProvider == null) {

-					firstProvider = next;

-				}

-

-				// don't match on empty selections because there is

-				// then no context to match against

-				if (!selection.isEmpty() && next.canHandle(selection)) {

-					this.selectedStorageProvider = next;

-					break;

-				}

-			}

-

-			// if the choice is pre-determined, don't show the selection page

-			if (this.selectedStorageProvider == null) {

-				this.selectedStorageProvider = firstProvider;

-

-				// don't need the selection page if only one choice

-				if (registry.size() > 1) {

-					this.storageProviderRegistry = registry;

-				}

-			}

-		}

-	}

-

-	protected SelectStorageProviderPage createSelectStorageProviderPage() {

-		SelectStorageProviderPage result = (storageProviderRegistry == null) ? null : new SelectStorageProviderPage(storageProviderRegistry);

-

-		if (result != null) {

-			result.addSelectionChangedListener(new ISelectionChangedListener() {

-

-				@Override

-				public void selectionChanged(SelectionChangedEvent event) {

-					INewModelStorageProvider provider = (INewModelStorageProvider) ((IStructuredSelection) event.getSelection()).getFirstElement();

-					setSelectedStorageProvider(provider);

-				}

-			});

-		}

-

-		return result;

-	}

-

-	protected Iterable<? extends INewModelStorageProvider> getStorageProviders() {

-		Iterable<? extends INewModelStorageProvider> result;

-

-		if (storageProviderRegistry != null) {

-			result = storageProviderRegistry;

-		} else if (selectedStorageProvider != null) {

-			result = Collections.singletonList(selectedStorageProvider);

-		} else {

-			result = Collections.emptyList();

-		}

-

-		return result;

-	}

-

-	protected INewModelStorageProvider getSelectedStorageProvider() {

-		return selectedStorageProvider;

-	}

-

-	private void setSelectedStorageProvider(INewModelStorageProvider provider) {

-		this.selectedStorageProvider = provider;

-

-		// recompute next/previous buttons

-		getContainer().updateButtons();

-	}

-

-	@Override

-	public IWizardPage getNextPage(IWizardPage page) {

-		final List<IWizardPage> allPages = Arrays.asList(getPages());

-		IWizardPage result = null;

-

-		INewModelStorageProvider provider = providersByPage.get(page);

-		if (provider != null) {

-			// it's contributed by a provider. Get the next in the list

-			List<IWizardPage> pages = providerPages.get(provider);

-			int index = pages.indexOf(page);

-			if ((index >= 0) && (index < (pages.size() - 1))) {

-				result = pages.get(index + 1);

-			} else {

-				// get the first page after the provider pages

-				if (endProviderPageIndex < allPages.size()) {

-					result = allPages.get(endProviderPageIndex);

-				}

-			}

-		} else if (allPages.indexOf(page) == startProviderPageIndex) {

-			// get the first page of the selected provider

-			List<IWizardPage> pages = providerPages.get(getSelectedStorageProvider());

-			if (!pages.isEmpty()) {

-				result = pages.get(0);

-			} else {

-				// get the first page after the provider pages

-				if (endProviderPageIndex < allPages.size()) {

-					result = allPages.get(endProviderPageIndex);

-				}

-			}

-		} else {

-			// somewhere away from the boundary of the provider pages

-			result = super.getNextPage(page);

-		}

-

-		return result;

-	}

-

-	@Override

-	public IWizardPage getPreviousPage(IWizardPage page) {

-		final List<IWizardPage> allPages = Arrays.asList(getPages());

-		IWizardPage result = null;

-

-		INewModelStorageProvider provider = providersByPage.get(page);

-		if (provider != null) {

-			// it's contributed by a provider. Get the previous in the list

-			List<IWizardPage> pages = providerPages.get(provider);

-			int index = pages.indexOf(page);

-			if (index > 0) {

-				result = pages.get(index - 1);

-			} else {

-				// get the last page before the provider pages

-				if (startProviderPageIndex > 0) {

-					result = allPages.get(startProviderPageIndex - 1);

-				}

-			}

-		} else if (allPages.indexOf(page) == endProviderPageIndex) {

-			// get the last page of the selected provider

-			List<IWizardPage> pages = providerPages.get(getSelectedStorageProvider());

-			if (!pages.isEmpty()) {

-				result = pages.get(pages.size() - 1);

-			} else {

-				// get the last page before the provider pages

-				if (startProviderPageIndex >= 0) {

-					result = allPages.get(startProviderPageIndex);

-				}

-			}

-		} else {

-			// somewhere away from the boundary of the provider pages

-			result = super.getPreviousPage(page);

-		}

-

-		return result;

-	}

-

-	@Override

-	public boolean canFinish() {

-		boolean result = true;

-		final IWizardPage[] allPages = getPages();

-

-		// only look at the universal pages and those contributed by the current

-		// storage provider

-

-		for (int i = 0; result && (i <= startProviderPageIndex); i++) {

-			result = allPages[i].isPageComplete();

-		}

-

-		if (result) {

-			for (IWizardPage next : providerPages.get(selectedStorageProvider)) {

-				if (!next.isPageComplete()) {

-					result = false;

-					break;

-				}

-			}

-		}

-

-		for (int i = endProviderPageIndex; result && (i < allPages.length); i++) {

-			result = allPages[i].isPageComplete();

-		}

-

-		// This takes care of the case problems when creating a model with the same name but different case

-		for (IWizardPage page : allPages) {

-			if (page instanceof NewModelFilePage) {

-				return page.canFlipToNextPage();

-			}

-			if (page instanceof PapyrusProjectCreationPage) {

-				return page.canFlipToNextPage();

-			}

-		}

-

-		return result;

-	}

-

-	/**

-	 * Queries the user-presentable (translatable) name of the kind of model

-	 * that I create. For example, "Papyrus UML" or "Papyrus SysML".

-	 *

-	 * @return my model kind name

-	 */

-	public String getModelKindName() {

-		return "Papyrus"; //$NON-NLS-1$

-	}

-

-	@Deprecated

-	protected void saveDiagramCategorySettings() {

-

-	}

-

-	public boolean isPapyrusRootWizard() {

-		// this.getClass().getName().equals(anObject)

-		return true;

-	}

-

-

-}

+/*******************************************************************************
+ * Copyright (c) 2008, 2016 Obeo, CEA LIST, Christian W. Damus, and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Obeo - initial API and implementation
+ *     Tatiana Fesenko(CEA) - [313179] Refactor CreateModelWizard
+ *     Saadia Dhouib (CEA LIST) - Implementation of loading diagrams from template files  (.uml, .di , .notation)
+ *     Christian W. Damus (CEA) - create models by URI, not IFile (CDO)
+ *     Christian W. Damus (CEA) - Support creating models in repositories (CDO)
+ *     Christian W. Damus - bug 490936
+ *
+ *******************************************************************************/
+package org.eclipse.papyrus.uml.diagram.wizards.wizards;
+
+import static org.eclipse.papyrus.uml.diagram.wizards.Activator.log;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtension;
+import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.emf.common.ui.URIEditorInput;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.wizard.IWizardPage;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.papyrus.infra.core.architecture.RepresentationKind;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureContext;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureViewpoint;
+import org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind;
+import org.eclipse.papyrus.infra.architecture.ArchitectureDomainManager;
+import org.eclipse.papyrus.infra.architecture.ArchitectureDescriptionUtils;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModelUtils;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.core.services.ExtensionServicesRegistry;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.ui.util.EditorUtils;
+import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
+import org.eclipse.papyrus.uml.diagram.wizards.Activator;
+import org.eclipse.papyrus.uml.diagram.wizards.command.InitFromTemplateCommand;
+import org.eclipse.papyrus.uml.diagram.wizards.command.NewPapyrusModelCommand;
+import org.eclipse.papyrus.uml.diagram.wizards.messages.Messages;
+import org.eclipse.papyrus.uml.diagram.wizards.pages.NewModelFilePage;
+import org.eclipse.papyrus.uml.diagram.wizards.pages.PapyrusProjectCreationPage;
+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectArchitectureContextPage;
+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectRepresentationKindPage;
+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectRepresentationKindPage.ViewpointProvider;
+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectStorageProviderPage;
+import org.eclipse.papyrus.uml.diagram.wizards.providers.INewModelStorageProvider;
+import org.eclipse.papyrus.uml.diagram.wizards.providers.NewModelStorageProviderRegistry;
+import org.eclipse.papyrus.uml.diagram.wizards.providers.WorkspaceNewModelStorageProvider;
+import org.eclipse.papyrus.uml.diagram.wizards.template.ModelTemplateDescription;
+import org.eclipse.papyrus.uml.diagram.wizards.transformation.IGenerator;
+import org.eclipse.papyrus.uml.tools.commands.ApplyProfileCommand;
+import org.eclipse.papyrus.uml.tools.commands.RenameElementCommand;
+import org.eclipse.papyrus.uml.tools.model.UmlModel;
+import org.eclipse.papyrus.uml.tools.model.UmlUtils;
+import org.eclipse.ui.IEditorDescriptor;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IURIEditorInput;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.ide.IDE;
+import org.eclipse.ui.services.IEvaluationService;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.Profile;
+
+/**
+ * Create new model file and initialize a selected diagram. This wizard create
+ * several files :
+ * <li>*.di : the DI file to store Di diagrams and references all external diagrams like GMF diagrams.</li>
+ * <li>*.notation : the file to store pure GMF diagrams</li>
+ * <li>*.uml : the standard UML file to store UML semantics elements. (Model,
+ * Package, Class,...)</li>
+ *
+ * Those files can be used with the PapyrusEditor (see plugin.xml).
+ */
+public class CreateModelWizard extends Wizard implements INewWizard {
+
+	/** The Constant WIZARD_ID. */
+	public static final String WIZARD_ID = "org.eclipse.papyrus.uml.diagram.wizards.createmodel"; //$NON-NLS-1$
+
+	/** The Constant NEW_MODEL_SETTINGS. */
+	public static final String NEW_MODEL_SETTINGS = "NewModelWizard"; //$NON-NLS-1$
+
+	private SelectStorageProviderPage selectStorageProviderPage;
+
+	/** Select kind of new diagram the wizard must create. */
+	private SelectRepresentationKindPage selectRepresentationKindPage;
+
+	/** The select architecture context page. */
+	protected SelectArchitectureContextPage selectArchitectureContextPage;
+
+	/** Current workbench. */
+	private IWorkbench workbench;
+
+	private NewModelStorageProviderRegistry storageProviderRegistry;
+
+	private INewModelStorageProvider selectedStorageProvider;
+
+	private Map<INewModelStorageProvider, List<IWizardPage>> providerPages = new java.util.HashMap<INewModelStorageProvider, List<IWizardPage>>();
+
+	private Map<IWizardPage, INewModelStorageProvider> providersByPage = new java.util.HashMap<IWizardPage, INewModelStorageProvider>();
+
+	private int startProviderPageIndex; // index of last page before provider pages
+
+	private int endProviderPageIndex; // index of first page after provider pages
+
+	protected IWizardPage newProjectPage;
+
+	protected static final String EXTENSION_POINT_ID = "org.eclipse.papyrus.uml.diagram.wizards.templates"; //$NON-NLS-1$
+
+	/**
+	 * Instantiates a new creates the model wizard.
+	 */
+	public CreateModelWizard() {
+		super();
+		setWindowTitle(Messages.CreateModelWizard_new_papyrus_model_title);
+		setDefaultPageImageDescriptor(Activator.imageDescriptorFromPlugin(Activator.PLUGIN_ID, "icons/papyrus/PapyrusWizban_75x66.gif")); //$NON-NLS-1$
+		// setHelpAvailable(true);
+
+	}
+
+	/**
+	 * Adds the pages.
+	 *
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void addPages() {
+		// ModelCreation: the selectDiagramCategoryPage exists
+		if (selectedStorageProvider.getArchitectureContextPage() != null) {
+			addPageIfNotNull(selectedStorageProvider.getArchitectureContextPage());
+		} else {
+			addPageIfNotNull(selectArchitectureContextPage);
+		}
+
+		// The selectStorageProviderPage is only set if a model is created, cf initStorageProvider(IWorkbench, IStructuredSelection)
+		// The storage page for a project, newProjectPage, is handled by the PapyrusProjectCreationPage
+		addPageIfNotNull(selectStorageProviderPage);
+		addPageIfNotNull(newProjectPage);
+
+		startProviderPageIndex = getPageCount() - 1;
+		for (INewModelStorageProvider next : getStorageProviders()) {
+			List<IWizardPage> pageList = new java.util.ArrayList<IWizardPage>(3);
+			for (IWizardPage page : next.createPages()) {
+				if (page != null) {
+					pageList.add(page);
+					providersByPage.put(page, next);
+					if (!page.equals(selectedStorageProvider.getArchitectureContextPage())) {
+						addPage(page);
+					}
+				}
+			}
+			providerPages.put(next, pageList);
+		}
+		endProviderPageIndex = getPageCount();
+
+		addPageIfNotNull(selectRepresentationKindPage);
+	}
+
+	protected void setNewProjectPage(IWizardPage page) {
+		this.newProjectPage = page;
+	}
+
+	/**
+	 * Adds the page if not null.
+	 *
+	 * @param page
+	 *            the page
+	 */
+	protected final void addPageIfNotNull(IWizardPage page) {
+		if (page != null) {
+			addPage(page);
+		}
+	}
+
+	public boolean isInitModelWizard() {
+		return false;
+	}
+
+	public boolean isCreateProjectWizard() {
+		return false;
+	}
+
+	public boolean isCreateMultipleModelsWizard() {
+		return false;
+	}
+
+	/**
+	 * Inits the.
+	 *
+	 * @param workbench
+	 *            the workbench
+	 * @param selection
+	 *            the selection {@inheritDoc}
+	 */
+	@Override
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		this.workbench = workbench;
+
+		initStorageProvider(workbench, selection);
+
+		IDialogSettings workbenchSettings = Activator.getDefault().getDialogSettings();
+		IDialogSettings section = workbenchSettings.getSection(NEW_MODEL_SETTINGS);
+		if (section == null) {
+			section = workbenchSettings.addNewSection(NEW_MODEL_SETTINGS);
+		}
+		setDialogSettings(section);
+
+		selectStorageProviderPage = createSelectStorageProviderPage();
+
+		for (INewModelStorageProvider next : getStorageProviders()) {
+			next.init(this, selection);
+		}
+
+		selectRepresentationKindPage = createSelectRepresentationKindPage();
+	}
+
+	/**
+	 * Perform finish.
+	 *
+	 * @return true, if successful {@inheritDoc}
+	 */
+	@Override
+	public boolean performFinish() {
+		String[] contextIds = getSelectedContexts();
+		if (contextIds.length == 0) {
+			return false;
+		}
+
+		SelectArchitectureContextPage selectArchitectureContextPage = getSelectArchitectureContextPage();
+		if (selectArchitectureContextPage != null) {
+			selectArchitectureContextPage.performFinish();
+		}
+
+		String contextId = contextIds[0];
+		final URI newURI = createNewModelURI(contextId);
+
+		String[] viewpointIds = getSelectedViewpoints(contextId);
+		createAndOpenPapyrusModel(newURI, contextId, viewpointIds);
+
+		return true;
+	}
+
+	protected URI createNewModelURI(String contextId) {
+		return getSelectedStorageProvider().createNewModelURI(contextId);
+	}
+
+	/**
+	 * Creates the and open papyrus model.
+	 *
+	 * @param modelSet
+	 *            the di resource set
+	 * @param newURI
+	 *            the URI of the new model's principal resource
+	 * @param contextId
+	 *            the architecture context id
+	 * @param viewpointIds
+	 * 			  the architecture viewpoint ids
+	 * @return true, if successful
+	 */
+	protected boolean createAndOpenPapyrusModel(URI newURI, String contextId, String[] viewpointIds) {
+
+		if (newURI == null) {
+			return false;
+		}
+
+		ServicesRegistry registry = createServicesRegistry();
+		if (registry == null) {
+			return false;
+		}
+
+		try {
+			// have to create the model set and populate it with the DI model
+			// before initializing other services that actually need the DI
+			// model, such as the SashModel Manager service
+			ModelSet modelSet = registry.getService(ModelSet.class);
+
+			createPapyrusModels(modelSet, newURI);
+
+			initServicesRegistry(registry);
+
+			initDomainModel(modelSet, contextId, viewpointIds);
+
+			initDiagramModel(modelSet, contextId);
+
+			initProfile(modelSet);
+
+			initTemplate(modelSet);
+
+			saveDiagram(modelSet);
+
+			openDiagram(newURI);
+
+		} catch (ServiceException e) {
+			Activator.log.error(e);
+			this.selectRepresentationKindPage.setErrorMessage(e.getMessage());
+			return false;
+
+		} finally {
+			try {
+				registry.disposeRegistry();
+			} catch (ServiceException ex) {
+				// Ignore
+			}
+		}
+
+		return true;
+	}
+
+	private void initProfile(ModelSet modelSet) {
+		boolean isToApplyProfile = selectRepresentationKindPage.getProfileURI() != null;
+		boolean isProfileDefined = selectRepresentationKindPage.getProfileDefinitionStatus().isOK();
+		if (isToApplyProfile & isProfileDefined) {
+			applyProfile(modelSet);
+		}
+	}
+
+	private void initTemplate(ModelSet modelSet) {
+		boolean isToInitFromTemplateTransfo = selectRepresentationKindPage.getTemplateTransfo().size() > 0;
+		if (isToInitFromTemplateTransfo) {
+			applyTemplateTransfo(modelSet);
+		}
+	}
+
+	protected ServicesRegistry createServicesRegistry() {
+		ServicesRegistry result = null;
+
+		try {
+			result = new ExtensionServicesRegistry(org.eclipse.papyrus.infra.core.Activator.PLUGIN_ID);
+		} catch (ServiceException e) {
+			// couldn't create the registry? Fatal problem
+			Activator.log.error(e);
+		}
+
+		try {
+			// have to create the model set and populate it with the DI model
+			// before initializing other services that actually need the DI
+			// model, such as the SashModel Manager service
+			result.startServicesByClassKeys(ModelSet.class);
+		} catch (ServiceException ex) {
+			// Ignore this exception: some services may not have been loaded,
+			// which is probably normal at this point
+		}
+
+		return result;
+	}
+
+	protected void initServicesRegistry(ServicesRegistry registry) throws ServiceException {
+		try {
+			registry.startRegistry();
+		} catch (ServiceException ex) {
+			// Ignore this exception: some services may not have been loaded,
+			// which is probably normal at this point
+		}
+
+		registry.getService(IPageManager.class);
+	}
+
+	/**
+	 * Gets the selected context ids.
+	 *
+	 * @return the context ids
+	 */
+	protected String[] getSelectedContexts() {
+		SelectArchitectureContextPage page = getSelectArchitectureContextPage();
+		if (page != null) {
+			return page.getSelectedContexts();
+		}
+		return null;
+	}
+
+	/**
+	 * Gets the viewpoint ids.
+	 *
+	 * @return the viewpoint ids
+	 */
+	protected String[] getSelectedViewpoints() {
+		SelectArchitectureContextPage page = getSelectArchitectureContextPage();
+		if (page != null) {
+			return page.getSelectViewpoints();
+		}
+		return null;
+	}
+
+	/**
+	 * Gets the viewpoint ids.
+	 *
+	 * @return the viewpoint ids
+	 */
+	protected String[] getSelectedViewpoints(String contextId) {
+		ArchitectureDomainManager manager = ArchitectureDomainManager.getInstance();
+		MergedArchitectureContext context = manager.getArchitectureContextById(contextId);
+		List<String> availableViewpoints = new ArrayList<String>();
+		for (MergedArchitectureViewpoint viewpoint : context.getViewpoints()) {
+			availableViewpoints.add(viewpoint.getId());
+		}
+		List<String> selectedViewpoints = Arrays.asList(getSelectedViewpoints());
+		selectedViewpoints.retainAll(availableViewpoints);
+		return selectedViewpoints.toArray(new String[0]);
+	}
+	
+	private SelectArchitectureContextPage getSelectArchitectureContextPage() {
+		return (selectArchitectureContextPage != null)
+				? selectArchitectureContextPage
+				: (selectedStorageProvider != null)
+						? selectedStorageProvider.getArchitectureContextPage()
+						: null;
+	}
+
+	/**
+	 * Gets the diagram file extension.
+	 *
+	 * @param diagramCategoryId
+	 *            the diagram category id
+	 * @return the diagram file extension
+	 */
+	public String getDiagramFileExtension(String contextId) {
+		return getDiagramFileExtension(contextId, NewModelFilePage.DEFAULT_DIAGRAM_EXTENSION);
+	}
+
+	/**
+	 * Gets the diagram file extension.
+	 *
+	 * @param contextId
+	 *            the context id
+	 * @param defaultExtension
+	 *            the default extension
+	 * @return the diagram file extension
+	 */
+	public String getDiagramFileExtension(String contextId, String defaultExtension) {
+		MergedArchitectureContext context = ArchitectureDomainManager.getInstance().getArchitectureContextById(contextId);
+		String extensionPrefix = context != null ? context.getExtensionPrefix() : null;
+		return (extensionPrefix != null) ? extensionPrefix + "." + defaultExtension : defaultExtension; //$NON-NLS-1$
+	}
+
+	/**
+	 * Creates the select architecture context page.
+	 *
+	 * @return the select architecture context page
+	 */
+	protected SelectArchitectureContextPage createSelectArchitectureContextPage() {
+		return new SelectArchitectureContextPage();
+	}
+
+	/**
+	 * Creates the select representation kind page.
+	 *
+	 * @return the select representation kind page
+	 */
+	protected SelectRepresentationKindPage createSelectRepresentationKindPage() {
+		return new SelectRepresentationKindPage(new ViewpointProvider() {
+
+			@Override
+			public String[] getCurrentViewpoints() {
+				return getSelectedViewpoints();
+			}
+
+		});
+	}
+
+	/**
+	 * Inits the domain model.
+	 *
+	 * @param modelSet
+	 *            the di resource set
+	 * @param contextId
+	 *            the architecture context id
+	 * @param viewpointIds
+	 *            the architecture viewpoint ids
+	 */
+	protected void initDomainModel(ModelSet modelSet, String contextId, String[] viewpointIds) {
+
+		boolean isToInitFromTemplate = selectRepresentationKindPage.getTemplatePath() != null;
+		if (isToInitFromTemplate) {
+			initDomainModelFromTemplate(modelSet);
+		} else {
+			createEmptyDomainModel(modelSet, contextId, viewpointIds);
+		}
+	}
+
+	protected void applyProfile(ModelSet modelSet) {
+		String profilePath = selectRepresentationKindPage.getProfileURI();
+		Resource resource = modelSet.getResource(URI.createURI(profilePath), true);
+		Profile profileToApply = (Profile) resource.getContents().get(0);
+
+		Resource myModelUMLResource = UmlUtils.getUmlResource(modelSet);
+		org.eclipse.uml2.uml.Package manipulatedModel = (org.eclipse.uml2.uml.Package) myModelUMLResource.getContents().get(0);
+
+		RecordingCommand applyProfileCommand = new ApplyProfileCommand(manipulatedModel, profileToApply, modelSet.getTransactionalEditingDomain());
+		getCommandStack(modelSet).execute(applyProfileCommand);
+	}
+
+	protected void applyTemplateTransfo(ModelSet modelSet) {
+		List<ModelTemplateDescription> templateList = selectRepresentationKindPage.getTemplateTransfo();
+		// // This is an example of the use of QVT Transformations
+		// QVToGenerator generator = new QVToGenerator();
+		//
+		// for (final ModelTemplateDescription currentTemplate : templateList) {
+		// // fetches the tranformation URI encoded in the extension point, if it has that attribute
+		// // generator.setTransformationURI(URI.createPlatformPluginURI("org.eclipse.papyrus.uml.diagram.wizards/transforms/UMLCopyTemplateTransfo.qvto", true));//$NON-NLS-1$
+		// generator.setTransformationURI(URI.createPlatformPluginURI(currentTemplate.getTransfoURI(), true));
+		// generator.setModelSet(modelSet);
+		// generator.setTemplateModel(currentTemplate.getUml_path());
+		// generator.setPluginId(currentTemplate.getPluginId());
+		// generator.execute();
+		// }
+
+		// This is an example of transformations without using the QVToGenerator
+		// TODO make it prettier
+		IExtensionRegistry registry = Platform.getExtensionRegistry();
+		// get all the extensions configured into the extension point corresponding to the 'templates' Point ID from the 'org.eclipse.papyrus.uml.diagram.wizards' plugin
+		IExtension[] extensions = registry.getExtensionPoint(EXTENSION_POINT_ID).getExtensions();
+
+		for (IExtension extension : extensions) {
+			for (IConfigurationElement configElement : extension.getConfigurationElements()) {
+				if ("template".equals(configElement.getName())) { //$NON-NLS-1$
+					// not handled here
+				} else if ("transformation".equals(configElement.getName())) { //$NON-NLS-1$
+					for (ModelTemplateDescription currentTemplate : templateList) {
+						if (currentTemplate.getName().equals(configElement.getAttribute("name"))) { //$NON-NLS-1$
+							IGenerator iGenerator;
+							try {
+								iGenerator = (IGenerator) configElement.createExecutableExtension("Transformation"); //$NON-NLS-1$
+								iGenerator.setModelSet(modelSet);
+								iGenerator.execute();
+							} catch (CoreException e) {
+								Activator.log.error(e);
+							}
+						}
+					}
+
+				}
+			}
+		}
+
+	}
+
+	/**
+	 * Inits the domain model from template.
+	 *
+	 * @param modelSet
+	 *            the di resource set
+	 */
+	protected void initDomainModelFromTemplate(ModelSet modelSet) {
+		getCommandStack(modelSet).execute(
+				new InitFromTemplateCommand(modelSet.getTransactionalEditingDomain(), modelSet, selectRepresentationKindPage.getTemplatePluginId(), selectRepresentationKindPage.getTemplatePath(), selectRepresentationKindPage.getNotationTemplatePath(), selectRepresentationKindPage
+						.getDiTemplatePath()));
+	}
+
+	/**
+	 * Creates the empty domain model.
+	 *
+	 * @param modelSet
+	 *            the di resource set
+	 * @param contextId
+	 *            the architecture context id
+	 * @param viewpointIds
+	 *            the architecture viewpoint ids
+	 */
+	protected void createEmptyDomainModel(ModelSet modelSet, String contextId, String[] viewpointIds) {
+		try {
+			ArchitectureDescriptionUtils helper = new ArchitectureDescriptionUtils(modelSet);
+			Command command = helper.createNewModel(contextId, viewpointIds);
+			getCommandStack(modelSet).execute(command);
+		} catch (Exception e) {
+			log.error(e);
+		}
+	}
+
+	/**
+	 * Creates the papyrus models.
+	 *
+	 * @param modelSet
+	 *            the di resource set
+	 * @param newURI
+	 *            the URI of the new model's principal resource
+	 */
+	protected void createPapyrusModels(ModelSet modelSet, URI newURIs) {
+		RecordingCommand command = new NewPapyrusModelCommand(modelSet, newURIs);
+		getCommandStack(modelSet).execute(command);
+	}
+
+
+	/**
+	 * Open diagram.
+	 *
+	 * @param newURI
+	 *            the URI of the new model's principal resource
+	 */
+	protected void openDiagram(final URI newURI) {
+		IWorkbenchPage page = workbench.getActiveWorkbenchWindow().getActivePage();
+		if (page != null) {
+			try {
+				IEditorInput editorInput = createEditorInput(newURI);
+				IDE.openEditor(page, editorInput, getPreferredEditorID(editorInput), true);
+			} catch (PartInitException e) {
+				log.error(e);
+			}
+		}
+	}
+
+	protected IEditorInput createEditorInput(URI uri) {
+		return getSelectedStorageProvider().createEditorInput(uri);
+	}
+
+	protected String getPreferredEditorID(IEditorInput input) throws PartInitException {
+		IEditorDescriptor desc;
+
+		if (input instanceof IFileEditorInput) {
+			desc = IDE.getEditorDescriptor(((IFileEditorInput) input).getFile());
+		} else {
+			// try to get a URI
+			URI uri = null;
+			if (input instanceof IURIEditorInput) {
+				uri = URI.createURI(((IURIEditorInput) input).getURI().toString(), true);
+			} else if (input instanceof URIEditorInput) {
+				uri = ((URIEditorInput) input).getURI();
+			}
+
+			if (uri != null) {
+				desc = IDE.getEditorDescriptor(uri.lastSegment());
+			} else {
+				// hope that the input name is the file name
+				desc = IDE.getEditorDescriptor(input.getName());
+			}
+		}
+
+		return (desc == null) ? "org.eclipse.papyrus.infra.core.papyrusEditor" : desc.getId(); //$NON-NLS-1$
+	}
+
+	/**
+	 * Inits the diagram model.
+	 *
+	 * @param modelSet
+	 *            the di resource set
+	 * @param contextId
+	 *            the architecture context id
+	 */
+	protected void initDiagramModel(ModelSet modelSet, String contextId) {
+		initDiagrams(modelSet, contextId);
+	}
+
+
+	/**
+	 * Save diagram.
+	 *
+	 * @param modelSet
+	 *            the di resource set
+	 */
+	private void saveDiagram(ModelSet modelSet) {
+		// TODO verify that there are no conflicts with the existing files and the newly created one
+		try {
+			modelSet.save(new NullProgressMonitor());
+		} catch (IOException e) {
+			log.error(e);
+		}
+	}
+
+	/**
+	 * Inits the diagrams.
+	 *
+	 * @param modelSet
+	 *            the di resource set
+	 * @param contextId
+	 *            the architecture context id
+	 */
+	protected void initDiagrams(ModelSet modelSet, String contextId) {
+		initDiagrams(modelSet, null, contextId);
+	}
+
+	/**
+	 * Inits the diagrams.
+	 *
+	 * @param resourceSet
+	 *            the resource set
+	 * @param root
+	 *            the root
+	 * @param contextId
+	 *            the architecture context id
+	 */
+	protected void initDiagrams(ModelSet resourceSet, EObject root, String contextId) {
+		UmlModel model = (UmlModel) resourceSet.getModel(UmlModel.MODEL_ID);
+		EList<EObject> roots = model.getResource().getContents();
+		if (!roots.isEmpty()) {
+			root = roots.get(0);
+			if (root instanceof NamedElement) {
+				getCommandStack(resourceSet).execute(new RenameElementCommand(resourceSet.getTransactionalEditingDomain(), (NamedElement) root, getRootElementName()));
+
+			}
+
+		}
+		List<RepresentationKind> creationCommands = getRepresentationKindsFor(contextId);
+		List<String> diagramName = selectRepresentationKindPage.getDiagramName();
+		if (creationCommands.isEmpty()) {
+			createEmptyDiagramEditor(resourceSet);
+		} else {
+			for (int i = 0; i < creationCommands.size(); i++) {
+				RepresentationKind kind = creationCommands.get(i);
+				if (kind instanceof PapyrusRepresentationKind) {
+					ViewPrototype proto = ViewPrototype.get((PapyrusRepresentationKind)kind);
+					proto.instantiateOn(root, diagramName.get(i));
+				}
+			}
+		}
+	}
+
+	/**
+	 * Gets the representation kinds for.
+	 *
+	 * @param contextId
+	 *            the architecture context id
+	 * @return the repersentation kinds for
+	 */
+	protected List<RepresentationKind> getRepresentationKindsFor(String contextId) {
+		return selectRepresentationKindPage.getSelectedRepresentationKinds(contextId);
+	}
+
+
+	protected List<String> getDiagramNames() {
+		return selectRepresentationKindPage.getDiagramName();
+	}
+
+	protected String getRootElementName() {
+		return selectRepresentationKindPage.getRootElementName();
+	}
+
+	/**
+	 * Creates the empty diagram editor.
+	 *
+	 * @param modelSet
+	 *            the model set
+	 */
+	private void createEmptyDiagramEditor(ModelSet modelSet) {
+		// Create an empty editor (no diagrams opened)
+		// Geting an IPageMngr is enough to initialize the
+		// SashSystem.
+		EditorUtils.getIPageMngr(DiModelUtils.getDiResource(modelSet));
+	}
+
+	/**
+	 * Gets the command stack.
+	 *
+	 * @param modelSet
+	 *            the model set
+	 * @return the command stack
+	 */
+	protected final CommandStack getCommandStack(ModelSet modelSet) {
+		return modelSet.getTransactionalEditingDomain().getCommandStack();
+	}
+
+	/**
+	 * Diagram category changed.
+	 *
+	 * @param newCategories
+	 *            the new categories
+	 * @return the i status
+	 */
+	public IStatus architectureContextChanged(String... newContexts) {
+		return getSelectedStorageProvider().validateArchitectureContexts(newContexts);
+	}
+
+	protected void initStorageProvider(IWorkbench workbench, IStructuredSelection selection) {
+
+		NewModelStorageProviderRegistry registry = new NewModelStorageProviderRegistry(workbench.getService(IEvaluationService.class));
+
+		// if we are creating a project, then it is in the workspace
+		if (isCreateProjectWizard()) {
+			this.selectedStorageProvider = new WorkspaceNewModelStorageProvider();
+		} else {
+			// look for a pre-determined selection
+			INewModelStorageProvider firstProvider = null;
+			for (INewModelStorageProvider next : registry) {
+				if (firstProvider == null) {
+					firstProvider = next;
+				}
+
+				// don't match on empty selections because there is
+				// then no context to match against
+				if (!selection.isEmpty() && next.canHandle(selection)) {
+					this.selectedStorageProvider = next;
+					break;
+				}
+			}
+
+			// if the choice is pre-determined, don't show the selection page
+			if (this.selectedStorageProvider == null) {
+				this.selectedStorageProvider = firstProvider;
+
+				// don't need the selection page if only one choice
+				if (registry.size() > 1) {
+					this.storageProviderRegistry = registry;
+				}
+			}
+		}
+	}
+
+	protected SelectStorageProviderPage createSelectStorageProviderPage() {
+		SelectStorageProviderPage result = (storageProviderRegistry == null) ? null : new SelectStorageProviderPage(storageProviderRegistry);
+
+		if (result != null) {
+			result.addSelectionChangedListener(new ISelectionChangedListener() {
+
+				@Override
+				public void selectionChanged(SelectionChangedEvent event) {
+					INewModelStorageProvider provider = (INewModelStorageProvider) ((IStructuredSelection) event.getSelection()).getFirstElement();
+					setSelectedStorageProvider(provider);
+				}
+			});
+		}
+
+		return result;
+	}
+
+	protected Iterable<? extends INewModelStorageProvider> getStorageProviders() {
+		Iterable<? extends INewModelStorageProvider> result;
+
+		if (storageProviderRegistry != null) {
+			result = storageProviderRegistry;
+		} else if (selectedStorageProvider != null) {
+			result = Collections.singletonList(selectedStorageProvider);
+		} else {
+			result = Collections.emptyList();
+		}
+
+		return result;
+	}
+
+	protected INewModelStorageProvider getSelectedStorageProvider() {
+		return selectedStorageProvider;
+	}
+
+	private void setSelectedStorageProvider(INewModelStorageProvider provider) {
+		this.selectedStorageProvider = provider;
+
+		// recompute next/previous buttons
+		getContainer().updateButtons();
+	}
+
+	@Override
+	public IWizardPage getNextPage(IWizardPage page) {
+		final List<IWizardPage> allPages = Arrays.asList(getPages());
+		IWizardPage result = null;
+
+		INewModelStorageProvider provider = providersByPage.get(page);
+		if (provider != null) {
+			// it's contributed by a provider. Get the next in the list
+			List<IWizardPage> pages = providerPages.get(provider);
+			int index = pages.indexOf(page);
+			if ((index >= 0) && (index < (pages.size() - 1))) {
+				result = pages.get(index + 1);
+			} else {
+				// get the first page after the provider pages
+				if (endProviderPageIndex < allPages.size()) {
+					result = allPages.get(endProviderPageIndex);
+				}
+			}
+		} else if (allPages.indexOf(page) == startProviderPageIndex) {
+			// get the first page of the selected provider
+			List<IWizardPage> pages = providerPages.get(getSelectedStorageProvider());
+			if (!pages.isEmpty()) {
+				result = pages.get(0);
+			} else {
+				// get the first page after the provider pages
+				if (endProviderPageIndex < allPages.size()) {
+					result = allPages.get(endProviderPageIndex);
+				}
+			}
+		} else {
+			// somewhere away from the boundary of the provider pages
+			result = super.getNextPage(page);
+		}
+
+		return result;
+	}
+
+	@Override
+	public IWizardPage getPreviousPage(IWizardPage page) {
+		final List<IWizardPage> allPages = Arrays.asList(getPages());
+		IWizardPage result = null;
+
+		INewModelStorageProvider provider = providersByPage.get(page);
+		if (provider != null) {
+			// it's contributed by a provider. Get the previous in the list
+			List<IWizardPage> pages = providerPages.get(provider);
+			int index = pages.indexOf(page);
+			if (index > 0) {
+				result = pages.get(index - 1);
+			} else {
+				// get the last page before the provider pages
+				if (startProviderPageIndex > 0) {
+					result = allPages.get(startProviderPageIndex - 1);
+				}
+			}
+		} else if (allPages.indexOf(page) == endProviderPageIndex) {
+			// get the last page of the selected provider
+			List<IWizardPage> pages = providerPages.get(getSelectedStorageProvider());
+			if (!pages.isEmpty()) {
+				result = pages.get(pages.size() - 1);
+			} else {
+				// get the last page before the provider pages
+				if (startProviderPageIndex >= 0) {
+					result = allPages.get(startProviderPageIndex);
+				}
+			}
+		} else {
+			// somewhere away from the boundary of the provider pages
+			result = super.getPreviousPage(page);
+		}
+
+		return result;
+	}
+
+	@Override
+	public boolean canFinish() {
+		boolean result = true;
+		final IWizardPage[] allPages = getPages();
+
+		// only look at the universal pages and those contributed by the current
+		// storage provider
+
+		for (int i = 0; result && (i <= startProviderPageIndex); i++) {
+			result = allPages[i].isPageComplete();
+		}
+
+		if (result) {
+			for (IWizardPage next : providerPages.get(selectedStorageProvider)) {
+				if (!next.isPageComplete()) {
+					result = false;
+					break;
+				}
+			}
+		}
+
+		for (int i = endProviderPageIndex; result && (i < allPages.length); i++) {
+			result = allPages[i].isPageComplete();
+		}
+
+		// This takes care of the case problems when creating a model with the same name but different case
+		for (IWizardPage page : allPages) {
+			if (page instanceof NewModelFilePage) {
+				return page.canFlipToNextPage();
+			}
+			if (page instanceof PapyrusProjectCreationPage) {
+				return page.canFlipToNextPage();
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * Queries the user-presentable (translatable) name of the kind of model
+	 * that I create. For example, "Papyrus UML" or "Papyrus SysML".
+	 *
+	 * @return my model kind name
+	 */
+	public String getModelKindName() {
+		return "Papyrus"; //$NON-NLS-1$
+	}
+
+	@Deprecated
+	protected void saveDiagramCategorySettings() {
+
+	}
+
+	public boolean isPapyrusRootWizard() {
+		// this.getClass().getName().equals(anObject)
+		return true;
+	}
+
+
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/CreateSeveralModelsWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/CreateSeveralModelsWizard.java
index d6c489cc154..ae39013c38f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/CreateSeveralModelsWizard.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/CreateSeveralModelsWizard.java
@@ -30,8 +30,8 @@ import org.eclipse.jface.wizard.IWizardPage;
 import org.eclipse.papyrus.uml.diagram.wizards.Activator;
 import org.eclipse.papyrus.uml.diagram.wizards.messages.Messages;
 import org.eclipse.papyrus.uml.diagram.wizards.pages.NewModelFilePage;
-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramCategoryPage;
-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramKindPage;
+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectArchitectureContextPage;
+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectRepresentationKindPage;
 import org.eclipse.ui.IWorkbench;
 
 /**
@@ -65,7 +65,7 @@ public class CreateSeveralModelsWizard extends CreateModelWizard {
 	}
 
 	@Override
-	public IStatus diagramCategoryChanged(String... newCategories) {
+	public IStatus architectureContextChanged(String... newCategories) {
 		// clean pages
 		List<String> newCategoriesList = Arrays.asList(newCategories);
 		Collection<String> keys = new HashSet<String>(myCategory2modelFilePageMap.keySet());
@@ -80,7 +80,7 @@ public class CreateSeveralModelsWizard extends CreateModelWizard {
 				myCategory2modelFilePageMap.put(newCategory, newPage);
 			}
 		}
-		return super.diagramCategoryChanged(newCategories);
+		return super.architectureContextChanged(newCategories);
 	}
 
 	/**
@@ -107,7 +107,7 @@ public class CreateSeveralModelsWizard extends CreateModelWizard {
 	@Override
 	public IWizardPage getNextPage(IWizardPage page) {
 		String pageId = page.getName();
-		if(SelectDiagramKindPage.PAGE_ID.equals(pageId)) {
+		if(SelectRepresentationKindPage.PAGE_ID.equals(pageId)) {
 			String nextKey = myCategory2modelFilePageMap.keySet().iterator().next();
 			return myCategory2modelFilePageMap.get(nextKey);
 		}
@@ -138,14 +138,9 @@ public class CreateSeveralModelsWizard extends CreateModelWizard {
 		return super.getPreviousPage(page);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.papyrus.uml.diagram.wizards.CreateModelWizard#createSelectDiagramCategoryPage()
-	 */
 	@Override
-	protected SelectDiagramCategoryPage createSelectDiagramCategoryPage() {
-		return new SelectDiagramCategoryPage(true);
+	protected SelectArchitectureContextPage createSelectArchitectureContextPage() {
+		return new SelectArchitectureContextPage(true);
 	}
 
 	/**
@@ -155,10 +150,11 @@ public class CreateSeveralModelsWizard extends CreateModelWizard {
 	 */
 	@Override
 	public boolean performFinish() {
-		for(String category : getDiagramCategoryIds()) {
+		for(String contextId : getSelectedContexts()) {
 
-			final URI newURI = createNewModelURI(category);
-			createAndOpenPapyrusModel(newURI, category);
+			final URI newURI = createNewModelURI(contextId);
+			String[] viewpointIds = getSelectedViewpoints(contextId);
+			createAndOpenPapyrusModel(newURI, contextId, viewpointIds);
 		}
 
 		//		saveDiagramCategorySettings();
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/InitModelWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/InitModelWizard.java
index c76211cd3bb..5f079c750ec 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/InitModelWizard.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/InitModelWizard.java
@@ -1,239 +1,239 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tatiana Fesenko (CEA LIST) - Initial API and implementation

- *  Christian W. Damus (CEA) - Support creating models in repositories (CDO)

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.wizards.wizards;

-

-import static org.eclipse.papyrus.uml.diagram.wizards.utils.WizardsHelper.getSelectedResourceURI;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.uml.diagram.wizards.command.PapyrusModelFromExistingDomainModelCommand;

-import org.eclipse.papyrus.uml.diagram.wizards.messages.Messages;

-import org.eclipse.papyrus.uml.diagram.wizards.pages.NewModelFilePage;

-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramKindPage;

-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramKindPage.CategoryProvider;

-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectRootElementPage;

-import org.eclipse.papyrus.uml.tools.model.UmlModel;

-import org.eclipse.ui.IWorkbench;

-

-/**

- *

- * The New Papyrus Model Wizard.

- * If being invoke on the *.uml file - initializes a new Papyrus diagram for the selected domain model.

- * If is selected is empty or in not uml - creates a new Papyrus Model.

- */

-public class InitModelWizard extends CreateModelWizard {

-

-	/** Select the root element containing the new diagram. */

-	private SelectRootElementPage selectRootElementPage;

-

-	/** The is init from existing domain model. */

-	private boolean isInitFromExistingDomainModel;

-

-	@Override

-	public boolean isInitModelWizard() {

-		return true;

-	}

-

-	/**

-	 * Inits the.

-	 *

-	 * @param workbench

-	 *            the workbench

-	 * @param selection

-	 *            the selection {@inheritDoc}

-	 */

-	@Override

-	public void init(IWorkbench workbench, IStructuredSelection selection) {

-		URI uri = getSelectedResourceURI(selection);

-		isInitFromExistingDomainModel = isSupportedDomainModelResource(uri);

-		super.init(workbench, selection);

-		selectRootElementPage = createSelectRootElementPage(selection);

-		if (isCreateFromExistingDomainModel()) {

-			// Init Model not Create a new one

-			setWindowTitle(Messages.InitModelWizard_init_papyrus_diagram);

-		}

-	}

-

-	/**

-	 * Creates the select root element page.

-	 *

-	 * @param selection

-	 *            the initial workbench selection

-	 * @return the select root element page

-	 */

-	protected SelectRootElementPage createSelectRootElementPage(IStructuredSelection selection) {

-		if (!isCreateFromExistingDomainModel()) {

-			// create model - nothing to choose from

-			return null;

-		}

-		return new SelectRootElementPage(selection);

-	}

-

-	/**

-	 * Creates the select diagram kind page.

-	 *

-	 * @return the select diagram kind page {@inheritDoc}

-	 */

-	@Override

-	protected SelectDiagramKindPage createSelectDiagramKindPage() {

-		if (isCreateFromExistingDomainModel()) {

-			return new SelectDiagramKindPage(false, new CategoryProvider() {

-

-				@Override

-				public String[] getCurrentCategories() {

-					return getDiagramCategoryIds();

-				}

-

-			}, SelectDiagramKindPage.DEFAULT_CREATION_COMMAND_REGISTRY);

-		}

-		;

-		return super.createSelectDiagramKindPage();

-	}

-

-	/**

-	 * Adds the pages.

-	 *

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void addPages() {

-		super.addPages();

-		// remove the page from the view

-		// addPageIfNotNull(selectRootElementPage);

-	};

-

-	/**

-	 * Returns true is the file can be served as a model model for the diagram.

-	 *

-	 * @param file

-	 *            the file

-	 * @return true, if is supported domain model file

-	 */

-	public static boolean isSupportedDomainModelFile(IFile file) {

-		// if(file != null && UmlModel.UML_FILE_EXTENSION.equals(file.getFileExtension())){System.err.println("is SupportedDomainModelFile");}

-		// else {System.err.println("not SupportedDomainModelFile");}

-		return file != null && isSupportedDomainModelResource(URI.createPlatformResourceURI(file.getFullPath().toString(), true));

-	}

-

-	/**

-	 * Returns true if the resource can be served as a model model for the diagram.

-	 *

-	 * @param uri

-	 *            the resource's URI

-	 * @return true, if is supported domain model resource

-	 */

-	public static boolean isSupportedDomainModelResource(URI uri) {

-		return (uri != null) && UmlModel.UML_FILE_EXTENSION.equals(uri.fileExtension());

-	}

-

-	/**

-	 * Checks if is supported domain model file.

-	 *

-	 * @param sselection

-	 *            the sselection

-	 * @return true, if is supported domain model file

-	 */

-	public static boolean isSupportedDomainModelFile(IStructuredSelection sselection) {

-		URI uri = getSelectedResourceURI(sselection);

-		return isSupportedDomainModelResource(uri);

-	}

-

-	/**

-	 * Creates the papyrus models.

-	 *

-	 * @param diResourceSet

-	 *            the di resource set

-	 * @param newURI

-	 *            the URI of the new model's principal resource

-	 */

-	@Override

-	protected void createPapyrusModels(ModelSet modelSet, URI newURI) {

-		if (isCreateFromExistingDomainModel()) {

-			RecordingCommand command = new PapyrusModelFromExistingDomainModelCommand(modelSet, newURI, getRoot());

-			getCommandStack(modelSet).execute(command);

-		} else {

-			super.createPapyrusModels(modelSet, newURI);

-		}

-	}

-

-	/**

-	 * Inits the domain model.

-	 *

-	 * @param diResourceSet

-	 *            the di resource set

-	 * @param newURI

-	 *            the URI of the new model's principal resource

-	 * @param diagramCategoryId

-	 *            the diagram category id {@inheritDoc}

-	 */

-	@Override

-	protected void initDomainModel(ModelSet modelSet, final URI newURI, String diagramCategoryId) {

-		if (isCreateFromExistingDomainModel()) {

-			// do nothing

-		} else {

-			super.initDomainModel(modelSet, newURI, diagramCategoryId);

-		}

-	}

-

-	/**

-	 * Inits the diagrams.

-	 *

-	 * @param diResourceSet

-	 *            the di resource set

-	 * @param categoryId

-	 *            the category id {@inheritDoc}

-	 */

-	@Override

-	protected void initDiagrams(ModelSet modelSet, String categoryId) {

-		initDiagrams(modelSet, getRoot(), categoryId);

-	}

-

-	/**

-	 * Checks if is creates the from existing domain model.

-	 *

-	 * @return true, if is creates the from existing domain model

-	 */

-	public boolean isCreateFromExistingDomainModel() {

-		return isInitFromExistingDomainModel;

-	}

-

-	@Override

-	public String getDiagramFileExtension(String diagramCategoryId) {

-		if (isCreateFromExistingDomainModel()) {

-			return NewModelFilePage.DEFAULT_DIAGRAM_EXTENSION;

-		}

-		return super.getDiagramFileExtension(diagramCategoryId);

-	}

-

-	/**

-	 * Gets the root.

-	 *

-	 * @return the root

-	 */

-	private EObject getRoot() {

-		if (selectRootElementPage != null) {

-			// return selectRootElementPage.getModelElement();

-			return SelectDiagramKindPage.getModelRoot();

-		}

-		return null;

-	}

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tatiana Fesenko (CEA LIST) - Initial API and implementation
+ *  Christian W. Damus (CEA) - Support creating models in repositories (CDO)
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.wizards.wizards;
+
+import static org.eclipse.papyrus.uml.diagram.wizards.utils.WizardsHelper.getSelectedResourceURI;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.uml.diagram.wizards.command.PapyrusModelFromExistingDomainModelCommand;
+import org.eclipse.papyrus.uml.diagram.wizards.messages.Messages;
+import org.eclipse.papyrus.uml.diagram.wizards.pages.NewModelFilePage;
+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectRepresentationKindPage;
+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectRepresentationKindPage.ViewpointProvider;
+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectRootElementPage;
+import org.eclipse.papyrus.uml.tools.model.UmlModel;
+import org.eclipse.ui.IWorkbench;
+
+/**
+ *
+ * The New Papyrus Model Wizard.
+ * If being invoke on the *.uml file - initializes a new Papyrus diagram for the selected domain model.
+ * If is selected is empty or in not uml - creates a new Papyrus Model.
+ */
+public class InitModelWizard extends CreateModelWizard {
+
+	/** Select the root element containing the new diagram. */
+	private SelectRootElementPage selectRootElementPage;
+
+	/** The is init from existing domain model. */
+	private boolean isInitFromExistingDomainModel;
+
+	@Override
+	public boolean isInitModelWizard() {
+		return true;
+	}
+
+	/**
+	 * Inits the.
+	 *
+	 * @param workbench
+	 *            the workbench
+	 * @param selection
+	 *            the selection {@inheritDoc}
+	 */
+	@Override
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		URI uri = getSelectedResourceURI(selection);
+		isInitFromExistingDomainModel = isSupportedDomainModelResource(uri);
+		super.init(workbench, selection);
+		selectRootElementPage = createSelectRootElementPage(selection);
+		if (isCreateFromExistingDomainModel()) {
+			// Init Model not Create a new one
+			setWindowTitle(Messages.InitModelWizard_init_papyrus_diagram);
+		}
+	}
+
+	/**
+	 * Creates the select root element page.
+	 *
+	 * @param selection
+	 *            the initial workbench selection
+	 * @return the select root element page
+	 */
+	protected SelectRootElementPage createSelectRootElementPage(IStructuredSelection selection) {
+		if (!isCreateFromExistingDomainModel()) {
+			// create model - nothing to choose from
+			return null;
+		}
+		return new SelectRootElementPage(selection);
+	}
+
+	/**
+	 * Creates the select diagram kind page.
+	 *
+	 * @return the select diagram kind page {@inheritDoc}
+	 */
+	@Override
+	protected SelectRepresentationKindPage createSelectRepresentationKindPage() {
+		if (isCreateFromExistingDomainModel()) {
+			return new SelectRepresentationKindPage(false, new ViewpointProvider() {
+
+				@Override
+				public String[] getCurrentViewpoints() {
+					return getSelectedViewpoints();
+				}
+
+			}, SelectRepresentationKindPage.DEFAULT_CREATION_COMMAND_REGISTRY);
+		}
+		;
+		return super.createSelectRepresentationKindPage();
+	}
+
+	/**
+	 * Adds the pages.
+	 *
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void addPages() {
+		super.addPages();
+		// remove the page from the view
+		// addPageIfNotNull(selectRootElementPage);
+	};
+
+	/**
+	 * Returns true is the file can be served as a model model for the diagram.
+	 *
+	 * @param file
+	 *            the file
+	 * @return true, if is supported domain model file
+	 */
+	public static boolean isSupportedDomainModelFile(IFile file) {
+		// if(file != null && UmlModel.UML_FILE_EXTENSION.equals(file.getFileExtension())){System.err.println("is SupportedDomainModelFile");}
+		// else {System.err.println("not SupportedDomainModelFile");}
+		return file != null && isSupportedDomainModelResource(URI.createPlatformResourceURI(file.getFullPath().toString(), true));
+	}
+
+	/**
+	 * Returns true if the resource can be served as a model model for the diagram.
+	 *
+	 * @param uri
+	 *            the resource's URI
+	 * @return true, if is supported domain model resource
+	 */
+	public static boolean isSupportedDomainModelResource(URI uri) {
+		return (uri != null) && UmlModel.UML_FILE_EXTENSION.equals(uri.fileExtension());
+	}
+
+	/**
+	 * Checks if is supported domain model file.
+	 *
+	 * @param sselection
+	 *            the sselection
+	 * @return true, if is supported domain model file
+	 */
+	public static boolean isSupportedDomainModelFile(IStructuredSelection sselection) {
+		URI uri = getSelectedResourceURI(sselection);
+		return isSupportedDomainModelResource(uri);
+	}
+
+	/**
+	 * Creates the papyrus models.
+	 *
+	 * @param diResourceSet
+	 *            the di resource set
+	 * @param newURI
+	 *            the URI of the new model's principal resource
+	 */
+	@Override
+	protected void createPapyrusModels(ModelSet modelSet, URI newURI) {
+		if (isCreateFromExistingDomainModel()) {
+			RecordingCommand command = new PapyrusModelFromExistingDomainModelCommand(modelSet, newURI, getRoot());
+			getCommandStack(modelSet).execute(command);
+		} else {
+			super.createPapyrusModels(modelSet, newURI);
+		}
+	}
+
+	/**
+	 * Inits the domain model.
+	 *
+	 * @param diResourceSet
+	 *            the di resource set
+	 * @param contextId
+	 *            the architecture context id
+	 * @param viewpointIds
+	 *            the architecture viewpoint ids
+	 */
+	@Override
+	protected void initDomainModel(ModelSet modelSet, String contextId, String[] viewpointIds) {
+		if (isCreateFromExistingDomainModel()) {
+			// do nothing
+		} else {
+			super.initDomainModel(modelSet, contextId, viewpointIds);
+		}
+	}
+
+	/**
+	 * Inits the diagrams.
+	 *
+	 * @param diResourceSet
+	 *            the di resource set
+	 * @param contextName
+	 *            the architecture context name {@inheritDoc}
+	 */
+	@Override
+	protected void initDiagrams(ModelSet modelSet, String contextName) {
+		initDiagrams(modelSet, getRoot(), contextName);
+	}
+
+	/**
+	 * Checks if is creates the from existing domain model.
+	 *
+	 * @return true, if is creates the from existing domain model
+	 */
+	public boolean isCreateFromExistingDomainModel() {
+		return isInitFromExistingDomainModel;
+	}
+
+	@Override
+	public String getDiagramFileExtension(String contextId) {
+		if (isCreateFromExistingDomainModel()) {
+			return NewModelFilePage.DEFAULT_DIAGRAM_EXTENSION;
+		}
+		return super.getDiagramFileExtension(contextId);
+	}
+
+	/**
+	 * Gets the root.
+	 *
+	 * @return the root
+	 */
+	private EObject getRoot() {
+		if (selectRootElementPage != null) {
+			// return selectRootElementPage.getModelElement();
+			return SelectRepresentationKindPage.getModelRoot();
+		}
+		return null;
+	}
+
+
+
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/NewPapyrusProjectWithMultiModelsWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/NewPapyrusProjectWithMultiModelsWizard.java
index 9320d20d279..9b0c0338a3c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/NewPapyrusProjectWithMultiModelsWizard.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/NewPapyrusProjectWithMultiModelsWizard.java
@@ -1,99 +1,95 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tatiana Fesenko (CEA LIST) - Initial API and implementation

- *  Christian W. Damus (CEA) - Support creating models in repositories (CDO)

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.wizards.wizards;

-

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.papyrus.uml.diagram.wizards.Activator;

-import org.eclipse.papyrus.uml.diagram.wizards.messages.Messages;

-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramCategoryPage;

-

-/**

- * The Wizard creates a new Project and a several Papyrus Models of different categories inside it.

- */

-public class NewPapyrusProjectWithMultiModelsWizard extends NewPapyrusProjectWizard {

-

-	/** The my do not create model for no diagrams. */

-	private boolean myDoNotCreateModelForNoDiagrams;

-

-	/** The Constant WIZARD_ID. */

-	public static final String WIZARD_ID = "org.eclipse.papyrus.uml.diagram.wizards.createproject.several"; //$NON-NLS-1$

-

-

-	/**

-	 * Instantiates a new new papyrus project with multi models wizard.

-	 */

-	public NewPapyrusProjectWithMultiModelsWizard() {

-		this(false);

-	}

-

-	/**

-	 * Instantiates a new new papyrus project with multi models wizard.

-	 *

-	 * @param doNotCreateModelForNoDiagrams

-	 *            the do not create model for no diagrams

-	 */

-	public NewPapyrusProjectWithMultiModelsWizard(boolean doNotCreateModelForNoDiagrams) {

-		myDoNotCreateModelForNoDiagrams = doNotCreateModelForNoDiagrams;

-	}

-

-	@Override

-	public boolean isCreateMultipleModelsWizard() {

-		return true;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.papyrus.uml.diagram.wizards.CreateModelWizard#createSelectDiagramCategoryPage()

-	 */

-	@Override

-	protected SelectDiagramCategoryPage createSelectDiagramCategoryPage() {

-		return new SelectDiagramCategoryPage(true);

-	}

-

-	/**

-	 * Perform finish.

-	 *

-	 * @return true, if successful {@inheritDoc}

-	 */

-	@Override

-	public boolean performFinish() {

-		IProject newProjectHandle;

-		try {

-			newProjectHandle = createNewProject();

-		} catch (CoreException e) {

-			Activator.log.error(Messages.NewPapyrusProjectWithMultiModelsWizard_exception_on_project_opening, e);

-			return false;

-		}

-		if (newProjectHandle == null) {

-			return false;

-		}

-		for (String category : getDiagramCategoryIds()) {

-			if (myDoNotCreateModelForNoDiagrams && getPrototypesFor(category).isEmpty()) {

-				// don't create model

-				continue;

-			}

-			final URI newURI = createNewModelURI(category);

-			createAndOpenPapyrusModel(newURI, category);

-		}

-

-		// saveDiagramCategorySettings();

-		// saveDiagramKindSettings();

-		return true;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tatiana Fesenko (CEA LIST) - Initial API and implementation
+ *  Christian W. Damus (CEA) - Support creating models in repositories (CDO)
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.wizards.wizards;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.papyrus.uml.diagram.wizards.Activator;
+import org.eclipse.papyrus.uml.diagram.wizards.messages.Messages;
+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectArchitectureContextPage;
+
+/**
+ * The Wizard creates a new Project and a several Papyrus Models of different categories inside it.
+ */
+public class NewPapyrusProjectWithMultiModelsWizard extends NewPapyrusProjectWizard {
+
+	/** The my do not create model for no diagrams. */
+	private boolean myDoNotCreateModelForNoDiagrams;
+
+	/** The Constant WIZARD_ID. */
+	public static final String WIZARD_ID = "org.eclipse.papyrus.uml.diagram.wizards.createproject.several"; //$NON-NLS-1$
+
+
+	/**
+	 * Instantiates a new new papyrus project with multi models wizard.
+	 */
+	public NewPapyrusProjectWithMultiModelsWizard() {
+		this(false);
+	}
+
+	/**
+	 * Instantiates a new new papyrus project with multi models wizard.
+	 *
+	 * @param doNotCreateModelForNoDiagrams
+	 *            the do not create model for no diagrams
+	 */
+	public NewPapyrusProjectWithMultiModelsWizard(boolean doNotCreateModelForNoDiagrams) {
+		myDoNotCreateModelForNoDiagrams = doNotCreateModelForNoDiagrams;
+	}
+
+	@Override
+	public boolean isCreateMultipleModelsWizard() {
+		return true;
+	}
+
+	@Override
+	protected SelectArchitectureContextPage createSelectArchitectureContextPage() {
+		return new SelectArchitectureContextPage(true);
+	}
+
+	/**
+	 * Perform finish.
+	 *
+	 * @return true, if successful {@inheritDoc}
+	 */
+	@Override
+	public boolean performFinish() {
+		IProject newProjectHandle;
+		try {
+			newProjectHandle = createNewProject();
+		} catch (CoreException e) {
+			Activator.log.error(Messages.NewPapyrusProjectWithMultiModelsWizard_exception_on_project_opening, e);
+			return false;
+		}
+		if (newProjectHandle == null) {
+			return false;
+		}
+		for (String contextId : getSelectedContexts()) {
+			if (myDoNotCreateModelForNoDiagrams && getRepresentationKindsFor(contextId).isEmpty()) {
+				// don't create model
+				continue;
+			}
+			final URI newURI = createNewModelURI(contextId);
+			String[] viewpointIds = getSelectedViewpoints(contextId);
+			createAndOpenPapyrusModel(newURI, contextId, viewpointIds);
+		}
+
+		// saveDiagramCategorySettings();
+		// saveDiagramKindSettings();
+		return true;
+	}
+
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/NewPapyrusProjectWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/NewPapyrusProjectWizard.java
index a379796461d..9b9a980f2fd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/NewPapyrusProjectWizard.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/NewPapyrusProjectWizard.java
@@ -1,157 +1,159 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tatiana Fesenko (CEA LIST) - Initial API and implementation

- *  Christian W. Damus (CEA) - Support creating models in repositories (CDO)

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.wizards.wizards;

-

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IProjectDescription;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.core.runtime.SubProgressMonitor;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.uml.diagram.wizards.Activator;

-import org.eclipse.papyrus.uml.diagram.wizards.messages.Messages;

-import org.eclipse.papyrus.uml.diagram.wizards.pages.PapyrusProjectCreationPage;

-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramCategoryPage;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;

-

-/**

- * The Wizard creates a new Project and a Papyrus Model inside it.

- */

-public class NewPapyrusProjectWizard extends CreateModelWizard {

-

-	/** The Constant WIZARD_ID. */

-	public static final String WIZARD_ID = "org.eclipse.papyrus.uml.diagram.wizards.createproject"; //$NON-NLS-1$

-

-	/** The new project page. */

-	private PapyrusProjectCreationPage myProjectPage;

-

-	@Override

-	public boolean isCreateProjectWizard() {

-		return true;

-	}

-

-	/**

-	 * Inits the.

-	 *

-	 * @param workbench

-	 *            the workbench

-	 * @param selection

-	 *            the selection {@inheritDoc}

-	 */

-	@Override

-	public void init(IWorkbench workbench, IStructuredSelection selection) {

-		super.init(workbench, selection);

-		setWindowTitle(Messages.NewPapyrusProjectWizard_new_papyrus_project);

-		setMyProjectPage(new PapyrusProjectCreationPage(Messages.NewPapyrusProjectWizard_0));

-		getMyProjectPage().setDescription(Messages.NewPapyrusProjectWizard_1);

-		setDefaultPageImageDescriptor(Activator.imageDescriptorFromPlugin(Activator.PLUGIN_ID, "icons/papyrus/PapyrusProjectWizban_75x66.gif")); //$NON-NLS-1$

-	}

-

-

-

-	/**

-	 * Adds the pages.

-	 *

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void addPages() {

-		// Gives the CreateModelWizard the newProjectPage to display it after the selectDiagramCategoryPage

-		setNewProjectPage(getMyProjectPage());

-

-		if (getDiagramCategoryIds() == null) {

-			// If no one Overrides the id list then no specific behavior is expected

-			// We therefore fall back to the original behavior: ask the user to pick a language

-			selectDiagramCategoryPage = new SelectDiagramCategoryPage();

-		}

-

-		super.addPages();

-	}

-

-	/**

-	 * Perform finish.

-	 *

-	 * @return true, if successful {@inheritDoc}

-	 */

-	@Override

-	public boolean performFinish() {

-		IProject newProjectHandle;

-		try {

-			newProjectHandle = createNewProject();

-		} catch (CoreException e) {

-			Activator.log.error(Messages.NewPapyrusProjectWizard_exception_on_opening, e);

-			return false;

-		}

-		if (newProjectHandle == null) {

-			return false;

-		}

-		return super.performFinish();

-	}

-

-	/**

-	 * Creates the new project.

-	 *

-	 * @return the i project

-	 * @throws CoreException

-	 *             the core exception

-	 */

-	protected IProject createNewProject() throws CoreException {

-		// get a project handle

-		final IProject project = getMyProjectPage().getProjectHandle();

-

-		// get a project descriptor

-		java.net.URI projectLocationURI = null;

-		if (!getMyProjectPage().useDefaults()) {

-			projectLocationURI = getMyProjectPage().getLocationURI();

-		}

-

-		NullProgressMonitor progressMonitor = new NullProgressMonitor();

-		if (!project.exists()) {

-			IProjectDescription projectDescription = ResourcesPlugin.getWorkspace().newProjectDescription(project.getName());

-			if (projectLocationURI != null) {

-				projectDescription.setLocationURI(projectLocationURI);

-			}

-			project.create(projectDescription, new SubProgressMonitor(progressMonitor, 1));

-			project.open(new SubProgressMonitor(progressMonitor, 1));

-		} else {

-			project.open(new SubProgressMonitor(progressMonitor, 1));

-		}

-

-		return project;

-	}

-

-	@Override

-	protected URI createNewModelURI(String categoryId) {

-		IPath newFilePath = getMyProjectPage().getProjectHandle().getFullPath().append(getMyProjectPage().getFileName() + "." + getDiagramFileExtension(categoryId)); //$NON-NLS-1$

-		return URI.createPlatformResourceURI(newFilePath.toString(), true);

-	}

-

-	public PapyrusProjectCreationPage getMyProjectPage() {

-		return myProjectPage;

-	}

-

-	public void setMyProjectPage(PapyrusProjectCreationPage myProjectPage) {

-		this.myProjectPage = myProjectPage;

-	}

-

-	protected WizardNewProjectCreationPage createNewProjectCreationPage() {

-		return this.myProjectPage;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tatiana Fesenko (CEA LIST) - Initial API and implementation
+ *  Christian W. Damus (CEA) - Support creating models in repositories (CDO)
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.wizards.wizards;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.uml.diagram.wizards.Activator;
+import org.eclipse.papyrus.uml.diagram.wizards.messages.Messages;
+import org.eclipse.papyrus.uml.diagram.wizards.pages.PapyrusProjectCreationPage;
+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectArchitectureContextPage;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
+
+/**
+ * The Wizard creates a new Project and a Papyrus Model inside it.
+ */
+public class NewPapyrusProjectWizard extends CreateModelWizard {
+
+	/** The Constant WIZARD_ID. */
+	public static final String WIZARD_ID = "org.eclipse.papyrus.uml.diagram.wizards.createproject"; //$NON-NLS-1$
+
+	/** The new project page. */
+	private PapyrusProjectCreationPage myProjectPage;
+
+	@Override
+	public boolean isCreateProjectWizard() {
+		return true;
+	}
+
+	/**
+	 * Inits the.
+	 *
+	 * @param workbench
+	 *            the workbench
+	 * @param selection
+	 *            the selection {@inheritDoc}
+	 */
+	@Override
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		super.init(workbench, selection);
+		setWindowTitle(Messages.NewPapyrusProjectWizard_new_papyrus_project);
+		setMyProjectPage(new PapyrusProjectCreationPage(Messages.NewPapyrusProjectWizard_0));
+		getMyProjectPage().setDescription(Messages.NewPapyrusProjectWizard_1);
+		setDefaultPageImageDescriptor(Activator.imageDescriptorFromPlugin(Activator.PLUGIN_ID, "icons/papyrus/PapyrusProjectWizban_75x66.gif")); //$NON-NLS-1$
+	}
+
+
+
+	/**
+	 * Adds the pages.
+	 *
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void addPages() {
+		// Gives the CreateModelWizard the newProjectPage to display it after the selectDiagramCategoryPage
+		setNewProjectPage(getMyProjectPage());
+
+		if (getSelectedContexts() == null) {
+			// If no one Overrides the id list then no specific behavior is expected
+			// We therefore fall back to the original behavior: ask the user to pick a language
+			selectArchitectureContextPage = new SelectArchitectureContextPage();
+		}
+
+		super.addPages();
+	}
+
+	/**
+	 * Perform finish.
+	 *
+	 * @return true, if successful {@inheritDoc}
+	 */
+	@Override
+	public boolean performFinish() {
+		IProject newProjectHandle;
+		try {
+			newProjectHandle = createNewProject();
+		} catch (CoreException e) {
+			Activator.log.error(Messages.NewPapyrusProjectWizard_exception_on_opening, e);
+			return false;
+		}
+		if (newProjectHandle == null) {
+			return false;
+		}
+		return super.performFinish();
+	}
+
+	/**
+	 * Creates the new project.
+	 *
+	 * @return the i project
+	 * @throws CoreException
+	 *             the core exception
+	 */
+	protected IProject createNewProject() throws CoreException {
+		// get a project handle
+		final IProject project = getMyProjectPage().getProjectHandle();
+
+		// get a project descriptor
+		java.net.URI projectLocationURI = null;
+		if (!getMyProjectPage().useDefaults()) {
+			projectLocationURI = getMyProjectPage().getLocationURI();
+		}
+
+		IProjectDescription projectDescription = null;
+		NullProgressMonitor progressMonitor = new NullProgressMonitor();
+		if (!project.exists()) {
+			projectDescription = ResourcesPlugin.getWorkspace().newProjectDescription(project.getName());
+			if (projectLocationURI != null) {
+				projectDescription.setLocationURI(projectLocationURI);
+			}
+			project.create(projectDescription, new SubProgressMonitor(progressMonitor, 1));
+			project.open(new SubProgressMonitor(progressMonitor, 1));
+		} else {
+			// projectDescription = project.getDescription();
+			project.open(new SubProgressMonitor(progressMonitor, 1));
+		}
+
+		return project;
+	}
+
+	@Override
+	protected URI createNewModelURI(String categoryId) {
+		IPath newFilePath = getMyProjectPage().getProjectHandle().getFullPath().append(getMyProjectPage().getFileName() + "." + getDiagramFileExtension(categoryId)); //$NON-NLS-1$
+		return URI.createPlatformResourceURI(newFilePath.toString(), true);
+	}
+
+	public PapyrusProjectCreationPage getMyProjectPage() {
+		return myProjectPage;
+	}
+
+	public void setMyProjectPage(PapyrusProjectCreationPage myProjectPage) {
+		this.myProjectPage = myProjectPage;
+	}
+
+	protected WizardNewProjectCreationPage createNewProjectCreationPage() {
+		return this.myProjectPage;
+	}
+
+}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration
deleted file mode 100644
index b7093746fd6..00000000000
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<configuration:PapyrusConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmi:id="_ko07IErbEeSdQKzSRatBjg">

-  <viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="_xogdoErbEeSdQKzSRatBjg" name="Default Papyrus Viewpoint">

-    <modelKinds xsi:type="configuration:PapyrusSyncTable" xmi:id="_P3J1cEr7EeSVGbM3cmVSqQ" name="ClassTreeTable" icon="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table.png" implementationID="PapyrusClassTreeTable">

-      <modelRules xmi:id="_vZwgkEr7EeSVGbM3cmVSqQ">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </modelRules>

-      <owningRules xmi:id="_vZwgkUr7EeSVGbM3cmVSqQ">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </owningRules>

-      <categories href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb4txhEeOqHvRyiN87hA"/>

-      <categories href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb49xhEeOqHvRyiN87hA"/>

-    </modelKinds>

-  </viewpoints>

-  <defaultStakeholder href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmkdxhEeOqHvRyiN87hA"/>

-  <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>

-</configuration:PapyrusConfiguration>

diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/plugin.xml b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/plugin.xml
index c339b24a0a4..e840e681be5 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/plugin.xml
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/plugin.xml
@@ -1,26 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

-         point="org.eclipse.papyrus.infra.nattable.configuration">

-      <configuration

-            file="configs/class_synchronized_tree.nattableconfiguration"

-            type="PapyrusClassTreeTable">

-      </configuration>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.infra.nattable.axismanager">

-      <axisManager

-            id="org.eclipse.papyrus.infra.uml.nattable.class.tree.axis.manager"

-            manager="org.eclipse.papyrus.uml.nattable.clazz.config.manager.axis.UMLClassTreeAxisManagerForEventList">

-      </axisManager>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.infra.viewpoints.policy.custom">

-      <contribution

-            file="configs/classTreeTable.configuration"

-            original="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration">

-      </contribution>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.papyrus.infra.nattable.configuration">
+      <configuration
+            file="configs/class_synchronized_tree.nattableconfiguration"
+            type="PapyrusClassTreeTable">
+      </configuration>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.infra.nattable.axismanager">
+      <axisManager
+            id="org.eclipse.papyrus.infra.uml.nattable.class.tree.axis.manager"
+            manager="org.eclipse.papyrus.uml.nattable.clazz.config.manager.axis.UMLClassTreeAxisManagerForEventList">
+      </axisManager>
+   </extension>
+</plugin>
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/configs/genericTable.configuration b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/configs/genericTable.configuration
deleted file mode 100644
index 3937b2d8e5c..00000000000
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/configs/genericTable.configuration
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<configuration:PapyrusConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmi:id="_ko07IErbEeSdQKzSRatBjg">

-  <viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="_xogdoErbEeSdQKzSRatBjg" name="Default Papyrus Viewpoint">

-    <modelKinds xsi:type="configuration:PapyrusSyncTable" xmi:id="_Uz8agHDuEeWh-MssWmCB_A" name="Generic Table" icon="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table.png" implementationID="PapyrusGenericTable">

-      <modelRules xmi:id="_Uz8agXDuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>

-      </modelRules>

-      <owningRules xmi:id="_Uz8agnDuEeWh-MssWmCB_A">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>

-      </owningRules>

-      <categories href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb5dxhEeOqHvRyiN87hA"/>

-    </modelKinds>

-  </viewpoints>

-  <defaultStakeholder href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmkdxhEeOqHvRyiN87hA"/>

-  <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>

-</configuration:PapyrusConfiguration>

diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/plugin.xml b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/plugin.xml
index f92f4a5e00e..87fb110cbd2 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/plugin.xml
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/plugin.xml
@@ -2,14 +2,6 @@
 <?eclipse version="3.4"?>
 <plugin>
    <extension
-         point="org.eclipse.papyrus.infra.viewpoints.policy.custom">
-      <contribution
-            file="configs/genericTable.configuration"
-            original="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration">
-      </contribution>
-   </extension>
-   
-   <extension
          point="org.eclipse.papyrus.infra.nattable.configuration">
       <configuration
             file="configs/generic.nattableconfiguration"
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/config/stereotypeDisplay.configuration b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/config/stereotypeDisplay.configuration
deleted file mode 100755
index f4d6614c16a..00000000000
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/config/stereotypeDisplay.configuration
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration:PapyrusConfiguration
-    xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration"
-    xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation"
-    xmi:id="_KIq-4P4UEeSRsNBVzfUrzA">
-  <viewpoints
-      xsi:type="configuration:PapyrusViewpoint"
-      xmi:id="_VGewQP4UEeSRsNBVzfUrzA"
-      name="Default Papyrus Viewpoint">
-    <modelKinds
-        xsi:type="configuration:PapyrusSyncTable"
-        xmi:id="_WC1q0P4UEeSRsNBVzfUrzA"
-        name="StereotypeDisplayTreeTable"
-        icon="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table.png"
-        implementationID="PapyrusStereotypeDisplayTreeTable">
-      <modelRules
-          xmi:id="_7k79wP4VEeSRsNBVzfUrzA">
-        <element
-        	href="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//View"/>
-      </modelRules>
-      <owningRules
-          xmi:id="_AJmbwP4WEeSRsNBVzfUrzA">
-        <element
-            href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </owningRules>
-      <categories
-          href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb4txhEeOqHvRyiN87hA"/>
-    </modelKinds>
-  </viewpoints>
-  <defaultStakeholder
-      href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmkdxhEeOqHvRyiN87hA"/>
-  <metamodel
-      href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
-</configuration:PapyrusConfiguration>
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/plugin.xml b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/plugin.xml
index 39b1ac35e96..6b7cd7e3c5f 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/plugin.xml
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/plugin.xml
@@ -2,13 +2,6 @@
 <?eclipse version="3.4"?>
 <plugin>
    <extension
-         point="org.eclipse.papyrus.infra.viewpoints.policy.custom">
-      <contribution
-            file="config/stereotypeDisplay.configuration"
-            original="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration">
-      </contribution>
-   </extension>
-   <extension
          point="org.eclipse.papyrus.infra.nattable.configuration">
       <configuration
             file="config/stereotype.nattableconfiguration"
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/configs/genericTreeTable.configuration b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/configs/genericTreeTable.configuration
deleted file mode 100755
index 32a4b576d6c..00000000000
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/configs/genericTreeTable.configuration
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration:PapyrusConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmi:id="_ko07IErbEeSdQKzSRatBjg">
-  <viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="_xogdoErbEeSdQKzSRatBjg" name="Default Papyrus Viewpoint">
-    <modelKinds xsi:type="configuration:PapyrusSyncTable" xmi:id="_P3J1cEr7EeSVGbM3cmVSqQ" name="Generic Tree Table" icon="platform:/plugin/org.eclipse.papyrus.uml.nattable/icons/uml_generic_table.png" implementationID="PapyrusUMLGenericTreeTable">
-      <modelRules xmi:id="_vZwgkEr7EeSVGbM3cmVSqQ">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </modelRules>
-      <owningRules xmi:id="_vZwgkUr7EeSVGbM3cmVSqQ">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </owningRules>
-      <categories href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb4txhEeOqHvRyiN87hA"/>
-      <categories href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb49xhEeOqHvRyiN87hA"/>
-    </modelKinds>
-  </viewpoints>
-  <defaultStakeholder href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmkdxhEeOqHvRyiN87hA"/>
-  <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
-</configuration:PapyrusConfiguration>
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/plugin.xml b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/plugin.xml
index 63fe1aa31d1..940a0a964ae 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/plugin.xml
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/plugin.xml
@@ -283,11 +283,4 @@
             type="PapyrusUMLGenericTreeTable">
       </configuration>
    </extension>
-   <extension
-         point="org.eclipse.papyrus.infra.viewpoints.policy.custom">
-      <contribution
-            file="configs/genericTreeTable.configuration"
-            original="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration">
-      </contribution>
-   </extension>
 </plugin>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF
index a6ac84ac492..543a37226ce 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.infra.services.controlmode;bundle-version="[1.3.0,2.0.0)",
+Require-Bundle: org.eclipse.papyrus.infra.services.controlmode;bundle-version="[1.5.0,2.0.0)",
  org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.emf.readonly;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)",
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/plugin.xml b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/plugin.xml
index 00436a38341..d82325ac005 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/plugin.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/plugin.xml
@@ -1590,12 +1590,6 @@
 		<image commandId="org.eclipse.papyrus.uml.service.types.RefineCreateCommand" icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif" >
 			</image>
  </extension>
- <extension
-       point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
-    <elementTypeSet
-          clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
-          path="model/uml-advice.elementtypesconfigurations">
-    </elementTypeSet>
- </extension>
+
 </plugin>
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/build.properties b/plugins/uml/org.eclipse.papyrus.uml.service.types/build.properties
index 8a35aec1873..06bdf27e0fe 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/build.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/build.properties
@@ -1,10 +1,9 @@
-bin.includes = META-INF/,\

-               .,\

-               about.html,\

-               plugin.properties,\

-               icons/,\

-               plugin.xml,\

-               model/

-output..=bin/

-src.includes = about.html

-source..=src/,src-gen/

+bin.includes = META-INF/,\
+               .,\
+               about.html,\
+               plugin.properties,\
+               icons/,\
+               model/
+output..=bin/
+src.includes = about.html
+source..=src/,src-gen/
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/plugin.xml b/plugins/uml/org.eclipse.papyrus.uml.service.types/plugin.xml
deleted file mode 100644
index 1c55daad360..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/plugin.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
- <extension
-       point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
-    <elementTypeSet
-    clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
-          path="model/uml.elementtypesconfigurations">
-    </elementTypeSet>
- </extension>
-  <extension
-       point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
-    <elementTypeSet
-    clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
-          path="model/uml-containments.elementtypesconfigurations">
-    </elementTypeSet>
- </extension>
- <extension
-       point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
-    <elementTypeSet
-    clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
-          path="model/StandardProfile.elementtypesconfigurations">
-    </elementTypeSet>
- </extension>
- <extension
-       point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
-    <elementTypeSet
-    clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
-          path="model/umldi.elementtypesconfigurations">
-    </elementTypeSet>
- </extension>
-</plugin>
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AbstractFeatureRelationshipReorientEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AbstractFeatureRelationshipReorientEditHelperAdvice.java
index 90689b6ea6a..543a72b71b2 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AbstractFeatureRelationshipReorientEditHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AbstractFeatureRelationshipReorientEditHelperAdvice.java
@@ -1,67 +1,67 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.uml.service.types.helper.advice;

-

-import java.util.Arrays;

-import java.util.List;

-

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

-import org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext;

-import org.eclipse.papyrus.infra.types.core.utils.ElementTypeRegistryUtils;

-

-public abstract class AbstractFeatureRelationshipReorientEditHelperAdvice extends AbstractEditHelperAdvice {

-

-

-	@Override

-	protected ICommand getBeforeReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest request) {

-

-		Object value = request.getParameters().get(DefaultSemanticEditPolicy.GRAPHICAL_RECONNECTED_EDGE);

-

-		if (value instanceof View) {

-

-			try {

-				IClientContext context = TypeContext.getContext();

-				List<IElementType> elementTypes = ElementTypeRegistryUtils.getElementTypesBySemanticHint(((View) value).getType(), context.getId());

-

-				for (IElementType iElementType : elementTypes) {

-					List<ISpecializationType> subs = Arrays.asList(ElementTypeRegistry.getInstance().getSpecializationsOf(elementTypeIDToSpecialize()));

-					if (subs.contains(iElementType)) {

-						return getFeatureRelationshipReorientCommand(request);

-					}

-				}

-			} catch (ServiceException e) {

-				org.eclipse.papyrus.uml.service.types.Activator.log.error(e);

-			}

-

-		}

-

-		return null;

-	}

-

-	/**

-	 * @return

-	 */

-	protected abstract String elementTypeIDToSpecialize();

-

-	protected abstract ICommand getFeatureRelationshipReorientCommand(ReorientReferenceRelationshipRequest request);

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.service.types.helper.advice;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
+import org.eclipse.papyrus.infra.types.core.utils.ElementTypeRegistryUtils;
+
+public abstract class AbstractFeatureRelationshipReorientEditHelperAdvice extends AbstractEditHelperAdvice {
+
+
+	@Override
+	protected ICommand getBeforeReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest request) {
+
+		Object value = request.getParameters().get(DefaultSemanticEditPolicy.GRAPHICAL_RECONNECTED_EDGE);
+
+		if (value instanceof View) {
+
+			try {
+				IClientContext context = TypeContext.getContext((View)value);
+				List<IElementType> elementTypes = ElementTypeRegistryUtils.getElementTypesBySemanticHint(((View) value).getType(), context.getId());
+
+				for (IElementType iElementType : elementTypes) {
+					List<ISpecializationType> subs = Arrays.asList(ElementTypeRegistry.getInstance().getSpecializationsOf(elementTypeIDToSpecialize()));
+					if (subs.contains(iElementType)) {
+						return getFeatureRelationshipReorientCommand(request);
+					}
+				}
+			} catch (ServiceException e) {
+				org.eclipse.papyrus.uml.service.types.Activator.log.error(e);
+			}
+
+		}
+
+		return null;
+	}
+
+	/**
+	 * @return
+	 */
+	protected abstract String elementTypeIDToSpecialize();
+
+	protected abstract ICommand getFeatureRelationshipReorientCommand(ReorientReferenceRelationshipRequest request);
+
+
+}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AbstractReferenceDeleteRelationshipEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AbstractReferenceDeleteRelationshipEditHelperAdvice.java
index 9ebd0d631f5..3d8ee57d42f 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AbstractReferenceDeleteRelationshipEditHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AbstractReferenceDeleteRelationshipEditHelperAdvice.java
@@ -36,8 +36,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
 import org.eclipse.gmf.runtime.notation.Connector;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext;
 import org.eclipse.papyrus.infra.types.core.utils.ElementTypeRegistryUtils;
 import org.eclipse.papyrus.uml.service.types.utils.RequestParameterConstants;
 import org.eclipse.uml2.common.util.CacheAdapter;
@@ -58,7 +56,7 @@ public abstract class AbstractReferenceDeleteRelationshipEditHelperAdvice extend
 		super.configureRequest(request);
 		if (request instanceof DestroyReferenceRequest && ((DestroyReferenceRequest) request).getContainingFeature() == null) {
 			String visualId = (String) request.getParameter(RequestParameterConstants.VIEW_VISUAL_ID);
-			((DestroyReferenceRequest) request).setContainingFeature(getFeature(visualId));
+			((DestroyReferenceRequest) request).setContainingFeature(getFeature(visualId, request.getClientContext()));
 		}
 	}
 
@@ -69,23 +67,17 @@ public abstract class AbstractReferenceDeleteRelationshipEditHelperAdvice extend
 	 * @return
 	 * 		the EReference represented by the view with this visual id
 	 */
-	protected EReference getFeature(String visualId) {
-
-		try {
-			IClientContext context = TypeContext.getContext();
-			List<IElementType> elementTypes = ElementTypeRegistryUtils.getElementTypesBySemanticHint(visualId, context.getId());
-
-			for (IElementType iElementType : elementTypes) {
-				Map<String, EReference> featureElementTypeToEReferenceMap = getFeatureElementTypeToEReferenceMap();
-				for (String featureElementType : featureElementTypeToEReferenceMap.keySet()) {
-					List<ISpecializationType> subs = Arrays.asList(ElementTypeRegistry.getInstance().getSpecializationsOf(featureElementType));
-					if (subs.contains(iElementType)) {
-						return featureElementTypeToEReferenceMap.get(featureElementType);
-					}
+	protected EReference getFeature(String visualId, IClientContext context) {
+		List<IElementType> elementTypes = ElementTypeRegistryUtils.getElementTypesBySemanticHint(visualId, context.getId());
+
+		for (IElementType iElementType : elementTypes) {
+			Map<String, EReference> featureElementTypeToEReferenceMap = getFeatureElementTypeToEReferenceMap();
+			for (String featureElementType : featureElementTypeToEReferenceMap.keySet()) {
+				List<ISpecializationType> subs = Arrays.asList(ElementTypeRegistry.getInstance().getSpecializationsOf(featureElementType));
+				if (subs.contains(iElementType)) {
+					return featureElementTypeToEReferenceMap.get(featureElementType);
 				}
 			}
-		} catch (ServiceException e) {
-			org.eclipse.papyrus.uml.service.types.Activator.log.error(e);
 		}
 
 		return null;
diff --git a/plugins/uml/pom.xml b/plugins/uml/pom.xml
index 99ec962cd5f..15b1594fe3a 100644
--- a/plugins/uml/pom.xml
+++ b/plugins/uml/pom.xml
@@ -37,6 +37,7 @@
 		<module>org.eclipse.papyrus.uml.templaterepository</module>
 		<module>org.eclipse.papyrus.uml.ui</module>
 		<module>alf</module>
+		<module>architecture</module>
 		<module>assistants</module>
 		<module>decoratormodel</module>
 		<module>diagram</module>
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/databinding/PapyrusObservableValue.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/databinding/PapyrusObservableValue.java
index afc9aef647e..c68e72eb81a 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/databinding/PapyrusObservableValue.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/databinding/PapyrusObservableValue.java
@@ -106,7 +106,7 @@ public class PapyrusObservableValue extends EMFObservableValue implements Aggreg
 		Object oldValue = getValue();
 
 		try {
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(getObserved());
+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider((EObject)getObserved());
 
 			if (provider != null) {
 				CompositeCommand cc = new CompositeCommand("Edit value");
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/plugin.xml b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/plugin.xml
index 32386f69d92..0c053790d42 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/plugin.xml
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/plugin.xml
@@ -164,7 +164,7 @@
  <menuContribution allPopups="false" locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup">
     <separator
           name="newelements"
-          visible="false">
+          visible="true">
     </separator>
     <menu id="org.eclipse.papyrus.views.modelexplorer.popupmenu.createchild" label="New Child">
     </menu>
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/DirectEditorEditingSupport.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/DirectEditorEditingSupport.java
index dd6ef9f3af7..8c8227a6dc2 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/DirectEditorEditingSupport.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/DirectEditorEditingSupport.java
@@ -94,7 +94,7 @@ public class DirectEditorEditingSupport extends EditingSupport {
 	}
 
 	/**
-	 * Obtain direct editor configuration for a semantic element.
+	 * Obtain direct editor configuration for a semantic element
 	 *
 	 * @param semanticElement
 	 *            a semantic element
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/dnd/CommonDropAdapterAssistant.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/dnd/CommonDropAdapterAssistant.java
index 63d664ef85a..5e62f70e145 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/dnd/CommonDropAdapterAssistant.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/dnd/CommonDropAdapterAssistant.java
@@ -146,7 +146,7 @@ public class CommonDropAdapterAssistant extends org.eclipse.ui.navigator.CommonD
 		ViewPrototype proto = ViewPrototype.get(view);
 
 		// check if diagram can exist in new location
-		if (!proto.isOwnerReassignable() || PolicyChecker.getCurrent().getOwningRuleFor(proto, target) == null) {
+		if (!proto.isOwnerReassignable() || PolicyChecker.getFor(target).getOwningRuleFor(proto, target) == null) {
 			// stop here with unexecutable command
 			return UnexecutableCommand.INSTANCE;
 		}
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/OpenHandler.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/OpenHandler.java
index b5c8ad1b0cc..6b6d0c567b3 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/OpenHandler.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/OpenHandler.java
@@ -115,7 +115,7 @@ public class OpenHandler extends AbstractPapyrusHandler implements IExecutableEx
 		if (selection instanceof Diagram) {
 			Diagram diagram = (Diagram) selection;
 			ViewPrototype proto = DiagramUtils.getPrototype(diagram);
-			return (proto != ViewPrototype.UNAVAILABLE_VIEW && proto != ViewPrototype.UNAVAILABLE_DIAGRAM);
+			return proto != ViewPrototype.UNAVAILABLE_VIEW;
 		}
 		return true;
 	}